Skip to contentSkip to conversation

net/ice: fix mismatched hash flds with hdrs

PATCH Applied Junfeng Guo 3 participants 3 messages Nov 10, 2020 – Nov 11, 2020 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/ice: fix mismatched hash flds with hdrs

Previous code in ice_rss_hash_set has mismatched hash fields and headers for UDP and TCP.

Fixes 16187528a923 ("net/ice/base: refactor RSS configure API")
---
 drivers/net/ice/ice_ethdev.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ice/ice_ethdev.c +4 -4
index 1e15cd3960..9a5d6a559f 100644
@@ -3068,7 +3068,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 	if (rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) {
 		cfg.addl_hdrs = ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_UDP |
 				ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER;
-		cfg.hash_flds = ICE_FLOW_HASH_IPV4;
+		cfg.hash_flds = ICE_HASH_UDP_IPV4;
 		ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
 		if (ret)
 			PMD_DRV_LOG(ERR, "%s GTPU_IPV4_UDP rss flow fail %d",
@@ -3092,7 +3092,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 	if (rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) {
 		cfg.addl_hdrs = ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_UDP |
 				ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER;
-		cfg.hash_flds = ICE_FLOW_HASH_IPV6;
+		cfg.hash_flds = ICE_HASH_UDP_IPV6;
 		ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
 		if (ret)
 			PMD_DRV_LOG(ERR, "%s GTPU_IPV6_UDP rss flow fail %d",
@@ -3116,7 +3116,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 	if (rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) {
 		cfg.addl_hdrs = ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_TCP |
 				ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER;
-		cfg.hash_flds = ICE_FLOW_HASH_IPV4;
+		cfg.hash_flds = ICE_HASH_TCP_IPV4;
 		ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
 		if (ret)
 			PMD_DRV_LOG(ERR, "%s GTPU_IPV4_TCP rss flow fail %d",
@@ -3140,7 +3140,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 	if (rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) {
 		cfg.addl_hdrs = ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_TCP |
 				ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER;
-		cfg.hash_flds = ICE_FLOW_HASH_IPV6;
+		cfg.hash_flds = ICE_HASH_TCP_IPV6;
 		ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
 		if (ret)
 			PMD_DRV_LOG(ERR, "%s GTPU_IPV6_TCP rss flow fail %d",
Signature · 1 line
2.25.1
Acked-by on v1 1/1 Applied
#1 lore raw
Quoted 10 lines

-----Original Message-----
From: Guo, Junfeng <[email protected]>
Sent: Tuesday, November 10, 2020 4:45 PM
To: Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; Xing, Beilei <[email protected]>
Cc: [email protected]; Guo, Junfeng <[email protected]>
Subject: [PATCH] net/ice: fix mismatched hash flds with hdrs

Quoted 6 lines

Previous code in ice_rss_hash_set has mismatched hash fields and headers for UDP and TCP.

Fixes 16187528a923 ("net/ice/base: refactor RSS configure API")

Applied to dpdk-next-net-intel.

Thanks
Qi

Tested-by on v1 1/1
#2 lore raw
In reply to Junfeng Guo

Regards,
Xu, Hailin

Quoted 6 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Junfeng Guo
Sent: Tuesday, November 10, 2020 4:45 PM
To: Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; Xing, Beilei <[email protected]>
Cc: [email protected]; Guo, Junfeng <[email protected]>
Subject: [dpdk-dev] [PATCH] net/ice: fix mismatched hash flds with hdrs