net/ice: fix 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: e7cc68c707 ("net/ice: fix GTPU TEID hash")
Cc: stable@dpdk.org

Signed-off-by: Jeff Guo <jia.guo@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
This commit is contained in:
Jeff Guo 2020-08-31 13:50:45 +08:00 committed by Ferruh Yigit
parent 1eba5194e3
commit e9662a9bcf

View File

@ -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 |=