Show a patch.

GET /api/patches/73363/
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 73363,
    "url": "https://patches.dpdk.org/api/patches/73363/",
    "web_url": "https://patches.dpdk.org/patch/73363/",
    "project": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/projects/1/",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk"
    },
    "msgid": "<20200707051406.13817-2-jia.guo@intel.com>",
    "date": "2020-07-07T05:14:04",
    "name": "[v5,1/3] net/iavf: refactor for hash flow",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "7c8c9e9bf33ba6cb38c67bc497d17452086cf780",
    "submitter": {
        "id": 507,
        "url": "https://patches.dpdk.org/api/people/507/",
        "name": "Jeff Guo",
        "email": "jia.guo@intel.com"
    },
    "delegate": {
        "id": 1540,
        "url": "https://patches.dpdk.org/api/users/1540/",
        "username": "qzhan15",
        "first_name": "Qi",
        "last_name": "Zhang",
        "email": "qi.z.zhang@intel.com"
    },
    "mbox": "https://patches.dpdk.org/patch/73363/mbox/",
    "series": [
        {
            "id": 10833,
            "url": "https://patches.dpdk.org/api/series/10833/",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10833",
            "date": "2020-07-07T05:14:03",
            "name": "enable new hash flow for VF",
            "version": 5,
            "mbox": "https://patches.dpdk.org/series/10833/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/73363/comments/",
    "check": "success",
    "checks": "https://patches.dpdk.org/api/patches/73363/checks/",
    "tags": {},
    "headers": {
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "Return-Path": "<dev-bounces@dpdk.org>",
        "IronPort-SDR": [
            "\n 6CWkbb6OBO+1dI5RoEqvk7dAqrSFv00M79x6sYQaI/kCoNMutqaDVgyNt1uqJouSyBDG4B70r0\n /5v8kg+TdwtQ==",
            "\n K4K1w8zZRkT6DGzz6WIeZMv+6N7lpjiPpCZAS+r9JWbZ0KBTiGNa02xITgrwTMKA/VCX0v9XqY\n AgGH4sGTHwlg=="
        ],
        "X-Mailer": "git-send-email 2.20.1",
        "To": "qi.z.zhang@intel.com,\n\tjingjing.wu@intel.com,\n\tbeilei.xing@intel.com",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Received": [
            "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 1B0EAA00BE;\n\tTue,  7 Jul 2020 07:15:02 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id A39181D71A;\n\tTue,  7 Jul 2020 07:14:58 +0200 (CEST)",
            "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by dpdk.org (Postfix) with ESMTP id 646081D6E8\n for <dev@dpdk.org>; Tue,  7 Jul 2020 07:14:56 +0200 (CEST)",
            "from fmsmga002.fm.intel.com ([10.253.24.26])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 06 Jul 2020 22:14:55 -0700",
            "from npg-dpdk-cvl-jeffguo-01.sh.intel.com ([10.67.111.128])\n by fmsmga002.fm.intel.com with ESMTP; 06 Jul 2020 22:14:53 -0700"
        ],
        "X-BeenThere": "dev@dpdk.org",
        "X-Amp-File-Uploaded": "False",
        "Subject": "[dpdk-dev] [dpdk-dev v5 1/3] net/iavf: refactor for hash flow",
        "Cc": "dev@dpdk.org, junfeng.guo@intel.com, qiming.yang@intel.com,\n simei.su@intel.com, jia.guo@intel.com",
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "In-Reply-To": "<20200707051406.13817-1-jia.guo@intel.com>",
        "Precedence": "list",
        "X-ExtLoop1": "1",
        "From": "Jeff Guo <jia.guo@intel.com>",
        "Content-Transfer-Encoding": "8bit",
        "MIME-Version": "1.0",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6000,8403,9674\"; a=\"135005666\"",
            "E=Sophos;i=\"5.75,321,1589266800\"; d=\"scan'208\";a=\"135005666\"",
            "E=Sophos;i=\"5.75,321,1589266800\"; d=\"scan'208\";a=\"315402629\""
        ],
        "References": "<20200621140235.20488-1-jia.guo@intel.com>\n <20200707051406.13817-1-jia.guo@intel.com>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>",
        "Errors-To": "dev-bounces@dpdk.org",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "Message-Id": "<20200707051406.13817-2-jia.guo@intel.com>",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Date": "Tue,  7 Jul 2020 13:14:04 +0800",
        "X-Mailman-Version": "2.1.15"
    },
    "content": "Refactor hash flow by change the process of the pattern parser and the\naction parser, and refine the lookup table for regular IP and GTPU_EH,\nETH, and also VLAN.\n\nSigned-off-by: Jeff Guo <jia.guo@intel.com>\n---\nv5->v4:\nfix issue after splitting patch\nrefine the lookup table for ETH and VLAN\n---\n drivers/net/iavf/iavf_hash.c | 1915 +++++++++++++++++++++++++---------\n 1 file changed, 1424 insertions(+), 491 deletions(-)",
    "diff": "diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c\nindex a7691ef0c..3ef97e9a2 100644\n--- a/drivers/net/iavf/iavf_hash.c\n+++ b/drivers/net/iavf/iavf_hash.c\n@@ -24,32 +24,31 @@\n #include \"iavf_generic_flow.h\"\n \n enum iavf_pattern_hint_type {\n-\tIAVF_PATTERN_HINT_NONE,\n-\tIAVF_PATTERN_HINT_IPV4,\n-\tIAVF_PATTERN_HINT_IPV4_UDP,\n-\tIAVF_PATTERN_HINT_IPV4_TCP,\n-\tIAVF_PATTERN_HINT_IPV4_SCTP,\n-\tIAVF_PATTERN_HINT_IPV6,\n-\tIAVF_PATTERN_HINT_IPV6_UDP,\n-\tIAVF_PATTERN_HINT_IPV6_TCP,\n-\tIAVF_PATTERN_HINT_IPV6_SCTP,\n-};\n-\n-enum iavf_gtpu_hint {\n-\tIAVF_GTPU_HINT_DOWNLINK,\n-\tIAVF_GTPU_HINT_UPLINK,\n-\tIAVF_GTPU_HINT_NONE,\n-};\n+\tIAVF_PHINT_NONE\t\t\t\t= 0x00000000,\n+\tIAVF_PHINT_IPV4\t\t\t\t= 0x00000001,\n+\tIAVF_PHINT_IPV4_UDP\t\t\t= 0x00000002,\n+\tIAVF_PHINT_IPV4_TCP\t\t\t= 0x00000004,\n+\tIAVF_PHINT_IPV4_SCTP\t\t\t= 0x00000008,\n+\tIAVF_PHINT_IPV6\t\t\t\t= 0x00000010,\n+\tIAVF_PHINT_IPV6_UDP\t\t\t= 0x00000020,\n+\tIAVF_PHINT_IPV6_TCP\t\t\t= 0x00000040,\n+\tIAVF_PHINT_IPV6_SCTP\t\t\t= 0x00000080,\n+\tIAVF_PHINT_IPV4_GTPU_EH\t\t\t= 0x00000100,\n+\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK\t\t= 0x00000200,\n+\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK\t\t= 0x00000400,\n+};\n+\n+#define IAVF_GTPU_EH_DWNLINK\t0\n+#define IAVF_GTPU_EH_UPLINK\t1\n \n struct iavf_pattern_match_type {\n-\tenum iavf_pattern_hint_type phint_type;\n+\tuint64_t pattern_hint;\n };\n \n struct iavf_hash_match_type {\n-\tenum iavf_pattern_hint_type phint_type;\n \tuint64_t hash_type;\n \tstruct virtchnl_proto_hdrs *proto_hdrs;\n-\tenum iavf_gtpu_hint gtpu_hint;\n+\tuint64_t pattern_hint;\n };\n \n struct iavf_rss_meta {\n@@ -83,42 +82,62 @@ iavf_hash_parse_pattern_action(struct iavf_adapter *ad,\n \t\t\t       void **meta,\n \t\t\t       struct rte_flow_error *error);\n \n-struct iavf_pattern_match_type phint_empty = {\n-\tIAVF_PATTERN_HINT_NONE};\n-struct iavf_pattern_match_type phint_eth_ipv4 = {\n-\tIAVF_PATTERN_HINT_IPV4};\n-struct iavf_pattern_match_type phint_eth_ipv4_udp = {\n-\tIAVF_PATTERN_HINT_IPV4_UDP};\n-struct iavf_pattern_match_type phint_eth_ipv4_tcp = {\n-\tIAVF_PATTERN_HINT_IPV4_TCP};\n-struct iavf_pattern_match_type phint_eth_ipv4_sctp = {\n-\tIAVF_PATTERN_HINT_IPV4_SCTP};\n-struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh = {\n-\tIAVF_PATTERN_HINT_IPV4_UDP};\n-struct iavf_pattern_match_type phint_eth_ipv4_esp = {\n-\tIAVF_PATTERN_HINT_IPV4};\n-struct iavf_pattern_match_type phint_eth_ipv4_ah = {\n-\tIAVF_PATTERN_HINT_IPV4};\n-struct iavf_pattern_match_type phint_eth_ipv4_l2tpv3 = {\n-\tIAVF_PATTERN_HINT_IPV4};\n-struct iavf_pattern_match_type phint_eth_ipv4_pfcp = {\n-\tIAVF_PATTERN_HINT_IPV4_UDP};\n-struct iavf_pattern_match_type phint_eth_ipv6 = {\n-\tIAVF_PATTERN_HINT_IPV6};\n-struct iavf_pattern_match_type phint_eth_ipv6_udp = {\n-\tIAVF_PATTERN_HINT_IPV6_UDP};\n-struct iavf_pattern_match_type phint_eth_ipv6_tcp = {\n-\tIAVF_PATTERN_HINT_IPV6_TCP};\n-struct iavf_pattern_match_type phint_eth_ipv6_sctp = {\n-\tIAVF_PATTERN_HINT_IPV6_SCTP};\n-struct iavf_pattern_match_type phint_eth_ipv6_esp = {\n-\tIAVF_PATTERN_HINT_IPV6};\n-struct iavf_pattern_match_type phint_eth_ipv6_ah = {\n-\tIAVF_PATTERN_HINT_IPV6};\n-struct iavf_pattern_match_type phint_eth_ipv6_l2tpv3 = {\n-\tIAVF_PATTERN_HINT_IPV6};\n-struct iavf_pattern_match_type phint_eth_ipv6_pfcp = {\n-\tIAVF_PATTERN_HINT_IPV6_UDP};\n+static struct iavf_pattern_match_type phint_empty = {\n+\tIAVF_PHINT_NONE};\n+static struct iavf_pattern_match_type phint_eth_ipv4 = {\n+\tIAVF_PHINT_IPV4};\n+static struct iavf_pattern_match_type phint_eth_ipv4_udp = {\n+\tIAVF_PHINT_IPV4_UDP};\n+static struct iavf_pattern_match_type phint_eth_ipv4_tcp = {\n+\tIAVF_PHINT_IPV4_TCP};\n+static struct iavf_pattern_match_type phint_eth_ipv4_sctp = {\n+\tIAVF_PHINT_IPV4_SCTP};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4 = {\n+\tIAVF_PHINT_IPV4};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_udp = {\n+\tIAVF_PHINT_IPV4_UDP};\n+static struct iavf_pattern_match_type phint_eth_ipv4_gtpu_eh_ipv4_tcp = {\n+\tIAVF_PHINT_IPV4_TCP};\n+static struct iavf_pattern_match_type phint_eth_ipv4_esp = {\n+\tIAVF_PHINT_IPV4};\n+static struct iavf_pattern_match_type phint_eth_ipv4_ah = {\n+\tIAVF_PHINT_IPV4};\n+static struct iavf_pattern_match_type phint_eth_ipv4_l2tpv3 = {\n+\tIAVF_PHINT_IPV4};\n+static struct iavf_pattern_match_type phint_eth_ipv4_pfcp = {\n+\tIAVF_PHINT_IPV4_UDP};\n+static struct iavf_pattern_match_type phint_eth_vlan_ipv4 = {\n+\tIAVF_PHINT_IPV4};\n+static struct iavf_pattern_match_type phint_eth_vlan_ipv4_udp = {\n+\tIAVF_PHINT_IPV4_UDP};\n+static struct iavf_pattern_match_type phint_eth_vlan_ipv4_tcp = {\n+\tIAVF_PHINT_IPV4_TCP};\n+static struct iavf_pattern_match_type phint_eth_vlan_ipv4_sctp = {\n+\tIAVF_PHINT_IPV4_SCTP};\n+static struct iavf_pattern_match_type phint_eth_ipv6 = {\n+\tIAVF_PHINT_IPV6};\n+static struct iavf_pattern_match_type phint_eth_ipv6_udp = {\n+\tIAVF_PHINT_IPV6_UDP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_tcp = {\n+\tIAVF_PHINT_IPV6_TCP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_sctp = {\n+\tIAVF_PHINT_IPV6_SCTP};\n+static struct iavf_pattern_match_type phint_eth_ipv6_esp = {\n+\tIAVF_PHINT_IPV6};\n+static struct iavf_pattern_match_type phint_eth_ipv6_ah = {\n+\tIAVF_PHINT_IPV6};\n+static struct iavf_pattern_match_type phint_eth_ipv6_l2tpv3 = {\n+\tIAVF_PHINT_IPV6};\n+static struct iavf_pattern_match_type phint_eth_ipv6_pfcp = {\n+\tIAVF_PHINT_IPV6_UDP};\n+static struct iavf_pattern_match_type phint_eth_vlan_ipv6 = {\n+\tIAVF_PHINT_IPV6};\n+static struct iavf_pattern_match_type phint_eth_vlan_ipv6_udp = {\n+\tIAVF_PHINT_IPV6_UDP};\n+static struct iavf_pattern_match_type phint_eth_vlan_ipv6_tcp = {\n+\tIAVF_PHINT_IPV6_TCP};\n+static struct iavf_pattern_match_type phint_eth_vlan_ipv6_sctp = {\n+\tIAVF_PHINT_IPV6_SCTP};\n \n /**\n  * Supported pattern for hash.\n@@ -131,26 +150,40 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {\n \t{iavf_pattern_eth_ipv4_udp, IAVF_INSET_NONE, &phint_eth_ipv4_udp},\n \t{iavf_pattern_eth_ipv4_tcp, IAVF_INSET_NONE, &phint_eth_ipv4_tcp},\n \t{iavf_pattern_eth_ipv4_sctp, IAVF_INSET_NONE, &phint_eth_ipv4_sctp},\n-\t{iavf_pattern_eth_ipv6, IAVF_INSET_NONE, &phint_eth_ipv6},\n \t{iavf_pattern_eth_ipv4_gtpu_eh_ipv4, IAVF_INSET_NONE,\n-\t\t\t\t\t\t&phint_eth_ipv4_gtpu_eh},\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_eh_ipv4},\n \t{iavf_pattern_eth_ipv4_gtpu_eh_ipv4_udp, IAVF_INSET_NONE,\n-\t\t\t\t\t\t&phint_eth_ipv4_gtpu_eh},\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_eh_ipv4_udp},\n \t{iavf_pattern_eth_ipv4_gtpu_eh_ipv4_tcp, IAVF_INSET_NONE,\n-\t\t\t\t\t\t&phint_eth_ipv4_gtpu_eh},\n+\t\t\t\t\t&phint_eth_ipv4_gtpu_eh_ipv4_tcp},\n \t{iavf_pattern_eth_ipv4_esp, IAVF_INSET_NONE, &phint_eth_ipv4_esp},\n \t{iavf_pattern_eth_ipv4_ah, IAVF_INSET_NONE, &phint_eth_ipv4_ah},\n \t{iavf_pattern_eth_ipv4_l2tpv3, IAVF_INSET_NONE,\n-\t\t\t\t\t\t&phint_eth_ipv4_l2tpv3},\n+\t\t\t\t\t&phint_eth_ipv4_l2tpv3},\n \t{iavf_pattern_eth_ipv4_pfcp, IAVF_INSET_NONE, &phint_eth_ipv4_pfcp},\n+\t{iavf_pattern_eth_vlan_ipv4, IAVF_INSET_NONE, &phint_eth_vlan_ipv4},\n+\t{iavf_pattern_eth_vlan_ipv4_udp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_vlan_ipv4_udp},\n+\t{iavf_pattern_eth_vlan_ipv4_tcp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_vlan_ipv4_tcp},\n+\t{iavf_pattern_eth_vlan_ipv4_sctp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_vlan_ipv4_sctp},\n+\t{iavf_pattern_eth_ipv6, IAVF_INSET_NONE, &phint_eth_ipv6},\n \t{iavf_pattern_eth_ipv6_udp, IAVF_INSET_NONE, &phint_eth_ipv6_udp},\n \t{iavf_pattern_eth_ipv6_tcp, IAVF_INSET_NONE, &phint_eth_ipv6_tcp},\n \t{iavf_pattern_eth_ipv6_sctp, IAVF_INSET_NONE, &phint_eth_ipv6_sctp},\n \t{iavf_pattern_eth_ipv6_esp, IAVF_INSET_NONE, &phint_eth_ipv6_esp},\n \t{iavf_pattern_eth_ipv6_ah, IAVF_INSET_NONE, &phint_eth_ipv6_ah},\n \t{iavf_pattern_eth_ipv6_l2tpv3, IAVF_INSET_NONE,\n-\t\t\t\t\t\t&phint_eth_ipv6_l2tpv3},\n+\t\t\t\t\t&phint_eth_ipv6_l2tpv3},\n \t{iavf_pattern_eth_ipv6_pfcp, IAVF_INSET_NONE, &phint_eth_ipv6_pfcp},\n+\t{iavf_pattern_eth_vlan_ipv6, IAVF_INSET_NONE, &phint_eth_vlan_ipv6},\n+\t{iavf_pattern_eth_vlan_ipv6_udp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_vlan_ipv6_udp},\n+\t{iavf_pattern_eth_vlan_ipv6_tcp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_vlan_ipv6_tcp},\n+\t{iavf_pattern_eth_vlan_ipv6_sctp, IAVF_INSET_NONE,\n+\t\t\t\t\t&phint_eth_vlan_ipv6_sctp},\n \t{iavf_pattern_empty, IAVF_INSET_NONE, &phint_empty},\n };\n \n@@ -271,6 +304,10 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {\n \tFIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_SRC) | \\\n \tFIELD_SELECTOR(VIRTCHNL_PROTO_HDR_IPV6_DST), {BUFF_NOUSED } }\n \n+#define proto_hint_gtpu_eh_only { \\\n+\tVIRTCHNL_PROTO_HDR_GTPU_EH, \\\n+\tFIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }\n+\n #define proto_hint_gtpu_up_only { \\\n \tVIRTCHNL_PROTO_HDR_GTPU_EH_PDU_UP, \\\n \tFIELD_FOR_PROTO_ONLY, {BUFF_NOUSED } }\n@@ -295,72 +332,114 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {\n \tVIRTCHNL_PROTO_HDR_PFCP, \\\n \tFIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID), {BUFF_NOUSED } }\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_src = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_eth_src }\n+/* IPV4 */\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv4 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_src,\n+\tproto_hint_ipv4_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth_dst = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_eth_dst }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv4_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n+\tproto_hint_ipv4_only, proto_hint_udp_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_eth = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_eth }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv4_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n+\tproto_hint_ipv4_only, proto_hint_tcp_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_svlan = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_svlan }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv4_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n+\tproto_hint_ipv4_only, proto_hint_sctp_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_cvlan = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_cvlan }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv4 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_dst,\n+\tproto_hint_ipv4_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv4_src = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4_src }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv4_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n+\tproto_hint_ipv4_only, proto_hint_udp_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4_dst }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv4_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n+\tproto_hint_ipv4_only, proto_hint_tcp_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_up = {\n-\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n-\tproto_hint_ipv4_src }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv4_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n+\tproto_hint_ipv4_only, proto_hint_sctp_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_dwn = {\n-\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n-\tproto_hint_ipv4_src }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv4 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth,\n+\tproto_hint_ipv4_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_up = {\n-\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n-\tproto_hint_ipv4_dst }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv4_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n+\tproto_hint_ipv4_only, proto_hint_udp_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_dwn = {\n-\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n-\tproto_hint_ipv4_dst }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv4_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n+\tproto_hint_ipv4_only, proto_hint_tcp_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv4_esp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,\n-\tproto_hint_esp }\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv4_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n+\tproto_hint_ipv4_only, proto_hint_sctp_only }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv4_ah = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,\n-\tproto_hint_ah }\n+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv4 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_svlan,\n+\tproto_hint_ipv4_only}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv4_l2tpv3 = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,\n-\tproto_hint_l2tpv3 }\n+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv4_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,\n+\tproto_hint_ipv4_only, proto_hint_udp_only}\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv4_pfcp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,\n-\tproto_hint_pfcp }\n+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv4_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,\n+\tproto_hint_ipv4_only, proto_hint_tcp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv4_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,\n+\tproto_hint_ipv4_only, proto_hint_sctp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv4 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_cvlan,\n+\tproto_hint_ipv4_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv4_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,\n+\tproto_hint_ipv4_only, proto_hint_udp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv4_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,\n+\tproto_hint_ipv4_only, proto_hint_tcp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv4_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,\n+\tproto_hint_ipv4_only, proto_hint_sctp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4_src }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv4_dst }\n };\n \n struct virtchnl_proto_hdrs hdrs_hint_ipv4 = {\n@@ -472,34 +551,402 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv4_sctp = {\n \tproto_hint_sctp }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv6_src = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6_src }\n-};\n-\n-struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6_dst }\n-};\n-\n-struct virtchnl_proto_hdrs hdrs_hint_ipv6_esp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_esp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,\n \tproto_hint_esp }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv6_ah = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_ah = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,\n \tproto_hint_ah }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv6_l2tpv3 = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_l2tpv3 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,\n \tproto_hint_l2tpv3 }\n };\n \n-struct virtchnl_proto_hdrs hdrs_hint_ipv6_pfcp = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_pfcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv4_only,\n \tproto_hint_pfcp }\n };\n \n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_esp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_ipv4_only,\n+\tproto_hint_udp_only, proto_hint_esp }\n+};\n+\n+/* GTPU EH */\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv4_src }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv4_dst }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_ipv4 }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_udp}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_eh = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_eh_only,\n+\tproto_hint_tcp}\n+};\n+\n+/* GTPU UP */\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv4_src }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv4_dst }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_ipv4 }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_udp}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_up = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_up_only,\n+\tproto_hint_tcp}\n+};\n+\n+/* GTPU DWN */\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv4_src }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_udp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv4_dst }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_ipv4 }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_udp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_udp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_tcp_src_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_tcp_dst_port}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_udp_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_udp}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv4_tcp_gtpu_dwn = {\n+\tTUNNEL_LEVEL_FIRST_INNER, PROTO_COUNT_TWO, {proto_hint_gtpu_dwn_only,\n+\tproto_hint_tcp}\n+};\n+\n+/* IPV6 */\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_src,\n+\tproto_hint_ipv6_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n+\tproto_hint_ipv6_only, proto_hint_udp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n+\tproto_hint_ipv6_only, proto_hint_tcp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_src_ipv6_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_src,\n+\tproto_hint_ipv6_only, proto_hint_sctp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth_dst,\n+\tproto_hint_ipv6_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n+\tproto_hint_ipv6_only, proto_hint_udp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n+\tproto_hint_ipv6_only, proto_hint_tcp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_dst_ipv6_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth_dst,\n+\tproto_hint_ipv6_only, proto_hint_sctp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_eth,\n+\tproto_hint_ipv6_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n+\tproto_hint_ipv6_only, proto_hint_udp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n+\tproto_hint_ipv6_only, proto_hint_tcp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_eth_ipv6_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_eth,\n+\tproto_hint_ipv6_only, proto_hint_sctp_only }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_svlan,\n+\tproto_hint_ipv6_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,\n+\tproto_hint_ipv6_only, proto_hint_udp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,\n+\tproto_hint_ipv6_only, proto_hint_tcp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_svlan_ipv6_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_svlan,\n+\tproto_hint_ipv6_only, proto_hint_sctp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv6 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_cvlan,\n+\tproto_hint_ipv6_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv6_udp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,\n+\tproto_hint_ipv6_only, proto_hint_udp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv6_tcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,\n+\tproto_hint_ipv6_only, proto_hint_tcp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_cvlan_ipv6_sctp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_cvlan,\n+\tproto_hint_ipv6_only, proto_hint_sctp_only}\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_src = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6_src }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6_dst }\n+};\n+\n struct virtchnl_proto_hdrs hdrs_hint_ipv6 = {\n \tTUNNEL_LEVEL_OUTER, PROTO_COUNT_ONE, {proto_hint_ipv6 }\n };\n@@ -525,12 +972,12 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_udp_dst_port = {\n };\n \n struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_src_port = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n \tproto_hint_udp_src_port }\n };\n \n struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_dst_port = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n \tproto_hint_udp_dst_port }\n };\n \n@@ -560,12 +1007,12 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_tcp_dst_port = {\n };\n \n struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_src_port = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n \tproto_hint_tcp_src_port }\n };\n \n struct virtchnl_proto_hdrs hdrs_hint_ipv6_tcp_dst_port = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n \tproto_hint_tcp_dst_port }\n };\n \n@@ -595,12 +1042,12 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_dst_sctp_dst_port = {\n };\n \n struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp_src_port = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n \tproto_hint_sctp_src_port }\n };\n \n struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp_dst_port = {\n-\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_udp_only,\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n \tproto_hint_sctp_dst_port }\n };\n \n@@ -609,337 +1056,845 @@ struct virtchnl_proto_hdrs hdrs_hint_ipv6_sctp = {\n \tproto_hint_sctp }\n };\n \n-/**\n- * The first member is pattern hint type,\n- * the second member is hash type,\n- * the third member is virtchnl protocol hdrs.\n- * the forth member is downlink/uplink type.\n- */\n-struct iavf_hash_match_type iavf_hash_type_list[] = {\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_esp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n+\tproto_hint_esp }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_ah = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n+\tproto_hint_ah }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_l2tpv3 = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n+\tproto_hint_l2tpv3 }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_pfcp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_TWO, {proto_hint_ipv6_only,\n+\tproto_hint_pfcp }\n+};\n+\n+struct virtchnl_proto_hdrs hdrs_hint_ipv6_udp_esp = {\n+\tTUNNEL_LEVEL_OUTER, PROTO_COUNT_THREE, {proto_hint_ipv6_only,\n+\tproto_hint_udp_only, proto_hint_esp }\n+};\n+\n+struct iavf_hash_match_type iavf_hash_map_list[] = {\n \t/* IPV4 */\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_L2_SRC_ONLY, &hdrs_hint_eth_src,\n-\t\t\t\t\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_L2_DST_ONLY, &hdrs_hint_eth_dst,\n-\t\t\t\t\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY,\n-\t\t\t&hdrs_hint_eth_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_ETH | ETH_RSS_L2_DST_ONLY,\n-\t\t\t&hdrs_hint_eth_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_ETH, &hdrs_hint_eth,\n-\t\t\t\t\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_S_VLAN, &hdrs_hint_svlan,\n-\t\t\t\t\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_C_VLAN, &hdrs_hint_cvlan,\n-\t\t\t\t\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src,\n-\t\t\t\t\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst,\n-\t\t\t\t\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,\n-\t\t\t&hdrs_hint_ipv4_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,\n-\t\t\t&hdrs_hint_ipv4_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_ESP, &hdrs_hint_ipv4_esp,\n-\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_AH, &hdrs_hint_ipv4_ah,\n-\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_L2TPV3, &hdrs_hint_ipv4_l2tpv3,\n-\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_IPV4, &hdrs_hint_ipv4,\n-\tIAVF_GTPU_HINT_NONE},\n+\t{ETH_RSS_L2_SRC_ONLY,\n+\t\t&hdrs_hint_eth_src_ipv4, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_L2_DST_ONLY,\n+\t\t&hdrs_hint_eth_dst_ipv4, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_ETH,\n+\t\t&hdrs_hint_eth_ipv4, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4,\n+\t\t&hdrs_hint_ipv4, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_ESP,\n+\t\t&hdrs_hint_ipv4_esp, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_AH,\n+\t\t&hdrs_hint_ipv4_ah, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_L2TPV3,\n+\t\t&hdrs_hint_ipv4_l2tpv3, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_S_VLAN,\n+\t\t&hdrs_hint_svlan_ipv4, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_S_VLAN,\n+\t\t&hdrs_hint_svlan_ipv4_udp, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_S_VLAN,\n+\t\t&hdrs_hint_svlan_ipv4_tcp, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_S_VLAN,\n+\t\t&hdrs_hint_svlan_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_C_VLAN,\n+\t\t&hdrs_hint_cvlan_ipv4, IAVF_PHINT_IPV4},\n+\t{ETH_RSS_C_VLAN,\n+\t\t&hdrs_hint_cvlan_ipv4_udp, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_C_VLAN,\n+\t\t&hdrs_hint_cvlan_ipv4_tcp, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_C_VLAN,\n+\t\t&hdrs_hint_cvlan_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},\n \t/* IPV4 UDP */\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_udp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_src_udp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,\n-\t\t&hdrs_hint_ipv4_src_gtpu_up, IAVF_GTPU_HINT_UPLINK},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,\n-\t\t&hdrs_hint_ipv4_src_gtpu_dwn, IAVF_GTPU_HINT_DOWNLINK},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_udp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_udp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_up, IAVF_GTPU_HINT_UPLINK},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_dwn, IAVF_GTPU_HINT_DOWNLINK},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |\n+\t{ETH_RSS_L2_SRC_ONLY,\n+\t\t&hdrs_hint_eth_src_ipv4_udp, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L2_DST_ONLY,\n+\t\t&hdrs_hint_eth_dst_ipv4_udp, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_ETH,\n+\t\t&hdrs_hint_eth_ipv4_udp, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_udp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\t&hdrs_hint_ipv4_src_udp_src_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_src_udp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |\n-\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,\n-\t\t&hdrs_hint_ipv4_src_gtpu_up, IAVF_GTPU_HINT_UPLINK},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |\n-\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_GTPU,\n-\t\t&hdrs_hint_ipv4_src_gtpu_dwn, IAVF_GTPU_HINT_DOWNLINK},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\t&hdrs_hint_ipv4_src_udp_dst_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tIAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_udp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\t&hdrs_hint_ipv4_dst_udp_src_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_udp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |\n-\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_up, IAVF_GTPU_HINT_UPLINK},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |\n-\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_GTPU,\n-\t\t&hdrs_hint_ipv4_dst_gtpu_dwn, IAVF_GTPU_HINT_DOWNLINK},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n \t\tETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_udp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_udp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_PFCP,\n-\t\t&hdrs_hint_ipv4_pfcp, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_UDP, ETH_RSS_NONFRAG_IPV4_UDP,\n-\t\t&hdrs_hint_ipv4_udp, IAVF_GTPU_HINT_NONE},\n+\t\tIAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_port, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_PFCP,\n+\t\t&hdrs_hint_ipv4_pfcp, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_ESP,\n+\t\t&hdrs_hint_ipv4_udp_esp, IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t&hdrs_hint_ipv4_udp, IAVF_PHINT_IPV4_UDP},\n \t/* IPV4 TCP */\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_tcp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_src_tcp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_tcp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |\n+\t{ETH_RSS_L2_SRC_ONLY,\n+\t\t&hdrs_hint_eth_src_ipv4_tcp, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L2_DST_ONLY,\n+\t\t&hdrs_hint_eth_dst_ipv4_tcp, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_ETH,\n+\t\t&hdrs_hint_eth_ipv4_tcp, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_tcp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\t&hdrs_hint_ipv4_src_tcp_src_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_src_tcp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tIAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_tcp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n \t\tETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_tcp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_tcp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_TCP, ETH_RSS_NONFRAG_IPV4_TCP,\n-\t\t&hdrs_hint_ipv4_tcp, IAVF_GTPU_HINT_NONE},\n+\t\tIAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_port, IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t&hdrs_hint_ipv4_tcp, IAVF_PHINT_IPV4_TCP},\n \t/* IPV4 SCTP */\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_SRC_ONLY |\n-\t\tETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_src_sctp_src_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_SRC_ONLY |\n-\t\tETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_src_sctp_dst_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_DST_ONLY |\n-\t\tETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv4_dst_sctp_src_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_DST_ONLY |\n-\t\tETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv4_dst_sctp_dst_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |\n+\t{ETH_RSS_L2_SRC_ONLY,\n+\t\t&hdrs_hint_eth_src_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_L2_DST_ONLY,\n+\t\t&hdrs_hint_eth_dst_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_ETH,\n+\t\t&hdrs_hint_eth_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_sctp_src_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_sctp_src_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_src_sctp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |\n+\t\t&hdrs_hint_ipv4_src_sctp_src_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_src_sctp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |\n+\t\t&hdrs_hint_ipv4_src_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP |\n \t\tETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv4_src,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |\n+\t\tIAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_sctp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |\n+\t\t&hdrs_hint_ipv4_dst_sctp_src_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP |\n+\t\t&hdrs_hint_ipv4_dst_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP |\n \t\tETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv4_dst,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv4_sctp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv4_sctp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP,\n-\t\t&hdrs_hint_ipv4_sctp, IAVF_GTPU_HINT_NONE},\n+\t\tIAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_sctp_src_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_sctp_src_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_sctp_dst_port, IAVF_PHINT_IPV4_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV4_SCTP,\n+\t\t&hdrs_hint_ipv4_sctp, IAVF_PHINT_IPV4_SCTP},\n \t/* IPV6 */\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_L2_SRC_ONLY,\n-\t\t&hdrs_hint_eth_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_L2_DST_ONLY,\n-\t\t&hdrs_hint_eth_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L2_SRC_ONLY,\n-\t\t&hdrs_hint_eth_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L2_DST_ONLY,\n-\t\t&hdrs_hint_eth_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_ETH,\n-\t\t&hdrs_hint_eth, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_S_VLAN,\n-\t\t&hdrs_hint_svlan, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV4, ETH_RSS_C_VLAN,\n-\t\t&hdrs_hint_cvlan, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_ESP,\n-\t\t&hdrs_hint_ipv6_esp, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_AH,\n-\t\t&hdrs_hint_ipv6_ah, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_L2TPV3,\n-\t\t&hdrs_hint_ipv6_l2tpv3, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6, ETH_RSS_IPV6,\n-\t\t&hdrs_hint_ipv6, IAVF_GTPU_HINT_NONE},\n+\t{ETH_RSS_L2_SRC_ONLY,\n+\t\t&hdrs_hint_eth_src_ipv6, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_L2_DST_ONLY,\n+\t\t&hdrs_hint_eth_dst_ipv6, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_ETH,\n+\t\t&hdrs_hint_eth_ipv6, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_IPV6,\n+\t\t&hdrs_hint_ipv6, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_ESP,\n+\t\t&hdrs_hint_ipv6_esp, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_AH,\n+\t\t&hdrs_hint_ipv6_ah, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_L2TPV3,\n+\t\t&hdrs_hint_ipv6_l2tpv3, IAVF_PHINT_IPV6},\n \t/* IPV6 UDP */\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_SRC_ONLY |\n-\t\tETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_src_udp_src_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_SRC_ONLY |\n-\t\tETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_src_udp_dst_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_DST_ONLY |\n-\t\tETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_dst_udp_src_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_DST_ONLY |\n-\t\tETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_dst_udp_dst_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |\n+\t{ETH_RSS_L2_SRC_ONLY,\n+\t\t&hdrs_hint_eth_src_ipv6_udp, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_L2_DST_ONLY,\n+\t\t&hdrs_hint_eth_dst_ipv6_udp, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_ETH,\n+\t\t&hdrs_hint_eth_ipv6_udp, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_src_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_udp_dst_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_src_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_udp_dst_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_src_udp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\t&hdrs_hint_ipv6_src_udp_src_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_src_udp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\t&hdrs_hint_ipv6_src_udp_dst_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n \t\tETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\tIAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_dst_udp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\t&hdrs_hint_ipv6_dst_udp_src_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_dst_udp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\t&hdrs_hint_ipv6_dst_udp_dst_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP |\n \t\tETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_udp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_udp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_PFCP,\n-\t\t&hdrs_hint_ipv6_pfcp, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_UDP, ETH_RSS_NONFRAG_IPV6_UDP,\n-\t\t&hdrs_hint_ipv6_udp, IAVF_GTPU_HINT_NONE},\n+\t\tIAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_src_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_dst_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_src_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_udp_dst_port, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_PFCP,\n+\t\t&hdrs_hint_ipv6_pfcp, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_ESP,\n+\t\t&hdrs_hint_ipv6_udp_esp, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t&hdrs_hint_ipv6_udp, IAVF_PHINT_IPV6_UDP},\n \t/* IPV6 TCP */\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_SRC_ONLY |\n-\t\tETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_src_tcp_src_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_SRC_ONLY |\n-\t\tETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_src_tcp_dst_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_DST_ONLY |\n-\t\tETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_dst_tcp_src_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_DST_ONLY |\n-\t\tETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_dst_tcp_dst_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |\n+\t{ETH_RSS_L2_SRC_ONLY,\n+\t\t&hdrs_hint_eth_src_ipv6_tcp, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_L2_DST_ONLY,\n+\t\t&hdrs_hint_eth_dst_ipv6_tcp, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_ETH,\n+\t\t&hdrs_hint_eth_ipv6_tcp, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_src_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_tcp_dst_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_src_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_tcp_dst_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_src_tcp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\t&hdrs_hint_ipv6_src_tcp_src_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_src_tcp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\t&hdrs_hint_ipv6_src_tcp_dst_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n \t\tETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\tIAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_dst_tcp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\t&hdrs_hint_ipv6_dst_tcp_src_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_dst_tcp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\t&hdrs_hint_ipv6_dst_tcp_dst_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP |\n \t\tETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_tcp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_tcp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_TCP, ETH_RSS_NONFRAG_IPV6_TCP,\n-\t\t&hdrs_hint_ipv6_tcp, IAVF_GTPU_HINT_NONE},\n+\t\tIAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_src_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_dst_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_src_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_tcp_dst_port, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t&hdrs_hint_ipv6_tcp, IAVF_PHINT_IPV6_TCP},\n \t/* IPV6 SCTP */\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_SRC_ONLY |\n-\t\tETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_src_sctp_src_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_SRC_ONLY |\n-\t\tETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_src_sctp_dst_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_src, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_DST_ONLY |\n-\t\tETH_RSS_L4_SRC_ONLY, &hdrs_hint_ipv6_dst_sctp_src_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_DST_ONLY |\n-\t\tETH_RSS_L4_DST_ONLY, &hdrs_hint_ipv6_dst_sctp_dst_port,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L3_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_dst, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |\n+\t{ETH_RSS_L2_SRC_ONLY,\n+\t\t&hdrs_hint_eth_src_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_L2_DST_ONLY,\n+\t\t&hdrs_hint_eth_dst_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_ETH,\n+\t\t&hdrs_hint_eth_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src_sctp_src_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_src_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_src, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_sctp_src_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_dst, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_src_sctp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |\n+\t\t&hdrs_hint_ipv6_src_sctp_src_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP |\n \t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_src_sctp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |\n+\t\t&hdrs_hint_ipv6_src_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP |\n \t\tETH_RSS_L3_SRC_ONLY, &hdrs_hint_ipv6_src,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |\n+\t\tIAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_dst_sctp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |\n+\t\t&hdrs_hint_ipv6_dst_sctp_src_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP |\n \t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_dst_sctp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP |\n+\t\t&hdrs_hint_ipv6_dst_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP |\n \t\tETH_RSS_L3_DST_ONLY, &hdrs_hint_ipv6_dst,\n-\t\tIAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L4_SRC_ONLY,\n-\t\t&hdrs_hint_ipv6_sctp_src_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_L4_DST_ONLY,\n-\t\t&hdrs_hint_ipv6_sctp_dst_port, IAVF_GTPU_HINT_NONE},\n-\t{IAVF_PATTERN_HINT_IPV6_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP,\n-\t\t&hdrs_hint_ipv6_sctp, IAVF_GTPU_HINT_NONE},\n+\t\tIAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_sctp_src_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv6_sctp_src_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv6_sctp_dst_port, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_NONFRAG_IPV6_SCTP,\n+\t\t&hdrs_hint_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_S_VLAN,\n+\t\t&hdrs_hint_svlan_ipv6, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_S_VLAN,\n+\t\t&hdrs_hint_svlan_ipv6_udp, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_S_VLAN,\n+\t\t&hdrs_hint_svlan_ipv6_tcp, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_S_VLAN,\n+\t\t&hdrs_hint_svlan_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},\n+\t{ETH_RSS_C_VLAN,\n+\t\t&hdrs_hint_cvlan_ipv6, IAVF_PHINT_IPV6},\n+\t{ETH_RSS_C_VLAN,\n+\t\t&hdrs_hint_cvlan_ipv6_udp, IAVF_PHINT_IPV6_UDP},\n+\t{ETH_RSS_C_VLAN,\n+\t\t&hdrs_hint_cvlan_ipv6_tcp, IAVF_PHINT_IPV6_TCP},\n+\t{ETH_RSS_C_VLAN,\n+\t\t&hdrs_hint_cvlan_ipv6_sctp, IAVF_PHINT_IPV6_SCTP},\n+};\n+\n+struct iavf_hash_match_type iavf_gtpu_hash_map_list[] = {\n+\t/* GTPU */\n+\t/* GTPU EH */\n+\t/* Inner IPV4 */\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4,\n+\t\t&hdrs_hint_ipv4_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4},\n+\t/* Inner IPV4->UDP */\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t&hdrs_hint_ipv4_udp_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_UDP},\n+\t/* Inner IPV4->TCP */\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t&hdrs_hint_ipv4_tcp_gtpu_eh,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH | IAVF_PHINT_IPV4_TCP},\n+\t/* GTPU EH UP */\n+\t/* Inner IPV4 */\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4,\n+\t\t&hdrs_hint_ipv4_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4},\n+\t/* Inner IPV4->UDP */\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t&hdrs_hint_ipv4_udp_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_UDP},\n+\t/* Inner IPV4->TCP */\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t&hdrs_hint_ipv4_tcp_gtpu_up,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_UPLINK | IAVF_PHINT_IPV4_TCP},\n+\t/* GTPU EH DWN */\n+\t/* Inner IPV4 */\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4 |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},\n+\t{ETH_RSS_IPV4,\n+\t\t&hdrs_hint_ipv4_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4},\n+\t/* Inner IPV4->UDP */\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_udp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t{ETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t&hdrs_hint_ipv4_udp_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_UDP},\n+\t/* Inner IPV4->TCP */\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_src_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_src_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L3_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\tETH_RSS_L4_DST_ONLY,\n+\t\t&hdrs_hint_ipv4_tcp_dst_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n+\t{ETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t&hdrs_hint_ipv4_tcp_gtpu_dwn,\n+\t\tIAVF_PHINT_IPV4_GTPU_EH_DWNLINK | IAVF_PHINT_IPV4_TCP},\n };\n \n struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {\n@@ -1037,10 +1992,12 @@ iavf_hash_init(struct iavf_adapter *ad)\n }\n \n static int\n-iavf_hash_check_inset(const struct rte_flow_item pattern[],\n-\t\t      struct rte_flow_error *error)\n+iavf_hash_parse_pattern(struct iavf_pattern_match_item *pattern_match_item,\n+\t\t\tconst struct rte_flow_item pattern[], uint64_t *phint,\n+\t\t\tstruct rte_flow_error *error)\n {\n \tconst struct rte_flow_item *item = pattern;\n+\tconst struct rte_flow_item_gtp_psc *psc;\n \n \tfor (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {\n \t\tif (item->last) {\n@@ -1049,45 +2006,40 @@ iavf_hash_check_inset(const struct rte_flow_item pattern[],\n \t\t\t\t\t   \"Not support range\");\n \t\t\treturn -rte_errno;\n \t\t}\n-\t}\n \n-\treturn 0;\n-}\n-\n-static void\n-iavf_hash_refine_type(uint64_t *rss_type, const struct rte_flow_item pattern[],\n-\t\t      enum iavf_gtpu_hint *gtpu_hint)\n-{\n-\tconst struct rte_flow_item *item;\n-\n-\tfor (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {\n-\t\tif (item->type == RTE_FLOW_ITEM_TYPE_GTP_PSC) {\n-\t\t\tconst struct rte_flow_item_gtp_psc *psc = item->spec;\n-\n-\t\t\tif (psc && (psc->pdu_type == IAVF_GTPU_HINT_UPLINK ||\n-\t\t\t\t    psc->pdu_type == IAVF_GTPU_HINT_DOWNLINK)) {\n-\t\t\t\t*rss_type |= ETH_RSS_GTPU;\n-\t\t\t\t*gtpu_hint = psc->pdu_type;\n-\t\t\t}\n+\t\tswitch (item->type) {\n+\t\tcase RTE_FLOW_ITEM_TYPE_GTP_PSC:\n+\t\t\tpsc = item->spec;\n+\t\t\tif (!psc)\n+\t\t\t\t*phint |= IAVF_PHINT_IPV4_GTPU_EH;\n+\t\t\telse if (psc->pdu_type == IAVF_GTPU_EH_UPLINK)\n+\t\t\t\t*phint |= IAVF_PHINT_IPV4_GTPU_EH_UPLINK;\n+\t\t\telse if (psc->pdu_type == IAVF_GTPU_EH_DWNLINK)\n+\t\t\t\t*phint |= IAVF_PHINT_IPV4_GTPU_EH_DWNLINK;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tbreak;\n \t\t}\n \t}\n+\n+\t/* update and restore pattern hint */\n+\t*phint |= ((struct iavf_pattern_match_type *)\n+\t\t\t\t(pattern_match_item->meta))->pattern_hint;\n+\n+\treturn 0;\n }\n \n static int\n-iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,\n-\t\t       const struct rte_flow_item pattern[],\n-\t\t       const struct rte_flow_action actions[],\n-\t\t       void **meta, struct rte_flow_error *error)\n+iavf_hash_parse_action(const struct rte_flow_action actions[],\n+\t\t       uint64_t pattern_hint, void **meta,\n+\t\t       struct rte_flow_error *error)\n {\n-\tstruct iavf_pattern_match_type *mt = (struct iavf_pattern_match_type *)\n-\t\t\t\t\t(pattern_match_item->meta);\n \tstruct iavf_rss_meta *rss_meta = (struct iavf_rss_meta *)*meta;\n-\tuint32_t type_list_len = RTE_DIM(iavf_hash_type_list);\n-\tstruct iavf_hash_match_type *type_match_item;\n-\tenum iavf_gtpu_hint gtpu_hint = IAVF_GTPU_HINT_NONE;\n+\tstruct iavf_hash_match_type *hash_map_list;\n \tenum rte_flow_action_type action_type;\n \tconst struct rte_flow_action_rss *rss;\n \tconst struct rte_flow_action *action;\n+\tuint32_t mlist_len;\n \tbool item_found = false;\n \tuint64_t rss_type;\n \tuint16_t i;\n@@ -1101,25 +2053,18 @@ iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,\n \t\t\trss = action->conf;\n \t\t\trss_type = rss->types;\n \n-\t\t\t/**\n-\t\t\t * Check simultaneous use of SRC_ONLY and DST_ONLY\n-\t\t\t * of the same level.\n-\t\t\t */\n-\t\t\trss_type = rte_eth_rss_hf_refine(rss_type);\n-\n-\t\t\t/**\n-\t\t\t * Refine the hash type base on some specific item of\n-\t\t\t * the pattern, such as identify the gtpu hash.\n-\t\t\t */\n-\t\t\tiavf_hash_refine_type(&rss_type, pattern, &gtpu_hint);\n-\n-\t\t\t/* Check if pattern is empty. */\n-\t\t\tif (pattern_match_item->pattern_list !=\n-\t\t\t\tiavf_pattern_empty && rss->func ==\n-\t\t\t\tRTE_ETH_HASH_FUNCTION_SIMPLE_XOR)\n-\t\t\t\treturn rte_flow_error_set(error, ENOTSUP,\n-\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, action,\n-\t\t\t\t\t\"Not supported flow\");\n+\t\t\tif (rss->func ==\n+\t\t\t    RTE_ETH_HASH_FUNCTION_SIMPLE_XOR){\n+\t\t\t\trss_meta->rss_algorithm =\n+\t\t\t\t\tVIRTCHNL_RSS_ALG_XOR_ASYMMETRIC;\n+\t\t\t} else if (rss->func ==\n+\t\t\t\t   RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {\n+\t\t\t\trss_meta->rss_algorithm =\n+\t\t\t\t\tVIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC;\n+\t\t\t} else {\n+\t\t\t\trss_meta->rss_algorithm =\n+\t\t\t\t\tVIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;\n+\t\t\t}\n \n \t\t\tif (rss->level)\n \t\t\t\treturn rte_flow_error_set(error, ENOTSUP,\n@@ -1136,48 +2081,35 @@ iavf_hash_parse_action(struct iavf_pattern_match_item *pattern_match_item,\n \t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, action,\n \t\t\t\t\t\"a non-NULL RSS queue is not supported\");\n \n-\t\t\t/* Check hash function and save it to rss_meta. */\n-\t\t\tif (rss->func == RTE_ETH_HASH_FUNCTION_SIMPLE_XOR)\n-\t\t\t\trss_meta->rss_algorithm =\n-\t\t\t\t\tVIRTCHNL_RSS_ALG_XOR_ASYMMETRIC;\n-\t\t\telse if (rss->func ==\n-\t\t\t\t RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ)\n-\t\t\t\trss_meta->rss_algorithm =\n-\t\t\t\t\tVIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC;\n-\t\t\telse\n-\t\t\t\trss_meta->rss_algorithm =\n-\t\t\t\t\tVIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;\n+\t\t\t/**\n+\t\t\t * Check simultaneous use of SRC_ONLY and DST_ONLY\n+\t\t\t * of the same level.\n+\t\t\t */\n+\t\t\trss_type = rte_eth_rss_hf_refine(rss_type);\n \n-\t\t\ttype_match_item =\n-\t\t\trte_zmalloc(\"iavf_type_match_item\",\n-\t\t\t\t    sizeof(struct iavf_hash_match_type), 0);\n-\t\t\tif (!type_match_item) {\n-\t\t\t\trte_flow_error_set(error, EINVAL,\n-\t\t\t\t\t\t   RTE_FLOW_ERROR_TYPE_HANDLE,\n-\t\t\t\t\t\t   NULL,\n-\t\t\t\t\t\t   \"No memory for type_match_item\");\n-\t\t\t\treturn -ENOMEM;\n+\t\t\tif ((pattern_hint & IAVF_PHINT_IPV4_GTPU_EH) ||\n+\t\t\t    (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_UPLINK) ||\n+\t\t\t    (pattern_hint & IAVF_PHINT_IPV4_GTPU_EH_DWNLINK)) {\n+\t\t\t\thash_map_list = iavf_gtpu_hash_map_list;\n+\t\t\t\tmlist_len = RTE_DIM(iavf_gtpu_hash_map_list);\n+\t\t\t} else {\n+\t\t\t\thash_map_list = iavf_hash_map_list;\n+\t\t\t\tmlist_len = RTE_DIM(iavf_hash_map_list);\n \t\t\t}\n \n \t\t\t/* Find matched proto hdrs according to hash type. */\n-\t\t\tfor (i = 0; i < type_list_len; i++) {\n+\t\t\tfor (i = 0; i < mlist_len; i++) {\n \t\t\t\tstruct iavf_hash_match_type *ht_map =\n-\t\t\t\t\t&iavf_hash_type_list[i];\n+\t\t\t\t\t&hash_map_list[i];\n \t\t\t\tif (rss_type == ht_map->hash_type &&\n-\t\t\t\t    mt->phint_type == ht_map->phint_type &&\n-\t\t\t\t    gtpu_hint == ht_map->gtpu_hint) {\n-\t\t\t\t\ttype_match_item->hash_type =\n-\t\t\t\t\t\tht_map->hash_type;\n-\t\t\t\t\ttype_match_item->proto_hdrs =\n-\t\t\t\t\t\tht_map->proto_hdrs;\n+\t\t\t\t    pattern_hint == ht_map->pattern_hint) {\n \t\t\t\t\trss_meta->proto_hdrs =\n-\t\t\t\t\t\ttype_match_item->proto_hdrs;\n+\t\t\t\t\t\tht_map->proto_hdrs;\n \t\t\t\t\titem_found = true;\n+\t\t\t\t\tbreak;\n \t\t\t\t}\n \t\t\t}\n \n-\t\t\trte_free(type_match_item);\n-\n \t\t\tif (!item_found)\n \t\t\t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, action,\n@@ -1209,6 +2141,7 @@ iavf_hash_parse_pattern_action(__rte_unused struct iavf_adapter *ad,\n {\n \tstruct iavf_pattern_match_item *pattern_match_item;\n \tstruct iavf_rss_meta *rss_meta_ptr;\n+\tuint64_t phint = IAVF_PHINT_NONE;\n \tint ret = 0;\n \n \trss_meta_ptr = rte_zmalloc(NULL, sizeof(*rss_meta_ptr), 0);\n@@ -1228,12 +2161,12 @@ iavf_hash_parse_pattern_action(__rte_unused struct iavf_adapter *ad,\n \t\tgoto error;\n \t}\n \n-\tret = iavf_hash_check_inset(pattern, error);\n+\tret = iavf_hash_parse_pattern(pattern_match_item, pattern, &phint,\n+\t\t\t\t      error);\n \tif (ret)\n \t\tgoto error;\n \n-\t/* Check rss action. */\n-\tret = iavf_hash_parse_action(pattern_match_item, pattern, actions,\n+\tret = iavf_hash_parse_action(actions, phint,\n \t\t\t\t     (void **)&rss_meta_ptr, error);\n \n error:\n",
    "prefixes": [
        "v5",
        "1/3"
    ]
}