]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
eth: bnxt: allocate enough buffer space to meet HDS threshold
authorJakub Kicinski <kuba@kernel.org>
Sun, 19 Jan 2025 02:05:16 +0000 (18:05 -0800)
committerJakub Kicinski <kuba@kernel.org>
Mon, 20 Jan 2025 19:44:58 +0000 (11:44 -0800)
Now that we can configure HDS threshold separately from the rx_copybreak
HDS threshold may be higher than rx_copybreak.

We need to make sure that we have enough space for the headers.

Fixes: 6b43673a25c3 ("bnxt_en: add support for hds-thresh ethtool command")
Reviewed-by: Michael Chan <michael.chan@broadcom.com>
Link: https://patch.msgid.link/20250119020518.1962249-7-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/broadcom/bnxt/bnxt.c

index 2eeed4c11b64bec1155323940705e1d2941af4c7..19e723493c4e5bf463d69d141b2b2c4078508a63 100644 (file)
@@ -4671,9 +4671,10 @@ void bnxt_set_ring_params(struct bnxt *bp)
                                  ALIGN(max(NET_SKB_PAD, XDP_PACKET_HEADROOM), 8) -
                                  SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
                } else {
-                       rx_size = SKB_DATA_ALIGN(max(BNXT_DEFAULT_RX_COPYBREAK,
-                                                    bp->rx_copybreak) +
-                                                NET_IP_ALIGN);
+                       rx_size = max3(BNXT_DEFAULT_RX_COPYBREAK,
+                                      bp->rx_copybreak,
+                                      bp->dev->cfg_pending->hds_thresh);
+                       rx_size = SKB_DATA_ALIGN(rx_size + NET_IP_ALIGN);
                        rx_space = rx_size + NET_SKB_PAD +
                                SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
                }