[dpdk-dev] net/ice: enable new input set for rss hash

[Jeff Guo <jia.guo@intel.com>]

PF could add or delete a RSS rule base on the PF's hash capability.
Some new rss input set will be supported, the protocols as below:
eth src/eth dst/svlan/cvlan/l2tpv3/esp/ah/pfcp/gtpu down/gtpu up.

Signed-off-by: Jeff Guo <jia.guo@intel.com>
---
 drivers/net/ice/ice_hash.c | 1557 +++++++++++++++++++++++++++++++-----
 1 file changed, 1370 insertions(+), 187 deletions(-)

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 3d58b7184..561656b23 100644
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -25,14 +25,42 @@
 #include "ice_ethdev.h"
 #include "ice_generic_flow.h"
 
-struct rss_type_match_hdr {
-	uint32_t hdr_mask;
-	uint64_t eth_rss_hint;
+enum ice_pattern_hint_type {
+	ICE_PHINT_NONE,
+	ICE_PHINT_IPV4,
+	ICE_PHINT_IPV4_UDP,
+	ICE_PHINT_IPV4_TCP,
+	ICE_PHINT_IPV4_SCTP,
+	ICE_PHINT_IPV6,
+	ICE_PHINT_IPV6_UDP,
+	ICE_PHINT_IPV6_TCP,
+	ICE_PHINT_IPV6_SCTP,
+	ICE_PHINT_IPV4_GTPU_IPV4,
+	ICE_PHINT_IPV4_GTPU_EH_IPV4,
+	ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP,
+	ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP,
+};
+
+enum ice_gtpu_hint {
+	ICE_GTPU_HINT_DOWNLINK,
+	ICE_GTPU_HINT_UPLINK,
+	ICE_GTPU_HINT_NONE,
+};
+
+struct ice_pattern_match_type {
+	enum ice_pattern_hint_type phint_type;
+};
+
+struct ice_hash_cfg {
+	uint32_t hdrs;
+	uint64_t flds;
 };
 
 struct ice_hash_match_type {
+	enum ice_pattern_hint_type phint_type;
 	uint64_t hash_type;
-	uint64_t hash_flds;
+	struct ice_hash_cfg *hcfg;
+	enum ice_gtpu_hint gtpu_hint;
 };
 
 struct rss_meta {
@@ -75,144 +103,1304 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad,
 			void **meta,
 			struct rte_flow_error *error);
 
-/* The first member is protocol header, the second member is ETH_RSS_*. */
-struct rss_type_match_hdr hint_0 = {
-	ICE_FLOW_SEG_HDR_NONE,	0};
-struct rss_type_match_hdr hint_1 = {
-	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_IPV4};
-struct rss_type_match_hdr hint_2 = {
-	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_UDP |
-	ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV4_UDP};
-struct rss_type_match_hdr hint_3 = {
-	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_TCP |
-	ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV4_TCP};
-struct rss_type_match_hdr hint_4 = {
-	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_SCTP |
-	ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV4_SCTP};
-struct rss_type_match_hdr hint_5 = {
-	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_IPV6};
-struct rss_type_match_hdr hint_6 = {
-	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_UDP |
-	ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV6_UDP};
-struct rss_type_match_hdr hint_7 = {
-	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_TCP |
-	ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV6_TCP};
-struct rss_type_match_hdr hint_8 = {
-	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_SCTP |
-	ICE_FLOW_SEG_HDR_IPV_OTHER, ETH_RSS_NONFRAG_IPV6_SCTP};
-struct rss_type_match_hdr hint_9 = {
-	ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_IPV4};
-struct rss_type_match_hdr hint_10 = {
-	ICE_FLOW_SEG_HDR_PPPOE,	ETH_RSS_IPV4};
-struct rss_type_match_hdr hint_11 = {
-	ICE_FLOW_SEG_HDR_PPPOE,	ETH_RSS_NONFRAG_IPV4_UDP};
-struct rss_type_match_hdr hint_12 = {
-	ICE_FLOW_SEG_HDR_PPPOE,	ETH_RSS_NONFRAG_IPV4_TCP};
-struct rss_type_match_hdr hint_13 = {
-	ICE_FLOW_SEG_HDR_PPPOE,	ETH_RSS_NONFRAG_IPV4_SCTP};
-struct rss_type_match_hdr hint_14 = {
-	ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_UDP};
-struct rss_type_match_hdr hint_15 = {
-	ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_TCP};
+static struct ice_pattern_match_type phint_empty = {
+	ICE_PHINT_NONE};
+static struct ice_pattern_match_type phint_eth_ipv4 = {
+	ICE_PHINT_IPV4};
+static struct ice_pattern_match_type phint_eth_ipv4_udp = {
+	ICE_PHINT_IPV4_UDP};
+static struct ice_pattern_match_type phint_eth_ipv4_tcp = {
+	ICE_PHINT_IPV4_TCP};
+static struct ice_pattern_match_type phint_eth_ipv4_sctp = {
+	ICE_PHINT_IPV4_SCTP};
+static struct ice_pattern_match_type phint_eth_ipv4_gtpu_ipv4 = {
+	ICE_PHINT_IPV4_GTPU_IPV4};
+static struct ice_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4 = {
+	ICE_PHINT_IPV4_GTPU_EH_IPV4};
+static struct ice_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_udp = {
+	ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP};
+static struct ice_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_tcp = {
+	ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP};
+static struct ice_pattern_match_type phint_eth_ipv4_esp = {
+	ICE_PHINT_IPV4};
+static struct ice_pattern_match_type phint_eth_ipv4_ah = {
+	ICE_PHINT_IPV4};
+static struct ice_pattern_match_type phint_eth_ipv4_l2tpv3 = {
+	ICE_PHINT_IPV4};
+static struct ice_pattern_match_type phint_eth_ipv4_pfcp = {
+	ICE_PHINT_IPV4_UDP};
+static struct ice_pattern_match_type phint_eth_pppoes_ipv4 = {
+	ICE_PHINT_IPV4};
+static struct ice_pattern_match_type phint_eth_pppoes_ipv4_udp = {
+	ICE_PHINT_IPV4_UDP};
+static struct ice_pattern_match_type phint_eth_pppoes_ipv4_tcp = {
+	ICE_PHINT_IPV4_TCP};
+static struct ice_pattern_match_type phint_eth_pppoes_ipv4_sctp = {
+	ICE_PHINT_IPV4_SCTP};
+static struct ice_pattern_match_type phint_eth_ipv6 = {
+	ICE_PHINT_IPV6};
+static struct ice_pattern_match_type phint_eth_ipv6_udp = {
+	ICE_PHINT_IPV6_UDP};
+static struct ice_pattern_match_type phint_eth_ipv6_tcp = {
+	ICE_PHINT_IPV6_TCP};
+static struct ice_pattern_match_type phint_eth_ipv6_sctp = {
+	ICE_PHINT_IPV6_SCTP};
+static struct ice_pattern_match_type phint_eth_ipv6_esp = {
+	ICE_PHINT_IPV6};
+static struct ice_pattern_match_type phint_eth_ipv6_ah = {
+	ICE_PHINT_IPV6};
+static struct ice_pattern_match_type phint_eth_ipv6_l2tpv3 = {
+	ICE_PHINT_IPV6};
+static struct ice_pattern_match_type phint_eth_ipv6_pfcp = {
+	ICE_PHINT_IPV6_UDP};
 
 /* Supported pattern for os default package. */
 static struct ice_pattern_match_item ice_hash_pattern_list_os[] = {
-	{pattern_eth_ipv4,	ICE_INSET_NONE,	&hint_1},
-	{pattern_eth_ipv4_udp,	ICE_INSET_NONE,	&hint_2},
-	{pattern_eth_ipv4_tcp,	ICE_INSET_NONE,	&hint_3},
-	{pattern_eth_ipv4_sctp,	ICE_INSET_NONE,	&hint_4},
-	{pattern_eth_ipv6,	ICE_INSET_NONE,	&hint_5},
-	{pattern_eth_ipv6_udp,	ICE_INSET_NONE,	&hint_6},
-	{pattern_eth_ipv6_tcp,	ICE_INSET_NONE,	&hint_7},
-	{pattern_eth_ipv6_sctp,	ICE_INSET_NONE,	&hint_8},
-	{pattern_empty,		ICE_INSET_NONE,	&hint_0},
+	{pattern_eth_ipv4,	ICE_INSET_NONE,	&phint_eth_ipv4},
+	{pattern_eth_ipv4_udp,	ICE_INSET_NONE,	&phint_eth_ipv4_udp},
+	{pattern_eth_ipv4_tcp,	ICE_INSET_NONE,	&phint_eth_ipv4_tcp},
+	{pattern_eth_ipv4_sctp,	ICE_INSET_NONE,	&phint_eth_ipv4_sctp},
+	{pattern_eth_ipv6,	ICE_INSET_NONE,	&phint_eth_ipv6},
+	{pattern_eth_ipv6_udp,	ICE_INSET_NONE,	&phint_eth_ipv6_udp},
+	{pattern_eth_ipv6_tcp,	ICE_INSET_NONE,	&phint_eth_ipv6_tcp},
+	{pattern_eth_ipv6_sctp,	ICE_INSET_NONE,	&phint_eth_ipv6_sctp},
+	{pattern_empty,		ICE_INSET_NONE,	&phint_empty},
 };
 
 /* Supported pattern for comms package. */
 static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
-	{pattern_eth_ipv4,		    ICE_INSET_NONE,  &hint_1},
-	{pattern_eth_ipv4_udp,		    ICE_INSET_NONE,  &hint_2},
-	{pattern_eth_ipv4_tcp,		    ICE_INSET_NONE,  &hint_3},
-	{pattern_eth_ipv4_sctp,		    ICE_INSET_NONE,  &hint_4},
-	{pattern_eth_ipv6,		    ICE_INSET_NONE,  &hint_5},
-	{pattern_eth_ipv6_udp,		    ICE_INSET_NONE,  &hint_6},
-	{pattern_eth_ipv6_tcp,		    ICE_INSET_NONE,  &hint_7},
-	{pattern_eth_ipv6_sctp,		    ICE_INSET_NONE,  &hint_8},
-	{pattern_empty,			    ICE_INSET_NONE,  &hint_0},
-	{pattern_eth_ipv4_gtpu_eh_ipv4,	    ICE_INSET_NONE,  &hint_9},
-	{pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,  &hint_14},
-	{pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,  &hint_15},
-	{pattern_eth_pppoes_ipv4,	    ICE_INSET_NONE,  &hint_10},
-	{pattern_eth_pppoes_ipv4_udp,	    ICE_INSET_NONE,  &hint_11},
-	{pattern_eth_pppoes_ipv4_tcp,	    ICE_INSET_NONE,  &hint_12},
-	{pattern_eth_pppoes_ipv4_sctp,	    ICE_INSET_NONE,  &hint_13},
+	{pattern_empty, ICE_INSET_NONE,	&phint_empty},
+	{pattern_eth_ipv4, ICE_INSET_NONE, &phint_eth_ipv4},
+	{pattern_eth_ipv4_udp, ICE_INSET_NONE, &phint_eth_ipv4_udp},
+	{pattern_eth_ipv4_tcp, ICE_INSET_NONE, &phint_eth_ipv4_tcp},
+	{pattern_eth_ipv4_sctp, ICE_INSET_NONE, &phint_eth_ipv4_sctp},
+	{pattern_eth_ipv4_gtpu_ipv4, ICE_INSET_NONE,
+				&phint_eth_ipv4_gtpu_ipv4},
+	{pattern_eth_ipv4_gtpu_eh_ipv4, ICE_INSET_NONE,
+				&phint_eth_ipv4_gtpu_eh_ipv4},
+	{pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
+				&phint_eth_ipv4_gtpu_eh_ipv4_udp},
+	{pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
+				&phint_eth_ipv4_gtpu_eh_ipv4_tcp},
+	{pattern_eth_pppoes_ipv4, ICE_INSET_NONE,
+				&phint_eth_pppoes_ipv4},
+	{pattern_eth_pppoes_ipv4_udp, ICE_INSET_NONE,
+				&phint_eth_pppoes_ipv4_udp},
+	{pattern_eth_pppoes_ipv4_tcp, ICE_INSET_NONE,
+				&phint_eth_pppoes_ipv4_tcp},
+	{pattern_eth_pppoes_ipv4_sctp, ICE_INSET_NONE,
+				&phint_eth_pppoes_ipv4_sctp},
+	{pattern_eth_ipv4_esp, ICE_INSET_NONE, &phint_eth_ipv4_esp},
+	{pattern_eth_ipv4_ah, ICE_INSET_NONE, &phint_eth_ipv4_ah},
+	{pattern_eth_ipv4_l2tp, ICE_INSET_NONE, &phint_eth_ipv4_l2tpv3},
+	{pattern_eth_ipv4_pfcp, ICE_INSET_NONE, &phint_eth_ipv4_pfcp},
+	{pattern_eth_ipv6, ICE_INSET_NONE, &phint_eth_ipv6},
+	{pattern_eth_ipv6_udp, ICE_INSET_NONE, &phint_eth_ipv6_udp},
+	{pattern_eth_ipv6_tcp, ICE_INSET_NONE, &phint_eth_ipv6_tcp},
+	{pattern_eth_ipv6_sctp, ICE_INSET_NONE, &phint_eth_ipv6_sctp},
+	{pattern_eth_ipv6_esp, ICE_INSET_NONE, &phint_eth_ipv6_esp},
+	{pattern_eth_ipv6_ah, ICE_INSET_NONE, &phint_eth_ipv6_ah},
+	{pattern_eth_ipv6_l2tp, ICE_INSET_NONE, &phint_eth_ipv6_l2tpv3},
+	{pattern_eth_ipv6_pfcp, ICE_INSET_NONE, &phint_eth_ipv6_pfcp},
+};
+
+/* ETH */
+
+struct ice_hash_cfg cfg_hint_eth_src = {
+	ICE_FLOW_SEG_HDR_ETH,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA),
+};
+
+struct ice_hash_cfg cfg_hint_eth_dst = {
+	ICE_FLOW_SEG_HDR_ETH,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA),
+};
+
+struct ice_hash_cfg cfg_hint_eth = {
+	ICE_FLOW_SEG_HDR_ETH,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA),
+};
+
+struct ice_hash_cfg cfg_hint_svlan = {
+	ICE_FLOW_SEG_HDR_VLAN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_S_VLAN),
+};
+
+struct ice_hash_cfg cfg_hint_cvlan = {
+	ICE_FLOW_SEG_HDR_VLAN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_C_VLAN),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_esp = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_ESP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_ESP_SPI),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_ah = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_AH,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_AH_SPI),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_l2tpv3 = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_L2TPV3,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_pfcp = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_PFCP_SESSION,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4 = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER,
+	ICE_FLOW_HASH_IPV4,
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_udp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_udp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_udp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_udp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_udp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_udp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_udp = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	ICE_HASH_UDP_IPV4 | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_tcp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_tcp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_tcp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_tcp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_tcp = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	ICE_HASH_TCP_IPV4 | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_sctp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_sctp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_sctp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_sctp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_sctp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_sctp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_sctp = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	ICE_HASH_SCTP_IPV4 | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT),
+};
+
+/* GTPU UP */
+
+struct ice_hash_cfg cfg_hint_ipv4_udp_src_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_udp_dst_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_tcp_src_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_tcp_dst_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_udp_src_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_udp_dst_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_tcp_src_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_tcp_dst_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_udp_src_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_udp_dst_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_src_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_dst_gtpu_up = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_UP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+/* GPTU DWN */
+
+struct ice_hash_cfg cfg_hint_ipv4_udp_src_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_udp_dst_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_tcp_src_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_tcp_dst_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_udp_src_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_udp_dst_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_tcp_src_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_src_tcp_dst_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_udp_src_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_udp_dst_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_src_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv4_dst_tcp_dst_gtpu_dwn = {
+	ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP |
+	ICE_FLOW_SEG_HDR_GTPU_DWN,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+/* IPV6 */
+
+struct ice_hash_cfg cfg_hint_ipv6_src = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_dst = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_esp = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_ESP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_ESP_SPI),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_ah = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_AH,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_AH_SPI),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_l2tpv3 = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_L2TPV3,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_pfcp = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_PFCP_SESSION,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6 = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER,
+	ICE_FLOW_HASH_IPV6,
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_src_udp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_src_udp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_dst_udp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_dst_udp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_udp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_udp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_udp = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_UDP,
+	ICE_HASH_UDP_IPV6 | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_src_tcp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_src_tcp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_dst_tcp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_dst_tcp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_tcp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_tcp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_tcp = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_TCP,
+	ICE_HASH_TCP_IPV6 | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_src_sctp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_src_sctp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_dst_sctp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_dst_sctp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_sctp_src_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_sctp_dst_port = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+	BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT),
+};
+
+struct ice_hash_cfg cfg_hint_ipv6_sctp = {
+	ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+	ICE_FLOW_SEG_HDR_SCTP,
+	ICE_HASH_SCTP_IPV6 | BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT),
 };
 
 /**
- * The first member is input set combination,
- * the second member is hash fields.
+ * The first member is pattern hint type,
+ * the second member is hash type,
+ * the third member is hash cfg (hdrs/fields).
+ * the forth member is downlink/uplink type.
  */
 struct ice_hash_match_type ice_hash_type_list[] = {
-	{ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,					BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
-	{ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,					BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
-	{ETH_RSS_IPV4,								ICE_FLOW_HASH_IPV4},
-	{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | 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_SA)},
-	{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | 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_DA)},
-	{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_UDP,						ICE_HASH_UDP_IPV4},
-	{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | 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_SA)},
-	{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | 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_DA)},
-	{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_TCP,						ICE_HASH_TCP_IPV4},
-	{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | 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_SA)},
-	{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | 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_DA)},
-	{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
-	{ETH_RSS_NONFRAG_IPV4_SCTP,						ICE_HASH_SCTP_IPV4},
-	{ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,					BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
-	{ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,					BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
-	{ETH_RSS_IPV6,								ICE_FLOW_HASH_IPV6},
-	{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | 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_SA)},
-	{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | 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_DA)},
-	{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_UDP,						ICE_HASH_UDP_IPV6},
-	{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | 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_SA)},
-	{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | 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_DA)},
-	{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_TCP,						ICE_HASH_TCP_IPV6},
-	{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | 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_SA)},
-	{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,	BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | 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_DA)},
-	{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,			BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
-	{ETH_RSS_NONFRAG_IPV6_SCTP,						ICE_HASH_SCTP_IPV6},
+	/* IPV4 */
+	{ICE_PHINT_IPV4, ETH_RSS_L2_SRC_ONLY,
+		&cfg_hint_eth_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_L2_DST_ONLY,
+		&cfg_hint_eth_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY,
+		&cfg_hint_eth_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_ETH | ETH_RSS_L2_DST_ONLY,
+		&cfg_hint_eth_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_ETH,
+		&cfg_hint_eth, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_S_VLAN,
+		&cfg_hint_svlan, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_C_VLAN,
+		&cfg_hint_cvlan, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_L3_SRC_ONLY,
+		&cfg_hint_ipv4_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_L3_DST_ONLY,
+		&cfg_hint_ipv4_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
+		&cfg_hint_ipv4_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,
+		&cfg_hint_ipv4_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_IPV4,
+		&cfg_hint_ipv4, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_ESP,
+		&cfg_hint_ipv4_esp, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_AH,
+		&cfg_hint_ipv4_ah, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4, ETH_RSS_L2TPV3,
+		&cfg_hint_ipv4_l2tpv3, ICE_GTPU_HINT_NONE},
+	/* IPV4 UDP */
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_src_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_src_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY,
+		&cfg_hint_ipv4_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_dst_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_dst_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY,
+		&cfg_hint_ipv4_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_src_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_src_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY, &cfg_hint_ipv4_src,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_dst_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_dst_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY, &cfg_hint_ipv4_dst,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_PFCP,
+		&cfg_hint_ipv4_pfcp, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP,
+		&cfg_hint_ipv4_udp, ICE_GTPU_HINT_NONE},
+	/* IPV4 TCP */
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_src_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_src_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_L3_SRC_ONLY,
+		&cfg_hint_ipv4_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_dst_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_dst_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_L3_DST_ONLY,
+		&cfg_hint_ipv4_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_src_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_src_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_SRC_ONLY, &cfg_hint_ipv4_src,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_dst_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_dst_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_DST_ONLY, &cfg_hint_ipv4_dst,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP,
+		&cfg_hint_ipv4_tcp, ICE_GTPU_HINT_NONE},
+	/* IPV4 SCTP */
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_src_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_src_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_L3_SRC_ONLY,
+		&cfg_hint_ipv4_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_dst_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_dst_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_L3_DST_ONLY,
+		&cfg_hint_ipv4_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_src_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_src_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
+		ETH_RSS_L3_SRC_ONLY, &cfg_hint_ipv4_src,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_dst_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_dst_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |
+		ETH_RSS_L3_DST_ONLY, &cfg_hint_ipv4_dst,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv4_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv4_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP,
+		&cfg_hint_ipv4_sctp, ICE_GTPU_HINT_NONE},
+	/* IPV6 */
+	{ICE_PHINT_IPV6, ETH_RSS_L2_SRC_ONLY,
+		&cfg_hint_eth_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_L2_DST_ONLY,
+		&cfg_hint_eth_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY,
+		&cfg_hint_eth_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_ETH | ETH_RSS_L2_DST_ONLY,
+		&cfg_hint_eth_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_ETH,
+		&cfg_hint_eth, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_S_VLAN,
+		&cfg_hint_svlan, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_C_VLAN,
+		&cfg_hint_cvlan, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_L3_SRC_ONLY,
+		&cfg_hint_ipv6_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_L3_DST_ONLY,
+		&cfg_hint_ipv6_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,
+		&cfg_hint_ipv6_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,
+		&cfg_hint_ipv6_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_IPV6,
+		&cfg_hint_ipv6, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_ESP,
+		&cfg_hint_ipv6_esp, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_AH,
+		&cfg_hint_ipv6_ah, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6, ETH_RSS_L2TPV3,
+		&cfg_hint_ipv6_l2tpv3, ICE_GTPU_HINT_NONE},
+	/* IPV6 UDP */
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_src_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_src_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_L3_SRC_ONLY,
+		&cfg_hint_ipv6_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_dst_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_dst_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_L3_DST_ONLY,
+		&cfg_hint_ipv6_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_src_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_src_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
+		ETH_RSS_L3_SRC_ONLY, &cfg_hint_ipv6_src,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_dst_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_dst_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |
+		ETH_RSS_L3_DST_ONLY, &cfg_hint_ipv6_dst,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_udp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_udp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_PFCP,
+		&cfg_hint_ipv6_pfcp, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP,
+		&cfg_hint_ipv6_udp, ICE_GTPU_HINT_NONE},
+	/* IPV6 TCP */
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_src_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_src_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_L3_SRC_ONLY,
+		&cfg_hint_ipv6_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_dst_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_dst_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_L3_DST_ONLY,
+		&cfg_hint_ipv6_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_src_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_src_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
+		ETH_RSS_L3_SRC_ONLY, &cfg_hint_ipv6_src,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_dst_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_dst_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |
+		ETH_RSS_L3_DST_ONLY, &cfg_hint_ipv6_dst,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_tcp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_tcp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP,
+		&cfg_hint_ipv6_tcp, ICE_GTPU_HINT_NONE},
+	/* IPV6 SCTP */
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_src_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_src_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_L3_SRC_ONLY,
+		&cfg_hint_ipv6_src, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_dst_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_dst_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_L3_DST_ONLY,
+		&cfg_hint_ipv6_dst, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_src_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_src_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
+		ETH_RSS_L3_SRC_ONLY, &cfg_hint_ipv6_src,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_dst_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_dst_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |
+		ETH_RSS_L3_DST_ONLY, &cfg_hint_ipv6_dst,
+		ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,
+		&cfg_hint_ipv6_sctp_src_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,
+		&cfg_hint_ipv6_sctp_dst_port, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP,
+		&cfg_hint_ipv6_sctp, ICE_GTPU_HINT_NONE},
+	/* GTPU */
+	/* GTPU IPV4*/
+	{ICE_PHINT_IPV4_GTPU_IPV4, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_up, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_GTPU_IPV4, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_dwn, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_GTPU_IPV4, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_up, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_GTPU_IPV4, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_dwn, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_GTPU_IPV4, ETH_RSS_IPV4 |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_up, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_GTPU_IPV4, ETH_RSS_IPV4 |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_dwn, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_GTPU_IPV4, ETH_RSS_IPV4 |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_up, ICE_GTPU_HINT_NONE},
+	{ICE_PHINT_IPV4_GTPU_IPV4, ETH_RSS_IPV4 |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_dwn, ICE_GTPU_HINT_NONE},
+	/* GTPU EH*/
+	/* Inner IPV4 */
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	/* Inner IPV4->UDP */
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_SRC_ONLY |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_udp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_SRC_ONLY |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_udp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_SRC_ONLY |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_udp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_SRC_ONLY |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_udp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_udp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_udp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_DST_ONLY |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_udp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_DST_ONLY |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_udp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_DST_ONLY |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_udp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_DST_ONLY |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_udp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_udp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_udp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_udp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_udp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_udp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_udp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_udp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_udp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_udp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_udp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_udp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_udp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_udp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_udp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	/* Inner IPV4->TCP */
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_SRC_ONLY |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_tcp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_SRC_ONLY |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_tcp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_SRC_ONLY |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_tcp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_SRC_ONLY |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_tcp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_tcp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_tcp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_DST_ONLY |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_tcp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_DST_ONLY |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_tcp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_DST_ONLY |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_tcp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_DST_ONLY |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_tcp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_tcp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_tcp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_tcp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_tcp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_tcp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_tcp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_tcp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_tcp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_tcp_src_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_tcp_src_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_tcp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_tcp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_tcp_dst_gtpu_up, ICE_GTPU_HINT_UPLINK},
+	{ICE_PHINT_IPV4_GTPU_EH_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |
+		ETH_RSS_L4_DST_ONLY | ETH_RSS_GTPU,
+		&cfg_hint_ipv4_tcp_dst_gtpu_dwn, ICE_GTPU_HINT_DOWNLINK},
 };
 
 static struct ice_flow_engine ice_hash_engine = {
@@ -279,33 +1467,47 @@ ice_hash_check_inset(const struct rte_flow_item pattern[],
 					"Not support range");
 			return -rte_errno;
 		}
