X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fiavf%2Fiavf_hash.c;h=c06b52ea9141a65e63b41deccd03bd574e212a4c;hb=e2a8cae024a5de4d08bc79dead9528e9ce6836c5;hp=967e6b64b54ec818ee920cff8bf40fde26f26ac7;hpb=642f201950152dad5737f339d8348810001d71df;p=dpdk.git diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c index 967e6b64b5..c06b52ea91 100644 --- a/drivers/net/iavf/iavf_hash.c +++ b/drivers/net/iavf/iavf_hash.c @@ -595,6 +595,51 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4 = { TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4 } }; +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot, + proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot, + proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_only = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_prot, + proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot, + proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot, + proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_only = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_prot, + proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_sctp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot, + proto_hint_sctp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_sctp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_dst_prot, + proto_hint_sctp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_sctp_only = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_prot, + proto_hint_sctp_only } +}; + struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_port = { TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_src_prot, proto_hint_udp_src_port } @@ -742,6 +787,36 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_ip = { proto_hint_ipv4 } }; +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv4_src_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv4_dst_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_udp_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv4_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv4_src_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv4_dst_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_tcp_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv4_prot, proto_hint_tcp_only } +}; + struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_ip = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, proto_hint_ipv4_only_prot, proto_hint_udp_src_port} @@ -833,6 +908,36 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_ip = { proto_hint_ipv6 } }; +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv6_src_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv6_dst_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_udp_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv6_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv6_src_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_gtpu_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv6_dst_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_tcp_ip = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, + proto_hint_ipv6_prot, proto_hint_tcp_only } +}; + struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_ip = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_ip_only, proto_hint_ipv6_only_prot, proto_hint_udp_src_port} @@ -905,6 +1010,36 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_ip = { /* IPv4 GTPU EH */ +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv4_src_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv4_dst_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_udp_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv4_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv4_src_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv4_dst_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_tcp_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv4_prot, proto_hint_tcp_only } +}; + struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_eh = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, proto_hint_ipv4_only_prot, proto_hint_udp_src_port} @@ -992,6 +1127,36 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_eh = { /* IPv6 GTPU EH */ +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_src_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_dst_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_udp_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_src_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_gtpu_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_dst_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_tcp_eh = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, + proto_hint_ipv6_prot, proto_hint_tcp_only } +}; + struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_eh = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_eh_only, proto_hint_ipv6_only_prot, proto_hint_udp_src_port} @@ -1079,6 +1244,36 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_eh = { /* IPv4 GTPU UP */ +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv4_src_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv4_dst_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_udp_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv4_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv4_src_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv4_dst_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_tcp_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv4_prot, proto_hint_tcp_only } +}; + struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_up = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, proto_hint_ipv4_only_prot, proto_hint_udp_src_port} @@ -1166,6 +1361,36 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_up = { /* IPv6 GTPU UP */ +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_src_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_dst_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_udp_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_src_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_gtpu_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_dst_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_tcp_up = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, + proto_hint_ipv6_prot, proto_hint_tcp_only } +}; + struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_up = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_up_only, proto_hint_ipv6_only_prot, proto_hint_udp_src_port} @@ -1253,6 +1478,36 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_gtpu_up = { /* IPv4 GTPU DWN */ +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv4_src_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv4_dst_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_udp_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv4_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv4_src_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv4_dst_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_tcp_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv4_prot, proto_hint_tcp_only } +}; + struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_dwn = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, proto_hint_ipv4_only_prot, proto_hint_udp_src_port} @@ -1340,6 +1595,36 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_dwn = { /* IPv6 GTPU DWN */ +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_src_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_dst_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_udp_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_prot, proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_src_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_gtpu_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_dst_prot, proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_gtpu_tcp_dwn = { + TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, + proto_hint_ipv6_prot, proto_hint_tcp_only } +}; + struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_gtpu_dwn = { TUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_THREE, {proto_hint_gtpu_dwn_only, proto_hint_ipv6_only_prot, proto_hint_udp_src_port} @@ -1539,6 +1824,51 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6 = { TUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6 } }; +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot, + proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot, + proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_only = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_prot, + proto_hint_udp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_tcp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot, + proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot, + proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_only = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_prot, + proto_hint_tcp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_sctp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot, + proto_hint_sctp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_sctp = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_dst_prot, + proto_hint_sctp_only } +}; + +struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp_only = { + TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_prot, + proto_hint_sctp_only } +}; + struct virtchnl_proto_hdrs hdrs_hint_ipv6_src_udp_src_port = { TUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_src_prot, proto_hint_udp_src_port } @@ -1677,10 +2007,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { &hdrs_hint_eth_dst_ipv4, IAVF_PHINT_IPV4}, {ETH_RSS_ETH, &hdrs_hint_eth_ipv4, IAVF_PHINT_IPV4}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4}, {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4}, {ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY, @@ -1716,18 +2042,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { &hdrs_hint_eth_dst_ipv4_udp, IAVF_PHINT_IPV4_UDP}, {ETH_RSS_ETH, &hdrs_hint_eth_ipv4_udp, IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_udp_src_port, IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_udp_dst_port, IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_udp_src_port, IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_udp_dst_port, IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_udp_src_port, IAVF_PHINT_IPV4_UDP}, @@ -1735,7 +2049,7 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_src_udp_dst_port, IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | - ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src, + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_udp, IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, @@ -1744,12 +2058,8 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_dst_udp_dst_port, IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | - ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst, + ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst_udp, IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_udp_src_port, IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_udp_dst_port, IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_udp_src_port, IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, @@ -1767,18 +2077,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { &hdrs_hint_eth_dst_ipv4_tcp, IAVF_PHINT_IPV4_TCP}, {ETH_RSS_ETH, &hdrs_hint_eth_ipv4_tcp, IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_tcp_src_port, IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_tcp_dst_port, IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_tcp_src_port, IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_tcp_src_port, IAVF_PHINT_IPV4_TCP}, @@ -1786,7 +2084,7 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_src_tcp_dst_port, IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | - ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src, + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_tcp, IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, @@ -1795,12 +2093,8 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | - ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst, + ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst_tcp, IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_tcp_src_port, IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_tcp_dst_port, IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_tcp_src_port, IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, @@ -1814,18 +2108,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { &hdrs_hint_eth_dst_ipv4_sctp, IAVF_PHINT_IPV4_SCTP}, {ETH_RSS_ETH, &hdrs_hint_eth_ipv4_sctp, IAVF_PHINT_IPV4_SCTP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_sctp_src_port, IAVF_PHINT_IPV4_SCTP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_sctp_dst_port, IAVF_PHINT_IPV4_SCTP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src, IAVF_PHINT_IPV4_SCTP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_sctp_src_port, IAVF_PHINT_IPV4_SCTP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_PHINT_IPV4_SCTP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4_SCTP}, {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_sctp_src_port, IAVF_PHINT_IPV4_SCTP}, @@ -1833,7 +2115,7 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_src_sctp_dst_port, IAVF_PHINT_IPV4_SCTP}, {ETH_RSS_NONFRAG_IPV4_SCTP | - ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src, + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_sctp, IAVF_PHINT_IPV4_SCTP}, {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, @@ -1842,12 +2124,8 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_PHINT_IPV4_SCTP}, {ETH_RSS_NONFRAG_IPV4_SCTP | - ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst, + ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst_sctp, IAVF_PHINT_IPV4_SCTP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_sctp_src_port, IAVF_PHINT_IPV4_SCTP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_sctp_dst_port, IAVF_PHINT_IPV4_SCTP}, {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_sctp_src_port, IAVF_PHINT_IPV4_SCTP}, {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY, @@ -1861,10 +2139,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { &hdrs_hint_eth_dst_ipv6, IAVF_PHINT_IPV6}, {ETH_RSS_ETH, &hdrs_hint_eth_ipv6, IAVF_PHINT_IPV6}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src, IAVF_PHINT_IPV6}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6}, {ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src, IAVF_PHINT_IPV6}, {ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY, @@ -1884,18 +2158,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { &hdrs_hint_eth_dst_ipv6_udp, IAVF_PHINT_IPV6_UDP}, {ETH_RSS_ETH, &hdrs_hint_eth_ipv6_udp, IAVF_PHINT_IPV6_UDP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv6_src_udp_src_port, IAVF_PHINT_IPV6_UDP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv6_src_udp_dst_port, IAVF_PHINT_IPV6_UDP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src, IAVF_PHINT_IPV6_UDP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv6_dst_udp_src_port, IAVF_PHINT_IPV6_UDP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv6_dst_udp_dst_port, IAVF_PHINT_IPV6_UDP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_src_udp_src_port, IAVF_PHINT_IPV6_UDP}, @@ -1903,7 +2165,7 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_src_udp_dst_port, IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | - ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src, + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src_udp, IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, @@ -1912,12 +2174,8 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_dst_udp_dst_port, IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | - ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst, + ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst_udp, IAVF_PHINT_IPV6_UDP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv6_udp_src_port, IAVF_PHINT_IPV6_UDP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv6_udp_dst_port, IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_udp_src_port, IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, @@ -1935,18 +2193,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { &hdrs_hint_eth_dst_ipv6_tcp, IAVF_PHINT_IPV6_TCP}, {ETH_RSS_ETH, &hdrs_hint_eth_ipv6_tcp, IAVF_PHINT_IPV6_TCP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv6_src_tcp_src_port, IAVF_PHINT_IPV6_TCP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv6_src_tcp_dst_port, IAVF_PHINT_IPV6_TCP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src, IAVF_PHINT_IPV6_TCP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv6_dst_tcp_src_port, IAVF_PHINT_IPV6_TCP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv6_dst_tcp_dst_port, IAVF_PHINT_IPV6_TCP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_src_tcp_src_port, IAVF_PHINT_IPV6_TCP}, @@ -1954,7 +2200,7 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_src_tcp_dst_port, IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | - ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src, + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src_tcp, IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, @@ -1963,12 +2209,8 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_dst_tcp_dst_port, IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | - ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst, + ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst_tcp, IAVF_PHINT_IPV6_TCP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv6_tcp_src_port, IAVF_PHINT_IPV6_TCP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv6_tcp_dst_port, IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_tcp_src_port, IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, @@ -1982,18 +2224,6 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { &hdrs_hint_eth_dst_ipv6_sctp, IAVF_PHINT_IPV6_SCTP}, {ETH_RSS_ETH, &hdrs_hint_eth_ipv6_sctp, IAVF_PHINT_IPV6_SCTP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv6_src_sctp_src_port, IAVF_PHINT_IPV6_SCTP}, - {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv6_src_sctp_dst_port, IAVF_PHINT_IPV6_SCTP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src, IAVF_PHINT_IPV6_SCTP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv6_dst_sctp_src_port, IAVF_PHINT_IPV6_SCTP}, - {ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv6_dst_sctp_dst_port, IAVF_PHINT_IPV6_SCTP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6_SCTP}, {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_src_sctp_src_port, IAVF_PHINT_IPV6_SCTP}, @@ -2001,7 +2231,7 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_src_sctp_dst_port, IAVF_PHINT_IPV6_SCTP}, {ETH_RSS_NONFRAG_IPV6_SCTP | - ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src, + ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src_sctp, IAVF_PHINT_IPV6_SCTP}, {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, @@ -2010,12 +2240,8 @@ struct iavf_hash_match_type iavf_hash_map_list[] = { ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_dst_sctp_dst_port, IAVF_PHINT_IPV6_SCTP}, {ETH_RSS_NONFRAG_IPV6_SCTP | - ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst, + ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst_sctp, IAVF_PHINT_IPV6_SCTP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv6_sctp_src_port, IAVF_PHINT_IPV6_SCTP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv6_sctp_dst_port, IAVF_PHINT_IPV6_SCTP}, {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_sctp_src_port, IAVF_PHINT_IPV6_SCTP}, {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY, @@ -2044,12 +2270,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { /* GTPU */ /* GTPU IP */ /* IPv4 GTPU IP IPv4*/ - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4}, {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_gtpu_ip, @@ -2110,34 +2330,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { &hdrs_hint_teid_gtpu_ip, IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6}, /* IPv4 GTPU IP IPv4 UDP */ - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_udp_src_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_udp_dst_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_udp_src_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_udp_src_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_udp_dst_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_udp_dst_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_udp_src_gtpu_ip, @@ -2148,7 +2340,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_ip, + &hdrs_hint_ipv4_src_udp_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, @@ -2164,7 +2356,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_ip, + &hdrs_hint_ipv4_dst_udp_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, @@ -2184,7 +2376,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_ip, + &hdrs_hint_ipv6_src_udp_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, @@ -2200,7 +2392,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_ip, + &hdrs_hint_ipv6_dst_udp_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, @@ -2220,7 +2412,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_ip, + &hdrs_hint_ipv4_src_udp_gtpu_ip, IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, @@ -2236,7 +2428,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_ip, + &hdrs_hint_ipv4_dst_udp_gtpu_ip, IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, @@ -2256,7 +2448,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_ip, + &hdrs_hint_ipv6_src_udp_gtpu_ip, IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, @@ -2272,7 +2464,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_ip, + &hdrs_hint_ipv6_dst_udp_gtpu_ip, IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, @@ -2282,34 +2474,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { &hdrs_hint_ipv6_udp_gtpu_ip, IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_UDP}, /* IPv4 GTPU IP IPv4 TCP */ - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_tcp_src_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_tcp_dst_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_tcp_src_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_tcp_src_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_tcp_dst_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_tcp_dst_gtpu_ip, - IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_tcp_src_gtpu_ip, @@ -2320,7 +2484,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_ip, + &hdrs_hint_ipv4_src_tcp_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, @@ -2336,7 +2500,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_ip, + &hdrs_hint_ipv4_dst_tcp_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, @@ -2356,7 +2520,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_ip, + &hdrs_hint_ipv6_src_tcp_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, @@ -2372,7 +2536,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_ip, + &hdrs_hint_ipv6_dst_tcp_gtpu_ip, IAVF_PHINT_IPV4_GTPU_IP | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, @@ -2392,7 +2556,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_ip, + &hdrs_hint_ipv4_src_tcp_gtpu_ip, IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, @@ -2408,7 +2572,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_ip, + &hdrs_hint_ipv4_dst_tcp_gtpu_ip, IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, @@ -2428,7 +2592,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_ip, + &hdrs_hint_ipv6_src_tcp_gtpu_ip, IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, @@ -2444,7 +2608,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_ip, + &hdrs_hint_ipv6_dst_tcp_gtpu_ip, IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, @@ -2455,12 +2619,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_IP | IAVF_PHINT_IPV6_TCP}, /* GTPU EH */ /* IPv4 GTPU EH IPv4 */ - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4}, {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_gtpu_eh, @@ -2509,34 +2667,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { &hdrs_hint_ipv6_gtpu_eh, IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6}, /* IPv4 GTPU EH IPv4 UDP */ - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_udp_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_udp_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_udp_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_udp_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_udp_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_udp_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_udp_src_gtpu_eh, @@ -2547,7 +2677,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_eh, + &hdrs_hint_ipv4_src_udp_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, @@ -2563,7 +2693,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_udp_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, @@ -2583,7 +2713,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_eh, + &hdrs_hint_ipv6_src_udp_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, @@ -2599,7 +2729,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_eh, + &hdrs_hint_ipv6_dst_udp_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, @@ -2619,7 +2749,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_eh, + &hdrs_hint_ipv4_src_udp_gtpu_eh, IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, @@ -2635,7 +2765,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_udp_gtpu_eh, IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, @@ -2655,7 +2785,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_eh, + &hdrs_hint_ipv6_src_udp_gtpu_eh, IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, @@ -2671,7 +2801,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_eh, + &hdrs_hint_ipv6_dst_udp_gtpu_eh, IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, @@ -2681,34 +2811,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { &hdrs_hint_ipv6_udp_gtpu_eh, IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_UDP}, /* IPv4 GTPU EH IPv4 TCP */ - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_tcp_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_tcp_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_tcp_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_tcp_src_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_tcp_dst_gtpu_eh, - IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_tcp_src_gtpu_eh, @@ -2719,7 +2821,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_eh, + &hdrs_hint_ipv4_src_tcp_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, @@ -2735,7 +2837,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_tcp_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, @@ -2755,7 +2857,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_eh, + &hdrs_hint_ipv6_src_tcp_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, @@ -2771,7 +2873,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_eh, + &hdrs_hint_ipv6_dst_tcp_gtpu_eh, IAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, @@ -2791,7 +2893,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_eh, + &hdrs_hint_ipv4_src_tcp_gtpu_eh, IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, @@ -2807,7 +2909,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_eh, + &hdrs_hint_ipv4_dst_tcp_gtpu_eh, IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, @@ -2827,7 +2929,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_eh, + &hdrs_hint_ipv6_src_tcp_gtpu_eh, IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, @@ -2843,7 +2945,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_eh, + &hdrs_hint_ipv6_dst_tcp_gtpu_eh, IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, @@ -2854,12 +2956,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH | IAVF_PHINT_IPV6_TCP}, /* GTPU EH UP */ /* IPv4 GTPU EH UP IPv4 */ - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4}, {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_gtpu_up, @@ -2908,34 +3004,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { &hdrs_hint_ipv6_gtpu_up, IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6}, /* IPv4 GTPU EH UP IPv4 UDP */ - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_udp_src_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_udp_dst_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_udp_src_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_udp_src_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_udp_dst_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_udp_dst_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_udp_src_gtpu_up, @@ -2946,7 +3014,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_up, + &hdrs_hint_ipv4_src_udp_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, @@ -2962,7 +3030,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_up, + &hdrs_hint_ipv4_dst_udp_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, @@ -2982,7 +3050,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_up, + &hdrs_hint_ipv6_src_udp_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, @@ -2998,7 +3066,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_up, + &hdrs_hint_ipv6_dst_udp_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, @@ -3018,7 +3086,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_up, + &hdrs_hint_ipv4_src_udp_gtpu_up, IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, @@ -3034,7 +3102,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_up, + &hdrs_hint_ipv4_dst_udp_gtpu_up, IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, @@ -3054,7 +3122,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_up, + &hdrs_hint_ipv6_src_udp_gtpu_up, IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, @@ -3070,7 +3138,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_up, + &hdrs_hint_ipv6_dst_udp_gtpu_up, IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, @@ -3080,34 +3148,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { &hdrs_hint_ipv6_udp_gtpu_up, IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_UDP}, /* IPv4 GTPU EH UP IPv4 TCP */ - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_tcp_src_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_tcp_dst_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_tcp_src_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_tcp_src_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_tcp_dst_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_tcp_dst_gtpu_up, - IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_tcp_src_gtpu_up, @@ -3118,7 +3158,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_up, + &hdrs_hint_ipv4_src_tcp_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, @@ -3134,7 +3174,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_up, + &hdrs_hint_ipv4_dst_tcp_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, @@ -3154,7 +3194,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_up, + &hdrs_hint_ipv6_src_tcp_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, @@ -3170,7 +3210,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_up, + &hdrs_hint_ipv6_dst_tcp_gtpu_up, IAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, @@ -3190,7 +3230,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_up, + &hdrs_hint_ipv4_src_tcp_gtpu_up, IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, @@ -3206,7 +3246,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_up, + &hdrs_hint_ipv4_dst_tcp_gtpu_up, IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, @@ -3226,7 +3266,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_up, + &hdrs_hint_ipv6_src_tcp_gtpu_up, IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, @@ -3242,7 +3282,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_up, + &hdrs_hint_ipv6_dst_tcp_gtpu_up, IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, @@ -3253,12 +3293,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_UPLINK | IAVF_PHINT_IPV6_TCP}, /* GTPU EH DWN */ /* IPv4 GTPU EH DWN IPv4 */ - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4}, {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src_gtpu_dwn, @@ -3307,34 +3341,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { &hdrs_hint_ipv6_gtpu_dwn, IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6}, /* IPv4 GTPU EH DWN IPv4 UDP */ - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_udp_src_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_udp_dst_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_udp_src_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_udp_src_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_udp_dst_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_udp_src_gtpu_dwn, @@ -3345,7 +3351,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_dwn, + &hdrs_hint_ipv4_src_udp_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, @@ -3361,7 +3367,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_dwn, + &hdrs_hint_ipv4_dst_udp_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, @@ -3381,7 +3387,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_dwn, + &hdrs_hint_ipv6_src_udp_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, @@ -3397,7 +3403,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_dwn, + &hdrs_hint_ipv6_dst_udp_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, @@ -3417,7 +3423,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_dwn, + &hdrs_hint_ipv4_src_udp_gtpu_dwn, IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY, @@ -3433,7 +3439,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_dwn, + &hdrs_hint_ipv4_dst_udp_gtpu_dwn, IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP}, {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY, @@ -3453,7 +3459,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_dwn, + &hdrs_hint_ipv6_src_udp_gtpu_dwn, IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY, @@ -3469,7 +3475,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_dwn, + &hdrs_hint_ipv6_dst_udp_gtpu_dwn, IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY, @@ -3479,34 +3485,6 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { &hdrs_hint_ipv6_udp_gtpu_dwn, IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_UDP}, /* IPv4 GTPU EH DWN IPv4 TCP */ - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_src_tcp_src_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_tcp_src_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_SRC_ONLY, - &hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY | - ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, - {ETH_RSS_L4_DST_ONLY, - &hdrs_hint_ipv4_tcp_dst_gtpu_dwn, - IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_tcp_src_gtpu_dwn, @@ -3517,7 +3495,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_dwn, + &hdrs_hint_ipv4_src_tcp_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, @@ -3533,7 +3511,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_dwn, + &hdrs_hint_ipv4_dst_tcp_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, @@ -3553,7 +3531,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_dwn, + &hdrs_hint_ipv6_src_tcp_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, @@ -3569,7 +3547,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_dwn, + &hdrs_hint_ipv6_dst_tcp_gtpu_dwn, IAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, @@ -3589,7 +3567,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv4_src_gtpu_dwn, + &hdrs_hint_ipv4_src_tcp_gtpu_dwn, IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY, @@ -3605,7 +3583,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv4_dst_gtpu_dwn, + &hdrs_hint_ipv4_dst_tcp_gtpu_dwn, IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP}, {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY, @@ -3625,7 +3603,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY, - &hdrs_hint_ipv6_src_gtpu_dwn, + &hdrs_hint_ipv6_src_tcp_gtpu_dwn, IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY, @@ -3641,7 +3619,7 @@ struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = { IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY, - &hdrs_hint_ipv6_dst_gtpu_dwn, + &hdrs_hint_ipv6_dst_tcp_gtpu_dwn, IAVF_PHINT_IPV6_GTPU_EH_DWNLINK | IAVF_PHINT_IPV6_TCP}, {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY, @@ -3686,7 +3664,6 @@ iavf_hash_default_set(struct iavf_adapter *ad, bool add) { struct virtchnl_rss_cfg *rss_cfg; uint16_t i; - int ret; rss_cfg = rte_zmalloc("iavf rss rule", sizeof(struct virtchnl_rss_cfg), 0); @@ -3697,16 +3674,10 @@ iavf_hash_default_set(struct iavf_adapter *ad, bool add) rss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i]; rss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC; - ret = iavf_add_del_rss_cfg(ad, rss_cfg, add); - if (ret) { - PMD_DRV_LOG(ERR, "fail to %s RSS configure", - add ? "add" : "delete"); - rte_free(rss_cfg); - return ret; - } + iavf_add_del_rss_cfg(ad, rss_cfg, add); } - return ret; + return 0; } RTE_INIT(iavf_hash_engine_init) @@ -3830,6 +3801,9 @@ iavf_hash_parse_action(const struct rte_flow_action actions[], RTE_ETH_HASH_FUNCTION_SIMPLE_XOR){ rss_meta->rss_algorithm = VIRTCHNL_RSS_ALG_XOR_ASYMMETRIC; + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, action, + "function simple_xor is not supported"); } else if (rss->func == RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) { rss_meta->rss_algorithm =