Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94599/?format=api
{ "id": 94599, "url": "https://patches.dpdk.org/api/patches/94599/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210621142320.76143-4-lingyu.liu@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "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", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210621142320.76143-4-lingyu.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210621142320.76143-4-lingyu.liu@intel.com", "date": "2021-06-21T14:23:20", "name": "[v6,3/3] net/iavf: support AVF RSS for GTPoGRE packet", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "530f275b0f7bf81542b5f598bb4153b726ab570c", "submitter": { "id": 2079, "url": "https://patches.dpdk.org/api/people/2079/?format=api", "name": "Liu, Lingyu", "email": "lingyu.liu@intel.com" }, "delegate": { "id": 1540, "url": "https://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210621142320.76143-4-lingyu.liu@intel.com/mbox/", "series": [ { "id": 17419, "url": "https://patches.dpdk.org/api/series/17419/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17419", "date": "2021-06-21T14:23:17", "name": "support AVF RSS and FDIR for GTPoGRE packet", "version": 6, "mbox": "https://patches.dpdk.org/series/17419/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/94599/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/94599/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 1DDF5A0547;\n\tMon, 21 Jun 2021 09:50:40 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7347241196;\n\tMon, 21 Jun 2021 09:50:31 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by mails.dpdk.org (Postfix) with ESMTP id 5A73B41182\n for <dev@dpdk.org>; Mon, 21 Jun 2021 09:50:29 +0200 (CEST)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Jun 2021 00:50:28 -0700", "from dpdk-liulingy-1.sh.intel.com ([10.67.118.206])\n by fmsmga002.fm.intel.com with ESMTP; 21 Jun 2021 00:50:26 -0700" ], "IronPort-SDR": [ "\n 6bukOnR7UfHXqEvO6Y/Ubs3XwPlAN8UvY4wKbQT+OYKhTzA4ekMAnpoYb2FQ4sWdM+QBnc6uKt\n lVjfxr+6Zheg==", "\n PvRTpWddV8VL3mIa0NLPU8BRDDbPIdWqFq7Afbw+lUgN9jY9jlKz9T2BTy9pnZASyFOX8xVdl0\n Nx/Y/FAeBLBw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10021\"; a=\"193931752\"", "E=Sophos;i=\"5.83,289,1616482800\"; d=\"scan'208\";a=\"193931752\"", "E=Sophos;i=\"5.83,289,1616482800\"; d=\"scan'208\";a=\"489793389\"" ], "X-ExtLoop1": "1", "From": "Lingyu Liu <lingyu.liu@intel.com>", "To": "dev@dpdk.org, qi.z.zhang@intel.com, beilei.xing@intel.com,\n jingjing.wu@intel.com", "Cc": "junfeng.guo@intel.com,\n\tLingyu Liu <lingyu.liu@intel.com>", "Date": "Mon, 21 Jun 2021 14:23:20 +0000", "Message-Id": "<20210621142320.76143-4-lingyu.liu@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210621142320.76143-1-lingyu.liu@intel.com>", "References": "<20210610130520.713482-1-lingyu.liu@intel.com>\n <20210621142320.76143-1-lingyu.liu@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v6 3/3] net/iavf: support AVF RSS for GTPoGRE\n packet", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "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-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Support AVF RSS for inner most header of GTPoGRE packet. It supports\nRSS based on inner most IP src + dst address and TCP/UDP src + dst\nport.\n\nSigned-off-by: Lingyu Liu <lingyu.liu@intel.com>\n---\n drivers/net/iavf/iavf_hash.c | 142 +++++++++++++++++++++++++++++------\n 1 file changed, 118 insertions(+), 24 deletions(-)", "diff": "diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c\nindex f4f0bcbfef..03dae5d999 100644\n--- a/drivers/net/iavf/iavf_hash.c\n+++ b/drivers/net/iavf/iavf_hash.c\n@@ -31,6 +31,9 @@\n #define IAVF_PHINT_OUTER_IPV4\t\t\tBIT_ULL(4)\n #define IAVF_PHINT_OUTER_IPV6\t\t\tBIT_ULL(5)\n #define IAVF_PHINT_GRE\t\t\t\tBIT_ULL(6)\n+/* the second IP header of GTPoGRE */\n+#define IAVF_PHINT_MID_IPV4\t\t\tBIT_ULL(7)\n+#define IAVF_PHINT_MID_IPV6\t\t\tBIT_ULL(8)\n \n #define IAVF_PHINT_GTPU_MSK\t(IAVF_PHINT_GTPU\t| \\\n \t\t\t\t IAVF_PHINT_GTPU_EH\t| \\\n@@ -233,6 +236,30 @@ struct virtchnl_proto_hdrs inner_ipv4_tcp_tmplt = {\n \tTUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv4_with_prot, proto_hdr_tcp}\n };\n \n+struct virtchnl_proto_hdrs second_inner_ipv4_tmplt = {\n+\t2, 1, {proto_hdr_ipv4}\n+};\n+\n+struct virtchnl_proto_hdrs second_inner_ipv4_udp_tmplt = {\n+\t2, 2, {proto_hdr_ipv4_with_prot, proto_hdr_udp}\n+};\n+\n+struct virtchnl_proto_hdrs second_inner_ipv4_tcp_tmplt = {\n+\t2, 2, {proto_hdr_ipv4_with_prot, proto_hdr_tcp}\n+};\n+\n+struct virtchnl_proto_hdrs second_inner_ipv6_tmplt = {\n+\t2, 1, {proto_hdr_ipv6}\n+};\n+\n+struct virtchnl_proto_hdrs second_inner_ipv6_udp_tmplt = {\n+\t2, 2, {proto_hdr_ipv6_with_prot, proto_hdr_udp}\n+};\n+\n+struct virtchnl_proto_hdrs second_inner_ipv6_tcp_tmplt = {\n+\t2, 2, {proto_hdr_ipv6_with_prot, proto_hdr_tcp}\n+};\n+\n struct virtchnl_proto_hdrs inner_ipv4_sctp_tmplt = {\n \tTUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv4, proto_hdr_sctp}\n };\n@@ -421,6 +448,30 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {\n \t{iavf_pattern_eth_ipv6_gtpu_eh_ipv4,\t\tIAVF_RSS_TYPE_GTPU_IPV4,\t&inner_ipv4_tmplt},\n \t{iavf_pattern_eth_ipv6_gtpu_eh_ipv4_udp,\tIAVF_RSS_TYPE_GTPU_IPV4_UDP,\t&inner_ipv4_udp_tmplt},\n \t{iavf_pattern_eth_ipv6_gtpu_eh_ipv4_tcp,\tIAVF_RSS_TYPE_GTPU_IPV4_TCP,\t&inner_ipv4_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_ipv4,\t\tIAVF_RSS_TYPE_GTPU_IPV4,\t&second_inner_ipv4_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_ipv4_udp,\t\tIAVF_RSS_TYPE_GTPU_IPV4_UDP,\t&second_inner_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_ipv4_tcp,\t\tIAVF_RSS_TYPE_GTPU_IPV4_TCP,\t&second_inner_ipv4_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_ipv4,\t\tIAVF_RSS_TYPE_GTPU_IPV4,\t&second_inner_ipv4_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_ipv4_udp,\t\tIAVF_RSS_TYPE_GTPU_IPV4_UDP,\t&second_inner_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_ipv4_tcp,\t\tIAVF_RSS_TYPE_GTPU_IPV4_TCP,\t&second_inner_ipv4_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_ipv4,\t\tIAVF_RSS_TYPE_GTPU_IPV4,\t&second_inner_ipv4_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_ipv4_udp,\t\tIAVF_RSS_TYPE_GTPU_IPV4_UDP,\t&second_inner_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_ipv4_tcp,\t\tIAVF_RSS_TYPE_GTPU_IPV4_TCP,\t&second_inner_ipv4_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_ipv4,\t\tIAVF_RSS_TYPE_GTPU_IPV4,\t&second_inner_ipv4_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_ipv4_udp,\t\tIAVF_RSS_TYPE_GTPU_IPV4_UDP,\t&second_inner_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_ipv4_tcp,\t\tIAVF_RSS_TYPE_GTPU_IPV4_TCP,\t&second_inner_ipv4_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_eh_ipv4,\t\tIAVF_RSS_TYPE_GTPU_IPV4,\t&second_inner_ipv4_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_eh_ipv4_udp,\tIAVF_RSS_TYPE_GTPU_IPV4_UDP,\t&second_inner_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_eh_ipv4_tcp,\tIAVF_RSS_TYPE_GTPU_IPV4_TCP,\t&second_inner_ipv4_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_eh_ipv4,\t\tIAVF_RSS_TYPE_GTPU_IPV4,\t&second_inner_ipv4_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_eh_ipv4_udp,\tIAVF_RSS_TYPE_GTPU_IPV4_UDP,\t&second_inner_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_eh_ipv4_tcp,\tIAVF_RSS_TYPE_GTPU_IPV4_TCP,\t&second_inner_ipv4_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_eh_ipv4,\t\tIAVF_RSS_TYPE_GTPU_IPV4,\t&second_inner_ipv4_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_eh_ipv4_udp,\tIAVF_RSS_TYPE_GTPU_IPV4_UDP,\t&second_inner_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_eh_ipv4_tcp,\tIAVF_RSS_TYPE_GTPU_IPV4_TCP,\t&second_inner_ipv4_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_eh_ipv4,\t\tIAVF_RSS_TYPE_GTPU_IPV4,\t&second_inner_ipv4_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_eh_ipv4_udp,\tIAVF_RSS_TYPE_GTPU_IPV4_UDP,\t&second_inner_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_eh_ipv4_tcp,\tIAVF_RSS_TYPE_GTPU_IPV4_TCP,\t&second_inner_ipv4_tcp_tmplt},\n \t{iavf_pattern_eth_ipv4_esp,\t\t\tIAVF_RSS_TYPE_IPV4_ESP,\t\t&ipv4_esp_tmplt},\n \t{iavf_pattern_eth_ipv4_udp_esp,\t\t\tIAVF_RSS_TYPE_IPV4_ESP,\t\t&ipv4_udp_esp_tmplt},\n \t{iavf_pattern_eth_ipv4_ah,\t\t\tIAVF_RSS_TYPE_IPV4_AH,\t\t&ipv4_ah_tmplt},\n@@ -459,6 +510,30 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {\n \t{iavf_pattern_eth_ipv6_gtpu_eh_ipv6,\t\tIAVF_RSS_TYPE_GTPU_IPV6,\t&inner_ipv6_tmplt},\n \t{iavf_pattern_eth_ipv6_gtpu_eh_ipv6_udp,\tIAVF_RSS_TYPE_GTPU_IPV6_UDP,\t&inner_ipv6_udp_tmplt},\n \t{iavf_pattern_eth_ipv6_gtpu_eh_ipv6_tcp,\tIAVF_RSS_TYPE_GTPU_IPV6_TCP,\t&inner_ipv6_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_ipv6,\t\tIAVF_RSS_TYPE_GTPU_IPV6,\t&second_inner_ipv6_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_ipv6_udp,\t\tIAVF_RSS_TYPE_GTPU_IPV6_UDP,\t&second_inner_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_ipv6_tcp,\t\tIAVF_RSS_TYPE_GTPU_IPV6_TCP,\t&second_inner_ipv6_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_ipv6,\t\tIAVF_RSS_TYPE_GTPU_IPV6,\t&second_inner_ipv6_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_ipv6_udp,\t\tIAVF_RSS_TYPE_GTPU_IPV6_UDP,\t&second_inner_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_ipv6_tcp,\t\tIAVF_RSS_TYPE_GTPU_IPV6_TCP,\t&second_inner_ipv6_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_ipv6,\t\tIAVF_RSS_TYPE_GTPU_IPV6,\t&second_inner_ipv6_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_ipv6_udp,\t\tIAVF_RSS_TYPE_GTPU_IPV6_UDP,\t&second_inner_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_ipv6_tcp,\t\tIAVF_RSS_TYPE_GTPU_IPV6_TCP,\t&second_inner_ipv6_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_ipv6,\t\tIAVF_RSS_TYPE_GTPU_IPV6,\t&second_inner_ipv6_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_ipv6_udp,\t\tIAVF_RSS_TYPE_GTPU_IPV6_UDP,\t&second_inner_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_ipv6_tcp,\t\tIAVF_RSS_TYPE_GTPU_IPV6_TCP,\t&second_inner_ipv6_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_eh_ipv6,\t\tIAVF_RSS_TYPE_GTPU_IPV6,\t&second_inner_ipv6_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_eh_ipv6_udp,\tIAVF_RSS_TYPE_GTPU_IPV6_UDP,\t&second_inner_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv4_gtpu_eh_ipv6_tcp,\tIAVF_RSS_TYPE_GTPU_IPV6_TCP,\t&second_inner_ipv6_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_eh_ipv6,\t\tIAVF_RSS_TYPE_GTPU_IPV6,\t&second_inner_ipv6_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_eh_ipv6_udp,\tIAVF_RSS_TYPE_GTPU_IPV6_UDP,\t&second_inner_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_gre_ipv6_gtpu_eh_ipv6_tcp,\tIAVF_RSS_TYPE_GTPU_IPV6_TCP,\t&second_inner_ipv6_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_eh_ipv6,\t\tIAVF_RSS_TYPE_GTPU_IPV6,\t&second_inner_ipv6_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_eh_ipv6_udp,\tIAVF_RSS_TYPE_GTPU_IPV6_UDP,\t&second_inner_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv4_gtpu_eh_ipv6_tcp,\tIAVF_RSS_TYPE_GTPU_IPV6_TCP,\t&second_inner_ipv6_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_eh_ipv6,\t\tIAVF_RSS_TYPE_GTPU_IPV6,\t&second_inner_ipv6_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_eh_ipv6_udp,\tIAVF_RSS_TYPE_GTPU_IPV6_UDP,\t&second_inner_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv6_gre_ipv6_gtpu_eh_ipv6_tcp,\tIAVF_RSS_TYPE_GTPU_IPV6_TCP,\t&second_inner_ipv6_tcp_tmplt},\n \t{iavf_pattern_eth_ipv6_esp,\t\t\tIAVF_RSS_TYPE_IPV6_ESP,\t\t&ipv6_esp_tmplt},\n \t{iavf_pattern_eth_ipv6_udp_esp,\t\t\tIAVF_RSS_TYPE_IPV6_ESP,\t\t&ipv6_udp_esp_tmplt},\n \t{iavf_pattern_eth_ipv6_ah,\t\t\tIAVF_RSS_TYPE_IPV6_AH,\t\t&ipv6_ah_tmplt},\n@@ -607,10 +682,14 @@ iavf_hash_parse_pattern(const struct rte_flow_item pattern[], uint64_t *phint,\n \t\tcase RTE_FLOW_ITEM_TYPE_IPV4:\n \t\t\tif (!(*phint & IAVF_PHINT_GTPU_MSK) && !(*phint & IAVF_PHINT_GRE))\n \t\t\t\t*phint |= IAVF_PHINT_OUTER_IPV4;\n+\t\t\tif ((*phint & IAVF_PHINT_GRE) && !(*phint & IAVF_PHINT_GTPU_MSK))\n+\t\t\t\t*phint |= IAVF_PHINT_MID_IPV4;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_IPV6:\n \t\t\tif (!(*phint & IAVF_PHINT_GTPU_MSK) && !(*phint & IAVF_PHINT_GRE))\n \t\t\t\t*phint |= IAVF_PHINT_OUTER_IPV6;\n+\t\t\tif ((*phint & IAVF_PHINT_GRE) && !(*phint & IAVF_PHINT_GTPU_MSK))\n+\t\t\t\t*phint |= IAVF_PHINT_MID_IPV6;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_GTPU:\n \t\t\t*phint |= IAVF_PHINT_GTPU;\n@@ -881,14 +960,15 @@ iavf_refine_proto_hdrs_by_pattern(struct virtchnl_proto_hdrs *proto_hdrs,\n \tstruct virtchnl_proto_hdr *hdr1;\n \tstruct virtchnl_proto_hdr *hdr2;\n \tint i, shift_count = 1;\n+\tint tun_lvl = proto_hdrs->tunnel_level;\n \n \tif (!(phint & IAVF_PHINT_GTPU_MSK) && !(phint & IAVF_PHINT_GRE))\n \t\treturn;\n \n-\tif (phint & IAVF_PHINT_LAYERS_MSK)\n-\t\tshift_count++;\n+\twhile (tun_lvl) {\n+\t\tif (phint & IAVF_PHINT_LAYERS_MSK)\n+\t\t\tshift_count = 2;\n \n-\tif (proto_hdrs->tunnel_level == TUNNEL_LEVEL_INNER) {\n \t\t/* shift headers layer */\n \t\tfor (i = proto_hdrs->count - 1 + shift_count;\n \t\t i > shift_count - 1; i--) {\n@@ -906,30 +986,44 @@ iavf_refine_proto_hdrs_by_pattern(struct virtchnl_proto_hdrs *proto_hdrs,\n \t\t\thdr2 = &proto_hdrs->proto_hdr[0];\n \t\t\thdr2->field_selector = 0;\n \t\t\tproto_hdrs->count++;\n-\t\t\tproto_hdrs->tunnel_level = TUNNEL_LEVEL_OUTER;\n+\t\t\ttun_lvl--;\n+\n+\t\t\tif (tun_lvl == TUNNEL_LEVEL_OUTER) {\n+\t\t\t\tif (phint & IAVF_PHINT_OUTER_IPV4)\n+\t\t\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr2, IPV4);\n+\t\t\t\telse if (phint & IAVF_PHINT_OUTER_IPV6)\n+\t\t\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr2, IPV6);\n+\t\t\t} else if (tun_lvl == TUNNEL_LEVEL_INNER) {\n+\t\t\t\tif (phint & IAVF_PHINT_MID_IPV4)\n+\t\t\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr2, IPV4);\n+\t\t\t\telse if (phint & IAVF_PHINT_MID_IPV6)\n+\t\t\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr2, IPV6);\n+\t\t\t}\n+\t\t}\n \n-\t\t\tif (phint & IAVF_PHINT_OUTER_IPV4)\n-\t\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr2, IPV4);\n-\t\t\telse if (phint & IAVF_PHINT_OUTER_IPV6)\n-\t\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr2, IPV6);\n+\t\thdr1->field_selector = 0;\n+\t\tproto_hdrs->count++;\n+\n+\t\tif (phint & IAVF_PHINT_GTPU_EH_DWN)\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN);\n+\t\telse if (phint & IAVF_PHINT_GTPU_EH_UP)\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_UP);\n+\t\telse if (phint & IAVF_PHINT_GTPU_EH)\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH);\n+\t\telse if (phint & IAVF_PHINT_GTPU)\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP);\n+\n+\t\tif (phint & IAVF_PHINT_GRE) {\n+\t\t\tif (phint & IAVF_PHINT_GTPU) {\n+\t\t\t\t/* if GTPoGRE, add GRE header at the outer tunnel */\n+\t\t\t\tif (tun_lvl == TUNNEL_LEVEL_OUTER)\n+\t\t\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GRE);\n+\t\t\t} else {\n+\t\t\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GRE);\n+\t\t\t}\n \t\t}\n-\t} else {\n-\t\thdr1 = &proto_hdrs->proto_hdr[proto_hdrs->count];\n \t}\n-\n-\thdr1->field_selector = 0;\n-\tproto_hdrs->count++;\n-\n-\tif (phint & IAVF_PHINT_GTPU_EH_DWN)\n-\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_DWN);\n-\telse if (phint & IAVF_PHINT_GTPU_EH_UP)\n-\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH_PDU_UP);\n-\telse if (phint & IAVF_PHINT_GTPU_EH)\n-\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_EH);\n-\telse if (phint & IAVF_PHINT_GTPU)\n-\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GTPU_IP);\n-\telse if (phint & IAVF_PHINT_GRE)\n-\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, GRE);\n+\tproto_hdrs->tunnel_level = tun_lvl;\n }\n \n static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs *proto_hdrs,\n", "prefixes": [ "v6", "3/3" ] }