GTPU TEID hash should only be enabled when ETH_RSS_GTPU is required. Fixes: e7cc68c70736 ("net/ice: fix GTPU TEID hash") Signed-off-by: Jeff Guo <jia.guo@intel.com> --- drivers/net/ice/ice_hash.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index c0271dff5..61054557e 100644 --- a/drivers/net/ice/ice_hash.c +++ b/drivers/net/ice/ice_hash.c @@ -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
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(-) 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 |= -- 2.20.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
Test-by Peng, Yuan <yuan.peng@intel.com> -----Original Message----- From: dev <dev-bounces@dpdk.org> On Behalf Of Jeff Guo Sent: Friday, August 28, 2020 11:34 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: [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") Signed-off-by: Jeff Guo <jia.guo@intel.com> --- drivers/net/ice/ice_hash.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index c0271dff5..61054557e 100644 --- a/drivers/net/ice/ice_hash.c +++ b/drivers/net/ice/ice_hash.c @@ -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