diff mbox series

[v2] net/ice: fix the hash parser

Message ID 20200831055045.64061-1-jia.guo@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v2] net/ice: fix the hash parser |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/iol-testing success Testing PASS
ci/travis-robot success Travis build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Guo, Jia Aug. 31, 2020, 5:50 a.m. UTC 
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")
Signed-off-by: Jeff Guo <jia.guo@intel.com>
---
 drivers/net/ice/ice_hash.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Qi Zhang Aug. 31, 2020, 7:19 a.m. UTC | #1 
> -----Original Message-----
> From: Guo, Jia <jia.guo@intel.com>
> Sent: Monday, August 31, 2020 1:51 PM
> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Guo, Jia <jia.guo@intel.com>
> Subject: [PATCH v2] 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")
> Signed-off-by: Jeff Guo <jia.guo@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
diff mbox series

Patch

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index c0271dff5..45c69e6bf 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -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 |=