[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAOBf=muDXtrsMMszA+Y8raaT7cGYrotU88s2YMN9B2r80gcm_Q@mail.gmail.com>
Date: Tue, 26 Nov 2024 12:03:45 +0530
From: Somnath Kotur <somnath.kotur@...adcom.com>
To: David Wei <dw@...idwei.uk>
Cc: netdev@...r.kernel.org, Michael Chan <michael.chan@...adcom.com>,
Andy Gospodarek <andrew.gospodarek@...adcom.com>, Andrew Lunn <andrew+netdev@...n.ch>,
"David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>
Subject: Re: [PATCH net v1 3/3] bnxt_en: handle tpa_info in queue API implementation
On Mon, Nov 25, 2024 at 9:54 AM David Wei <dw@...idwei.uk> wrote:
>
> Commit 7ed816be35ab ("eth: bnxt: use page pool for head frags") added a
> page pool for header frags, which may be distinct from the existing pool
> for the aggregation ring. Add support for this head_pool in the queue
> API.
>
> Signed-off-by: David Wei <dw@...idwei.uk>
> ---
> drivers/net/ethernet/broadcom/bnxt/bnxt.c | 24 +++++++++++++++++++----
> 1 file changed, 20 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> index 294d21cdaeb7..e4b7ff9f6dfa 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> @@ -15378,15 +15378,25 @@ static int bnxt_queue_mem_alloc(struct net_device *dev, void *qmem, int idx)
> goto err_free_rx_agg_ring;
> }
>
> + if (bp->flags & BNXT_FLAG_TPA) {
> + rc = bnxt_alloc_one_tpa_info(bp, clone);
> + if (rc)
> + goto err_free_tpa_info;
> + }
> +
> bnxt_init_one_rx_ring_rxbd(bp, clone);
> bnxt_init_one_rx_agg_ring_rxbd(bp, clone);
>
> bnxt_alloc_one_rx_ring_skb(bp, clone, idx);
> if (bp->flags & BNXT_FLAG_AGG_RINGS)
> bnxt_alloc_one_rx_ring_page(bp, clone, idx);
> + if (bp->flags & BNXT_FLAG_TPA)
> + bnxt_alloc_one_tpa_info_data(bp, clone);
>
> return 0;
>
> +err_free_tpa_info:
> + bnxt_free_one_tpa_info(bp, clone);
> err_free_rx_agg_ring:
> bnxt_free_ring(bp, &clone->rx_agg_ring_struct.ring_mem);
> err_free_rx_ring:
> @@ -15394,9 +15404,11 @@ static int bnxt_queue_mem_alloc(struct net_device *dev, void *qmem, int idx)
> err_rxq_info_unreg:
> xdp_rxq_info_unreg(&clone->xdp_rxq);
> err_page_pool_destroy:
> - clone->page_pool->p.napi = NULL;
> page_pool_destroy(clone->page_pool);
> + if (clone->page_pool != clone->head_pool)
> + page_pool_destroy(clone->head_pool);
> clone->page_pool = NULL;
> + clone->head_pool = NULL;
> return rc;
> }
>
> @@ -15406,13 +15418,15 @@ static void bnxt_queue_mem_free(struct net_device *dev, void *qmem)
> struct bnxt *bp = netdev_priv(dev);
> struct bnxt_ring_struct *ring;
>
> - bnxt_free_one_rx_ring(bp, rxr);
> - bnxt_free_one_rx_agg_ring(bp, rxr);
> + bnxt_free_one_rx_ring_skbs(bp, rxr);
>
> xdp_rxq_info_unreg(&rxr->xdp_rxq);
>
> page_pool_destroy(rxr->page_pool);
> + if (rxr->page_pool != rxr->head_pool)
> + page_pool_destroy(rxr->head_pool);
> rxr->page_pool = NULL;
> + rxr->head_pool = NULL;
>
> ring = &rxr->rx_ring_struct;
> bnxt_free_ring(bp, &ring->ring_mem);
> @@ -15494,7 +15508,10 @@ static int bnxt_queue_start(struct net_device *dev, void *qmem, int idx)
> rxr->rx_agg_prod = clone->rx_agg_prod;
> rxr->rx_sw_agg_prod = clone->rx_sw_agg_prod;
> rxr->rx_next_cons = clone->rx_next_cons;
> + rxr->rx_tpa = clone->rx_tpa;
> + rxr->rx_tpa_idx_map = clone->rx_tpa_idx_map;
> rxr->page_pool = clone->page_pool;
> + rxr->head_pool = clone->head_pool;
> rxr->xdp_rxq = clone->xdp_rxq;
>
> bnxt_copy_rx_ring(bp, rxr, clone);
> @@ -15545,7 +15562,6 @@ static int bnxt_queue_stop(struct net_device *dev, void *qmem, int idx)
> bnxt_hwrm_rx_ring_free(bp, rxr, false);
> bnxt_hwrm_rx_agg_ring_free(bp, rxr, false);
> rxr->rx_next_cons = 0;
> - page_pool_disable_direct_recycling(rxr->page_pool);
Intended? Not sure I understood this one, while I got the rest of the patch
>
> memcpy(qmem, rxr, sizeof(*rxr));
> bnxt_init_rx_ring_struct(bp, qmem);
> --
> 2.43.5
>
>
Download attachment "smime.p7s" of type "application/pkcs7-signature" (4212 bytes)
Powered by blists - more mailing lists