Skip to content

Commit 3bb16a8

Browse files
committed
bnxt_en: Fix skb recycling logic in bnxt_deliver_skb()
JIRA: https://issues.redhat.com/browse/RHEL-31941 Upstream commit(s): commit aded5d1 Author: Sreekanth Reddy <sreekanth.reddy@broadcom.com> Date: Thu Dec 7 16:16:56 2023 -0800 bnxt_en: Fix skb recycling logic in bnxt_deliver_skb() Receive SKBs can go through the VF-rep path or the normal path. skb_mark_for_recycle() is only called for the normal path. Fix it to do it for both paths to fix possible stalled page pool shutdown errors. Fixes: 86b0550 ("bnxt_en: Use the unified RX page pool buffers for XDP and non-XDP") Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com> Reviewed-by: Andy Gospodarek <andrew.gospodarek@broadcom.com> Reviewed-by: Vikas Gupta <vikas.gupta@broadcom.com> Signed-off-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> Link: https://lore.kernel.org/r/20231208001658.14230-3-michael.chan@broadcom.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Petr Oros <poros@redhat.com>
1 parent c2838bf commit 3bb16a8

File tree

1 file changed

+2
-1
lines changed
  • drivers/net/ethernet/broadcom/bnxt

1 file changed

+2
-1
lines changed

drivers/net/ethernet/broadcom/bnxt/bnxt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1747,13 +1747,14 @@ static void bnxt_tpa_agg(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,
17471747
static void bnxt_deliver_skb(struct bnxt *bp, struct bnxt_napi *bnapi,
17481748
struct sk_buff *skb)
17491749
{
1750+
skb_mark_for_recycle(skb);
1751+
17501752
if (skb->dev != bp->dev) {
17511753
/* this packet belongs to a vf-rep */
17521754
bnxt_vf_rep_rx(bp, skb);
17531755
return;
17541756
}
17551757
skb_record_rx_queue(skb, bnapi->index);
1756-
skb_mark_for_recycle(skb);
17571758
napi_gro_receive(&bnapi->napi, skb);
17581759
}
17591760

0 commit comments

Comments
 (0)