-
-		/* Ignore spec and mask. */
-		if (item->spec || item->mask) {
-			rte_flow_error_set(error, EINVAL,
-					RTE_FLOW_ERROR_TYPE_ITEM, item,
-					"Invalid spec/mask.");
-			return -rte_errno;
-		}
 	}
 
 	return 0;
 }
 
+static void
+ice_hash_refine_type(uint64_t *rss_type, const struct rte_flow_item pattern[],
+		     enum ice_gtpu_hint *gtpu_hint)
+{
+	const struct rte_flow_item *item;
+
+	for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
+		if (item->type == RTE_FLOW_ITEM_TYPE_GTPU ||
+		    item->type == RTE_FLOW_ITEM_TYPE_GTP_PSC) {
+			const struct rte_flow_item_gtp_psc *psc = item->spec;
+
+			if (psc && (psc->pdu_type == ICE_GTPU_HINT_UPLINK ||
+				    psc->pdu_type == ICE_GTPU_HINT_DOWNLINK))
+				*gtpu_hint = psc->pdu_type;
+
+			*rss_type |= ETH_RSS_GTPU;
+		}
+	}
+}
+
 static int
 ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
+		const struct rte_flow_item pattern[],
 		const struct rte_flow_action actions[],
 		void **meta,
 		struct rte_flow_error *error)
 {
-	const struct rte_flow_action *action;
+	struct ice_pattern_match_type *mt = (struct ice_pattern_match_type *)
+					(pattern_match_item->meta);
+	uint32_t type_list_len = RTE_DIM(ice_hash_type_list);
+	enum ice_gtpu_hint gtpu_hint = ICE_GTPU_HINT_NONE;
 	enum rte_flow_action_type action_type;
 	const struct rte_flow_action_rss *rss;
-	struct rss_type_match_hdr *m = (struct rss_type_match_hdr *)
-				(pattern_match_item->meta);
-	uint32_t type_list_len = RTE_DIM(ice_hash_type_list);
-	struct ice_hash_match_type *type_match_item;
-	uint64_t rss_hf;
+	const struct rte_flow_action *action;
+	bool match_item_found = false;
+	uint64_t rss_type;
 	uint16_t i;
 
 	/* Supported action is RSS. */
@@ -315,13 +1517,19 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 		switch (action_type) {
 		case RTE_FLOW_ACTION_TYPE_RSS:
 			rss = action->conf;
-			rss_hf = rss->types;
+			rss_type = rss->types;
 
 			/**
 			 * Check simultaneous use of SRC_ONLY and DST_ONLY
 			 * of the same level.
 			 */
-			rss_hf = rte_eth_rss_hf_refine(rss_hf);
+			rss_type = rte_eth_rss_hf_refine(rss_type);
+
+			/**
+			 * Refine the hash type base on some specific item of
+			 * the pattern, such as identify the gtpu hash.
+			 */
+			ice_hash_refine_type(&rss_type, pattern, &gtpu_hint);
 
 			/* Check if pattern is empty. */
 			if (pattern_match_item->pattern_list !=
@@ -330,22 +1538,6 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 				return rte_flow_error_set(error, ENOTSUP,
 					RTE_FLOW_ERROR_TYPE_ACTION, action,
 					"Not supported flow");
-
-			/* Check if rss types match pattern. */
-			if (rss->func != RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) {
-				if (((rss_hf & ETH_RSS_IPV4) != m->eth_rss_hint) &&
-				((rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) != m->eth_rss_hint) &&
-				((rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) != m->eth_rss_hint) &&
-				((rss_hf & ETH_RSS_NONFRAG_IPV4_SCTP) != m->eth_rss_hint) &&
-				((rss_hf & ETH_RSS_IPV6) != m->eth_rss_hint) &&
-				((rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) != m->eth_rss_hint) &&
-				((rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) != m->eth_rss_hint) &&
-				((rss_hf & ETH_RSS_NONFRAG_IPV6_SCTP) != m->eth_rss_hint))
-					return rte_flow_error_set(error,
-					ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,
-					action, "Not supported RSS types");
-			}
-
 			if (rss->level)
 				return rte_flow_error_set(error, ENOTSUP,
 					RTE_FLOW_ERROR_TYPE_ACTION, action,
@@ -372,31 +1564,26 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
 				((struct rss_meta *)*meta)->hash_function =
 				RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;
 
-			type_match_item = rte_zmalloc("ice_type_match_item",
-					sizeof(struct ice_hash_match_type), 0);
-			if (!type_match_item) {
-				rte_flow_error_set(error, EINVAL,
-					RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
-					"No memory for type_match_item");
-				return -ENOMEM;
-			}
-
 			/* Find matched hash fields according to hash type. */
 			for (i = 0; i < type_list_len; i++) {
-				if (rss_hf ==
-					ice_hash_type_list[i].hash_type) {
-					type_match_item->hash_type =
-						ice_hash_type_list[i].hash_type;
-					type_match_item->hash_flds =
-						ice_hash_type_list[i].hash_flds;
+				struct ice_hash_match_type *ht_map =
+					&ice_hash_type_list[i];
+				if (rss_type == ht_map->hash_type &&
+				    mt->phint_type == ht_map->phint_type &&
+				    gtpu_hint == ht_map->gtpu_hint) {
+					((struct rss_meta *)*meta)->pkt_hdr =
+							ht_map->hcfg->hdrs;
+					((struct rss_meta *)*meta)->hash_flds =
+							ht_map->hcfg->flds;
+					match_item_found = true;
+					break;
 				}
 			}
 
-			/* Save hash fileds to rss_meta. */
-			((struct rss_meta *)*meta)->hash_flds =
-					type_match_item->hash_flds;
-
-			rte_free(type_match_item);
+			if (!match_item_found)
+				return rte_flow_error_set(error,
+					ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,
+					action, "Not supported RSS types");
 			break;
 
 		case RTE_FLOW_ACTION_TYPE_END:
@@ -446,12 +1633,8 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad,
 	if (ret)
 		goto error;
 
-	/* Save protocol header to rss_meta. */
-	rss_meta_ptr->pkt_hdr = ((struct rss_type_match_hdr *)
-		(pattern_match_item->meta))->hdr_mask;
-
 	/* Check rss action. */
-	ret = ice_hash_parse_action(pattern_match_item, actions,
+	ret = ice_hash_parse_action(pattern_match_item, pattern, actions,
 				    (void **)&rss_meta_ptr, error);
 
 error:
-- 
2.20.1