net/ice: fix RSS for L2 packet
PATCH 1/1 net/ice: fix RSS for L2 packet
L2 RSS support was deleted by mistake during code
refactoring. This patch adds it again.
Fixes 38d632cbdc88 ("net/ice: refactor PF RSS")
Signed-off-by Wenjun Wu <[email protected]>
--- drivers/net/ice/base/ice_flow.c | 2 +- drivers/net/ice/ice_hash.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-)
drivers/net/ice/base/ice_flow.c +1 -1
@@ -3430,7 +3430,7 @@ enum ice_status ice_flow_rem_vsi_prof(struct ice_hw *hw, enum ice_block blk, u16 }#define ICE_FLOW_RSS_SEG_HDR_L2_MASKS \ -(ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_VLAN) +(ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_ETH_NON_IP | ICE_FLOW_SEG_HDR_VLAN)#define ICE_FLOW_RSS_SEG_HDR_L3_MASKS \ (ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV6)
drivers/net/ice/ice_hash.c +17 -0
@@ -365,6 +365,13 @@ struct ice_rss_hash_cfg empty_tmplt = { 0 }; +struct ice_rss_hash_cfg eth_tmplt = { +ICE_FLOW_SEG_HDR_ETH |ICE_FLOW_SEG_HDR_ETH_NON_IP , +ICE_FLOW_HASH_ETH , +ICE_RSS_OUTER_HEADERS , +0 +}; +/* IPv4 */ #define ICE_RSS_TYPE_ETH_IPV4 (ETH_RSS_ETH | ETH_RSS_IPV4 | \ ETH_RSS_FRAG_IPV4)
@@ -467,6 +474,9 @@ struct ice_rss_hash_cfg empty_tmplt = {#define ICE_RSS_TYPE_IPV4_PFCP (ETH_RSS_PFCP | ETH_RSS_IPV4)#define ICE_RSS_TYPE_IPV6_PFCP (ETH_RSS_PFCP | ETH_RSS_IPV6) +/* MAC */ +#define ICE_RSS_TYPE_ETH ETH_RSS_ETH +/** * Supported pattern for hash. * The first member is pattern item type,
@@ -536,6 +546,8 @@ static struct ice_pattern_match_item ice_hash_pattern_list[] = { {pattern_eth_ipv6_pfcp, ICE_RSS_TYPE_IPV6_PFCP, ICE_INSET_NONE, ð_ipv6_pfcp_tmplt},/* PPPOE */ {pattern_eth_pppoes, ICE_RSS_TYPE_PPPOE, ICE_INSET_NONE, &pppoe_tmplt}, +/* MAC */ + {pattern_ethertype, ICE_RSS_TYPE_ETH, ICE_INSET_NONE, ð_tmplt},/* EMPTY */ {pattern_empty, ICE_INSET_NONE, ICE_INSET_NONE, &empty_tmplt}, };
@@ -637,6 +649,11 @@ ice_refine_hash_cfg_l234(struct ice_rss_hash_cfg *hash_cfg, *addl_hdrs &= ~ICE_FLOW_SEG_HDR_ETH ; } +if (*addl_hdrs &ICE_FLOW_SEG_HDR_ETH_NON_IP ) { +if (rss_type Ð_RSS_ETH ) + *hash_flds |=BIT_ULL (ICE_FLOW_FIELD_IDX_ETH_TYPE ); + } +if (*addl_hdrs &ICE_FLOW_SEG_HDR_VLAN ) {if (rss_type Ð_RSS_C_VLAN ) *hash_flds |=BIT_ULL (ICE_FLOW_FIELD_IDX_C_VLAN );
Signature · 1 line
2.25.1
Quoted 10 lines
-----Original Message-----
From: Wu, Wenjun1 <[email protected]>
Sent: Thursday, June 10, 2021 10:30 AM
To: [email protected]; Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: Wu, Wenjun1 <[email protected]>
Subject: [PATCH v1] net/ice: fix RSS for L2 packet
Quoted 6 lines
L2 RSS support was deleted by mistake during code refactoring. This patch adds it again.
Fixes 38d632cbdc88 ("net/ice: refactor PF RSS")Signed-off-by Wenjun Wu <[email protected]>
Acked-by Qi Zhang <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi