netdev - Re: [PATCH net v2 3/3] bnxt_en: handle tpa

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAOBf=muU_fTz-qN=BvNFoGT+h8pykmWe0WX-7tw0ska=hEk=og@mail.gmail.com>
Date: Thu, 28 Nov 2024 09:16:27 +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 v2 3/3] bnxt_en: handle tpa_info in queue API implementation

On Thu, Nov 28, 2024 at 4:09 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 | 25 ++++++++++++++++++++---
>  1 file changed, 22 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> index 9b079bce1423..08c7d3049562 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> @@ -15382,15 +15382,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:
> @@ -15398,9 +15408,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)
Just curious, why is this check needed everywhere? Is there a case
where the 2 page pools can be the same ? I thought either there is a
page_pool for the header frags or none at all ?
> +               page_pool_destroy(clone->head_pool);
>         clone->page_pool = NULL;
> +       clone->head_pool = NULL;
>         return rc;
>  }
>
> @@ -15410,13 +15422,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);
> @@ -15498,7 +15512,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);
> @@ -15557,6 +15574,8 @@ static int bnxt_queue_stop(struct net_device *dev, void *qmem, int idx)
>         bnxt_hwrm_rx_agg_ring_free(bp, rxr, false);
>         rxr->rx_next_cons = 0;
>         page_pool_disable_direct_recycling(rxr->page_pool);
> +       if (rxr->page_pool != rxr->head_pool)
> +               page_pool_disable_direct_recycling(rxr->head_pool);
>
>         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)