Skip to contentSkip to conversation

net/ice: fix none GTPU TEID hash

PATCH In review Jeff Guo 3 participants 4 messages Aug 28, 2020 – Sep 2, 2020 Network drivers

lore
Share & tools
lore

Jeff Guo

author
#0 lore raw

PATCH 1/1 net/ice: fix none GTPU TEID hash

GTPU TEID hash should only be enabled when ETH_RSS_GTPU is required.

Fixes e7cc68c70736 ("net/ice: fix GTPU TEID hash")
---
 drivers/net/ice/ice_hash.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ice/ice_hash.c +4 -1
index c0271dff5..61054557e 100644
@@ -1151,7 +1151,10 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 			}
 
 			/* update hash field for gtpu eh/gtpu dwn/gtpu up. */
-			if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_EH) {
+			if (rss_type != ETH_RSS_GTPU) {
+				break;
+			} else if (hash_meta->pkt_hdr &
+				   ICE_FLOW_SEG_HDR_GTPU_EH) {
 				hash_meta->hash_flds &=
 				~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
 				hash_meta->hash_flds |=
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH v2 1/1 net/ice: fix the hash parser

GTPU TEID hash should only be enabled when ETH_RSS_GTPU is required. And the hash parser should not restrict the combined usage of protocol.

Fixes e7cc68c70736 ("net/ice: fix GTPU TEID hash")
---
 drivers/net/ice/ice_hash.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/ice/ice_hash.c +5 -2
index c0271dff5..45c69e6bf 100644
@@ -1141,7 +1141,7 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 			}
 
 			/* update hash field for nat-t esp. */
-			if (rss_type == ETH_RSS_ESP &&
+			if (rss_type & ETH_RSS_ESP &&
 			    (m->eth_rss_hint & ETH_RSS_NONFRAG_IPV4_UDP ||
 			     m->eth_rss_hint & ETH_RSS_NONFRAG_IPV6_UDP)) {
 				hash_meta->hash_flds &=
@@ -1151,7 +1151,10 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 			}
 
 			/* update hash field for gtpu eh/gtpu dwn/gtpu up. */
-			if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_EH) {
+			if (!(rss_type & ETH_RSS_GTPU)) {
+				break;
+			} else if (hash_meta->pkt_hdr &
+				   ICE_FLOW_SEG_HDR_GTPU_EH) {
 				hash_meta->hash_flds &=
 				~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
 				hash_meta->hash_flds |=
Signature · 1 line
2.20.1
Acked-by on v2 1/1 Applied
#2 lore raw

Re: [dpdk-dev] [PATCH v2] net/ice: fix the hash parser

Quoted 10 lines

-----Original Message-----
From: Guo, Jia <[email protected]>
Sent: Monday, August 31, 2020 1:51 PM
To: Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Guo, Jia <[email protected]>
Subject: [PATCH v2] net/ice: fix the hash parser

Quoted 5 lines

GTPU TEID hash should only be enabled when ETH_RSS_GTPU is required. And the hash parser should not restrict the combined usage of protocol.

Fixes e7cc68c70736 ("net/ice: fix GTPU TEID hash")

Applied to dpdk-next-net-intel.

Thanks
Qi

#3 lore raw
In reply to Jeff Guo

Test-by Peng, Yuan <[email protected]>

-----Original Message-----
From: dev <[email protected]> On Behalf Of Jeff Guo
Sent: Friday, August 28, 2020 11:34 PM
To: Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Guo, Jia <[email protected]>
Subject: [dpdk-dev] [PATCH v1] net/ice: fix none GTPU TEID hash

GTPU TEID hash should only be enabled when ETH_RSS_GTPU is required.

Fixes e7cc68c70736 ("net/ice: fix GTPU TEID hash")
---
 drivers/net/ice/ice_hash.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ice/ice_hash.c +4 -1
@@ -1151,7 +1151,10 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 			}
 
 			/* update hash field for gtpu eh/gtpu dwn/gtpu up. */
-			if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_EH) {
+			if (rss_type != ETH_RSS_GTPU) {
+				break;
+			} else if (hash_meta->pkt_hdr &
+				   ICE_FLOW_SEG_HDR_GTPU_EH) {
 				hash_meta->hash_flds &=
 				~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
 				hash_meta->hash_flds |=

--
2.20.1