Skip to content

Commit c2d0e4e

Browse files
Michael Chanmehmetb0
authored andcommitted
bnxt_en: Fix GSO type for HW GRO packets on 5750X chips
BugLink: https://bugs.launchpad.net/bugs/2102181 [ Upstream commit de37faf41ac55619dd329229a9bd9698faeabc52 ] The existing code is using RSS profile to determine IPV4/IPV6 GSO type on all chips older than 5760X. This won't work on 5750X chips that may be using modified RSS profiles. This commit from 2018 has updated the driver to not use RSS profile for HW GRO packets on newer chips: 50f011b ("bnxt_en: Update RSS setup and GRO-HW logic according to the latest spec.") However, a recent commit to add support for the newest 5760X chip broke the logic. If the GRO packet needs to be re-segmented by the stack, the wrong GSO type will cause the packet to be dropped. Fix it to only use RSS profile to determine GSO type on the oldest 5730X/5740X chips which cannot use the new method and is safe to use the RSS profiles. Also fix the L3/L4 hash type for RX packets by not using the RSS profile for the same reason. Use the ITYPE field in the RX completion to determine L3/L4 hash types correctly. Fixes: a7445d6 ("bnxt_en: Add support for new RX and TPA_START completion types for P7") Reviewed-by: Colin Winegarden <colin.winegarden@broadcom.com> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com> Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> Link: https://patch.msgid.link/20241204215918.1692597-2-michael.chan@broadcom.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
1 parent 0f03455 commit c2d0e4e

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,
14191419
if (TPA_START_IS_IPV6(tpa_start1))
14201420
tpa_info->gso_type = SKB_GSO_TCPV6;
14211421
/* RSS profiles 1 and 3 with extract code 0 for inner 4-tuple */
1422-
else if (cmp_type == CMP_TYPE_RX_L2_TPA_START_CMP &&
1422+
else if (!BNXT_CHIP_P4_PLUS(bp) &&
14231423
TPA_START_HASH_TYPE(tpa_start) == 3)
14241424
tpa_info->gso_type = SKB_GSO_TCPV6;
14251425
tpa_info->rss_hash =
@@ -2110,15 +2110,13 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
21102110
if (cmp_type == CMP_TYPE_RX_L2_V3_CMP) {
21112111
type = bnxt_rss_ext_op(bp, rxcmp);
21122112
} else {
2113-
u32 hash_type = RX_CMP_HASH_TYPE(rxcmp);
2113+
u32 itypes = RX_CMP_ITYPES(rxcmp);
21142114

2115-
/* RSS profiles 1 and 3 with extract code 0 for inner
2116-
* 4-tuple
2117-
*/
2118-
if (hash_type != 1 && hash_type != 3)
2119-
type = PKT_HASH_TYPE_L3;
2120-
else
2115+
if (itypes == RX_CMP_FLAGS_ITYPE_TCP ||
2116+
itypes == RX_CMP_FLAGS_ITYPE_UDP)
21212117
type = PKT_HASH_TYPE_L4;
2118+
else
2119+
type = PKT_HASH_TYPE_L3;
21222120
}
21232121
skb_set_hash(skb, le32_to_cpu(rxcmp->rx_cmp_rss_hash), type);
21242122
}

drivers/net/ethernet/broadcom/bnxt/bnxt.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,9 @@ struct rx_cmp {
241241
(((le32_to_cpu((rxcmp)->rx_cmp_misc_v1) & RX_CMP_RSS_HASH_TYPE) >>\
242242
RX_CMP_RSS_HASH_TYPE_SHIFT) & RSS_PROFILE_ID_MASK)
243243

244+
#define RX_CMP_ITYPES(rxcmp) \
245+
(le32_to_cpu((rxcmp)->rx_cmp_len_flags_type) & RX_CMP_FLAGS_ITYPES_MASK)
246+
244247
#define RX_CMP_V3_HASH_TYPE_LEGACY(rxcmp) \
245248
((le32_to_cpu((rxcmp)->rx_cmp_misc_v1) & RX_CMP_V3_RSS_EXT_OP_LEGACY) >>\
246249
RX_CMP_V3_RSS_EXT_OP_LEGACY_SHIFT)

0 commit comments

Comments
 (0)