github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 08:33:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

eth: bnxt: support qcfg provided rx page size

Browse Source 
Implement support for qcfg provided rx page sizes. For that, implement
the ndo_default_qcfg callback and validate the config on restart. Also,
use the current config's value in bnxt_init_ring_struct to retain the
correct size across resets.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
This commit is contained in:
Pavel Begunkov 2025-10-13 23:10:32 +01:00
parent c55bf90a21
commit f96e1b3577
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/net/ethernet/broadcom/bnxt/bnxt.c
View File

@ -4331,6 +4331,7 @@ static void bnxt_init_ring_struct(struct bnxt *bp)
struct bnxt_rx_ring_info *rxr; struct bnxt_rx_ring_info *rxr;
struct bnxt_tx_ring_info *txr; struct bnxt_tx_ring_info *txr;
struct bnxt_ring_struct *ring; struct bnxt_ring_struct *ring;
struct netdev_rx_queue *rxq;
if (!bnapi) if (!bnapi)
continue; continue;
@ -4348,7 +4349,8 @@ static void bnxt_init_ring_struct(struct bnxt *bp)
if (!rxr) if (!rxr)
goto skip_rx; goto skip_rx;
rxr->rx_page_size = BNXT_RX_PAGE_SIZE; rxq = __netif_get_rx_queue(bp->dev, i);
rxr->rx_page_size = rxq->qcfg.rx_page_size;
ring = &rxr->rx_ring_struct; ring = &rxr->rx_ring_struct;
rmem = &ring->ring_mem; rmem = &ring->ring_mem;
@ -15938,6 +15940,29 @@ static const struct netdev_stat_ops bnxt_stat_ops = {
.get_base_stats = bnxt_get_base_stats, .get_base_stats = bnxt_get_base_stats,
}; };
static void bnxt_queue_default_qcfg(struct net_device *dev,
struct netdev_queue_config *qcfg)
{
qcfg->rx_page_size = BNXT_RX_PAGE_SIZE;
}
static int bnxt_validate_qcfg(struct bnxt *bp, struct netdev_queue_config *qcfg)
{
/* Older chips need MSS calc so rx_page_size is not supported */
if (!(bp->flags & BNXT_FLAG_CHIP_P5_PLUS) &&
qcfg->rx_page_size != BNXT_RX_PAGE_SIZE)
return -EINVAL;
if (!is_power_of_2(qcfg->rx_page_size))
return -ERANGE;
if (qcfg->rx_page_size < BNXT_RX_PAGE_SIZE ||
qcfg->rx_page_size > BNXT_MAX_RX_PAGE_SIZE)
return -ERANGE;
return 0;
}
static int bnxt_queue_mem_alloc(struct net_device *dev, static int bnxt_queue_mem_alloc(struct net_device *dev,
struct netdev_queue_config *qcfg, struct netdev_queue_config *qcfg,
void *qmem, int idx) void *qmem, int idx)
@ -15950,6 +15975,10 @@ static int bnxt_queue_mem_alloc(struct net_device *dev,
if (!bp->rx_ring) if (!bp->rx_ring)
return -ENETDOWN; return -ENETDOWN;
rc = bnxt_validate_qcfg(bp, qcfg);
if (rc < 0)
return rc;
rxr = &bp->rx_ring[idx]; rxr = &bp->rx_ring[idx];
clone = qmem; clone = qmem;
memcpy(clone, rxr, sizeof(*rxr)); memcpy(clone, rxr, sizeof(*rxr));
@ -15961,6 +15990,7 @@ static int bnxt_queue_mem_alloc(struct net_device *dev,
clone->rx_sw_agg_prod = 0; clone->rx_sw_agg_prod = 0;
clone->rx_next_cons = 0; clone->rx_next_cons = 0;
clone->need_head_pool = false; clone->need_head_pool = false;
clone->rx_page_size = qcfg->rx_page_size;
rc = bnxt_alloc_rx_page_pool(bp, clone, rxr->page_pool->p.nid); rc = bnxt_alloc_rx_page_pool(bp, clone, rxr->page_pool->p.nid);
if (rc) if (rc)
@ -16087,6 +16117,8 @@ static void bnxt_copy_rx_ring(struct bnxt *bp,
src_ring = &src->rx_agg_ring_struct; src_ring = &src->rx_agg_ring_struct;
src_rmem = &src_ring->ring_mem; src_rmem = &src_ring->ring_mem;
dst->rx_page_size = src->rx_page_size;
WARN_ON(dst_rmem->nr_pages != src_rmem->nr_pages); WARN_ON(dst_rmem->nr_pages != src_rmem->nr_pages);
WARN_ON(dst_rmem->page_size != src_rmem->page_size); WARN_ON(dst_rmem->page_size != src_rmem->page_size);
WARN_ON(dst_rmem->flags != src_rmem->flags); WARN_ON(dst_rmem->flags != src_rmem->flags);
@ -16241,6 +16273,8 @@ static const struct netdev_queue_mgmt_ops bnxt_queue_mgmt_ops = {
.ndo_queue_mem_free = bnxt_queue_mem_free, .ndo_queue_mem_free = bnxt_queue_mem_free,
.ndo_queue_start = bnxt_queue_start, .ndo_queue_start = bnxt_queue_start,
.ndo_queue_stop = bnxt_queue_stop, .ndo_queue_stop = bnxt_queue_stop,
.ndo_default_qcfg = bnxt_queue_default_qcfg,
.supported_params = QCFG_RX_PAGE_SIZE,
}; };
static void bnxt_remove_one(struct pci_dev *pdev) static void bnxt_remove_one(struct pci_dev *pdev)

1
drivers/net/ethernet/broadcom/bnxt/bnxt.h
View File

@ -760,6 +760,7 @@ struct nqe_cn {
#endif #endif
#define BNXT_RX_PAGE_SIZE (1 << BNXT_RX_PAGE_SHIFT) #define BNXT_RX_PAGE_SIZE (1 << BNXT_RX_PAGE_SHIFT)
#define BNXT_MAX_RX_PAGE_SIZE BIT(15)
#define BNXT_MAX_MTU 9500 #define BNXT_MAX_MTU 9500