X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fice%2Fice_hash.c;h=c0271dff526b8eb183b01cdd8a17eb9f2655cd26;hb=185fe122f4899f48569d0086c9dcacc431ef0967;hp=42b344051176a47022a37b0fd21fbabb4fc00474;hpb=ef1d314d90895a528576b5b15a3535fb7384cdab;p=dpdk.git diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c index 42b3440511..c0271dff52 100644 --- a/drivers/net/ice/ice_hash.c +++ b/drivers/net/ice/ice_hash.c @@ -204,10 +204,6 @@ struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = { ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP, ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_TCP}; -struct rss_type_match_hdr hint_eth_pppoes_ipv4_sctp = { - ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 | - ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP, - ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_SCTP}; struct rss_type_match_hdr hint_eth_ipv4_esp = { ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_ESP, @@ -313,10 +309,6 @@ struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = { ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP, ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_TCP}; -struct rss_type_match_hdr hint_eth_pppoes_ipv6_sctp = { - ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 | - ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP, - ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_SCTP}; struct rss_type_match_hdr hint_eth_pppoes = { ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_ETH | ETH_RSS_PPPOE}; @@ -400,8 +392,6 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_pppoes_ipv4_udp}, {pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE, &hint_eth_pppoes_ipv4_tcp}, - {pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE, - &hint_eth_pppoes_ipv4_sctp}, {pattern_eth_ipv4_esp, ICE_INSET_NONE, &hint_eth_ipv4_esp}, {pattern_eth_ipv4_udp_esp, ICE_INSET_NONE, @@ -452,8 +442,6 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = { &hint_eth_pppoes_ipv6_udp}, {pattern_eth_pppoes_ipv6_tcp, ICE_INSET_NONE, &hint_eth_pppoes_ipv6_tcp}, - {pattern_eth_pppoes_ipv6_sctp, ICE_INSET_NONE, - &hint_eth_pppoes_ipv6_sctp}, {pattern_eth_pppoes, ICE_INSET_NONE, &hint_eth_pppoes}, }; @@ -491,6 +479,8 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID)}, {ETH_RSS_PFCP, BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)}, + {ETH_RSS_GTPU, + BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID)}, /* IPV4 */ {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, @@ -506,6 +496,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | @@ -516,6 +507,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT) | @@ -535,6 +527,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | @@ -545,6 +538,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT) | @@ -564,6 +558,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)}, {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | @@ -574,6 +569,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)}, {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) | @@ -614,6 +610,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | @@ -624,6 +621,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT) | @@ -643,6 +641,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)}, {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) | @@ -651,6 +650,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)}, {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, @@ -664,6 +664,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)}, {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) | @@ -672,6 +673,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)}, {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, @@ -685,6 +687,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)}, {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) | @@ -693,6 +696,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)}, {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)}, {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)}, @@ -708,6 +712,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | @@ -718,6 +723,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT) | @@ -735,6 +741,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)}, {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) | @@ -743,6 +750,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)}, {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, @@ -756,6 +764,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)}, {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) | @@ -764,6 +773,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)}, {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, @@ -777,6 +787,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)}, {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) | @@ -785,6 +796,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)}, {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)}, {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)}, @@ -800,6 +812,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)}, {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | @@ -810,6 +823,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)}, {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) | @@ -827,6 +841,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)}, {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) | @@ -835,6 +850,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)}, {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, @@ -848,6 +864,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)}, {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) | @@ -856,6 +873,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)}, {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, @@ -869,6 +887,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_SRC_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)}, {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) | @@ -877,6 +896,7 @@ struct ice_hash_match_type ice_hash_type_list[] = { BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)}, {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_DST_ONLY, + BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)}, {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)}, @@ -994,6 +1014,7 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, enum rte_flow_action_type action_type; const struct rte_flow_action_rss *rss; const struct rte_flow_action *action; + bool hash_map_found = false; uint64_t rss_attr_src_dst; uint64_t rss_attr_l3_pre; uint64_t rss_attr_symm; @@ -1107,10 +1128,18 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, if (rss_type == ht_map->hash_type) { hash_meta->hash_flds = ht_map->hash_flds; + hash_map_found = true; break; } } + if (pattern_match_item->pattern_list != + pattern_empty && !hash_map_found) { + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "Not supported flow"); + } + /* update hash field for nat-t esp. */ if (rss_type == ETH_RSS_ESP && (m->eth_rss_hint & ETH_RSS_NONFRAG_IPV4_UDP || @@ -1121,21 +1150,25 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item, BIT_ULL(ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI); } - /* update hash field for gtpu-ip and gtpu-eh. */ - if (rss_type != ETH_RSS_GTPU) - break; - else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_IP) - hash_meta->hash_flds |= - BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID); - else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_EH) + /* update hash field for gtpu eh/gtpu dwn/gtpu up. */ + 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 |= BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_EH_TEID); - else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_DWN) + } else if (hash_meta->pkt_hdr & + ICE_FLOW_SEG_HDR_GTPU_DWN) { + hash_meta->hash_flds &= + ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID)); hash_meta->hash_flds |= BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID); - else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_UP) + } else if (hash_meta->pkt_hdr & + ICE_FLOW_SEG_HDR_GTPU_UP) { + hash_meta->hash_flds &= + ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID)); hash_meta->hash_flds |= BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_UP_TEID); + } break; @@ -1244,7 +1277,7 @@ ice_hash_create(struct ice_adapter *ad, (hash_function == RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ); - ret = ice_add_rss_cfg(hw, vsi->idx, + ret = ice_add_rss_cfg_wrap(pf, vsi->idx, filter_ptr->rss_cfg.hashed_flds, filter_ptr->rss_cfg.packet_hdr, filter_ptr->rss_cfg.symm); @@ -1288,7 +1321,7 @@ ice_hash_destroy(struct ice_adapter *ad, (1 << VSIQF_HASH_CTL_HASH_SCHEME_S); ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg); } else { - ret = ice_rem_rss_cfg(hw, vsi->idx, + ret = ice_rem_rss_cfg_wrap(pf, vsi->idx, filter_ptr->rss_cfg.hashed_flds, filter_ptr->rss_cfg.packet_hdr); /* Fixme: Ignore the error if a rule does not exist.