Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/102574/?format=api
{ "id": 102574, "url": "https://patches.dpdk.org/api/patches/102574/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20211021100527.1582052-3-jie1x.wang@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": "<20211021100527.1582052-3-jie1x.wang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211021100527.1582052-3-jie1x.wang@intel.com", "date": "2021-10-21T10:05:26", "name": "[v8,2/3] net/iavf: support PPPoL2TPv2oUDP RSS Hash", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "63963cf7e7dfa433bdf41b8f8df9bba6b514b286", "submitter": { "id": 2201, "url": "https://patches.dpdk.org/api/people/2201/?format=api", "name": "Jie Wang", "email": "jie1x.wang@intel.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20211021100527.1582052-3-jie1x.wang@intel.com/mbox/", "series": [ { "id": 19875, "url": "https://patches.dpdk.org/api/series/19875/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=19875", "date": "2021-10-21T10:05:24", "name": "support PPPoL2TPv2oUDP RSS Hash", "version": 8, "mbox": "https://patches.dpdk.org/series/19875/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/102574/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/102574/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 7393EA0547;\n\tThu, 21 Oct 2021 12:06:41 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 64C0E4120A;\n\tThu, 21 Oct 2021 12:06:15 +0200 (CEST)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by mails.dpdk.org (Postfix) with ESMTP id 30C54411ED\n for <dev@dpdk.org>; Thu, 21 Oct 2021 12:06:12 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Oct 2021 03:06:11 -0700", "from dpdk.cd.intel.com ([10.240.178.133])\n by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Oct 2021 03:06:08 -0700" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10143\"; a=\"215914140\"", "E=Sophos;i=\"5.87,169,1631602800\"; d=\"scan'208\";a=\"215914140\"", "E=Sophos;i=\"5.87,169,1631602800\"; d=\"scan'208\";a=\"495062533\"" ], "From": "Jie Wang <jie1x.wang@intel.com>", "To": "dev@dpdk.org", "Cc": "orika@nvidia.com, ferruh.yigit@intel.com, thomas@monjalon.net,\n andrew.rybchenko@oktetlabs.ru, xiaoyun.li@intel.com, stevex.yang@intel.com,\n jingjing.wu@intel.com, beilei.xing@intel.com, wenjun1.wu@intel.com,\n qi.z.zhang@intel.com, Jie Wang <jie1x.wang@intel.com>", "Date": "Thu, 21 Oct 2021 18:05:26 +0800", "Message-Id": "<20211021100527.1582052-3-jie1x.wang@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20211021100527.1582052-1-jie1x.wang@intel.com>", "References": "<20211021062603.1549268-1-jie1x.wang@intel.com>\n <20211021100527.1582052-1-jie1x.wang@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v8 2/3] net/iavf: support PPPoL2TPv2oUDP RSS Hash", "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": "Add support for PPP over L2TPv2 over UDP protocol RSS Hash based\non inner IP src/dst address and TCP/UDP src/dst port.\n\nPatterns are listed below:\neth/ipv4(6)/udp/l2tpv2/ppp/ipv4(6)\neth/ipv4(6)/udp/l2tpv2/ppp/ipv4(6)/udp\neth/ipv4(6)/udp/l2tpv2/ppp/ipv4(6)/tcp\n\nAcked-by: Beilei Xing <beilei.xing@intel.com>\nSigned-off-by: Wenjun Wu <wenjun1.wu@intel.com>\nSigned-off-by: Jie Wang <jie1x.wang@intel.com>\n---\n doc/guides/nics/features/iavf.ini | 2 +\n doc/guides/rel_notes/release_21_11.rst | 1 +\n drivers/net/iavf/iavf_generic_flow.c | 131 +++++++++++++++++++++++++\n drivers/net/iavf/iavf_generic_flow.h | 15 +++\n drivers/net/iavf/iavf_hash.c | 108 +++++++++++++++++++-\n 5 files changed, 255 insertions(+), 2 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/iavf.ini b/doc/guides/nics/features/iavf.ini\nindex d00ca934c3..a916275b88 100644\n--- a/doc/guides/nics/features/iavf.ini\n+++ b/doc/guides/nics/features/iavf.ini\n@@ -50,8 +50,10 @@ icmp6 = Y\n ipv4 = Y\n ipv6 = Y\n ipv6_frag_ext = Y\n+l2tpv2 = Y\n l2tpv3oip = Y\n pfcp = Y\n+ppp = Y\n sctp = Y\n tcp = Y\n udp = Y\ndiff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst\nindex 283770131c..bd0eacc0c5 100644\n--- a/doc/guides/rel_notes/release_21_11.rst\n+++ b/doc/guides/rel_notes/release_21_11.rst\n@@ -132,6 +132,7 @@ New Features\n \n * Added Intel iavf support on Windows.\n * Added IPv4 and L4 (TCP/UDP/SCTP) checksum hash support in RSS flow.\n+ * Added PPPoL2TPv2oUDP RSS hash based on inner IP address and TCP/UDP port.\n \n * **Updated Intel ice driver.**\n \ndiff --git a/drivers/net/iavf/iavf_generic_flow.c b/drivers/net/iavf/iavf_generic_flow.c\nindex b86d99e57d..364904fa02 100644\n--- a/drivers/net/iavf/iavf_generic_flow.c\n+++ b/drivers/net/iavf/iavf_generic_flow.c\n@@ -1611,6 +1611,137 @@ enum rte_flow_item_type iavf_pattern_eth_ipv6_gre_ipv6_udp[] = {\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n+/* PPPoL2TPv2oUDP */\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6_udp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6_tcp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_L2TPV2,\n+\tRTE_FLOW_ITEM_TYPE_PPP,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+\n+\n typedef struct iavf_flow_engine * (*parse_engine_t)(struct iavf_adapter *ad,\n \t\tstruct rte_flow *flow,\n \t\tstruct iavf_parser_list *parser_list,\ndiff --git a/drivers/net/iavf/iavf_generic_flow.h b/drivers/net/iavf/iavf_generic_flow.h\nindex 4794d1fb80..f2b54e1944 100644\n--- a/drivers/net/iavf/iavf_generic_flow.h\n+++ b/drivers/net/iavf/iavf_generic_flow.h\n@@ -410,6 +410,21 @@ extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gre_ipv6_tcp[];\n extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gre_ipv4_udp[];\n extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gre_ipv6_udp[];\n \n+/* PPPoL2TPv2oUDP */\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4_tcp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6_tcp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4_tcp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6_udp[];\n+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6_tcp[];\n+\n+\n extern const struct rte_flow_ops iavf_flow_ops;\n \n /* pattern structure */\ndiff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c\nindex 1f2d3772d1..01724cd569 100644\n--- a/drivers/net/iavf/iavf_hash.c\n+++ b/drivers/net/iavf/iavf_hash.c\n@@ -34,6 +34,8 @@\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+/* L2TPv2 */\n+#define IAVF_PHINT_L2TPV2\t\t\tBIT_ULL(9)\n \n #define IAVF_PHINT_GTPU_MSK\t(IAVF_PHINT_GTPU\t| \\\n \t\t\t\t IAVF_PHINT_GTPU_EH\t| \\\n@@ -164,6 +166,12 @@ iavf_hash_parse_pattern_action(struct iavf_adapter *ad,\n \tVIRTCHNL_PROTO_HDR_ECPRI, \\\n \tFIELD_SELECTOR(VIRTCHNL_PROTO_HDR_ECPRI_PC_RTC_ID), {BUFF_NOUSED} }\n \n+#define proto_hdr_l2tpv2 { \\\n+\tVIRTCHNL_PROTO_HDR_L2TPV2, 0, {BUFF_NOUSED} }\n+\n+#define proto_hdr_ppp { \\\n+\tVIRTCHNL_PROTO_HDR_PPP, 0, {BUFF_NOUSED} }\n+\n #define TUNNEL_LEVEL_OUTER\t\t0\n #define TUNNEL_LEVEL_INNER\t\t1\n \n@@ -338,6 +346,52 @@ struct virtchnl_proto_hdrs ipv4_ecpri_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_ecpri}\n };\n \n+struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv4_tmplt = {\n+\tTUNNEL_LEVEL_INNER, 3,\n+\t{proto_hdr_l2tpv2,\n+\t proto_hdr_ppp,\n+\t proto_hdr_ipv4}\n+};\n+\n+struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv6_tmplt = {\n+\tTUNNEL_LEVEL_INNER, 3,\n+\t{proto_hdr_l2tpv2,\n+\t proto_hdr_ppp,\n+\t proto_hdr_ipv6}\n+};\n+\n+struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv4_udp_tmplt = {\n+\tTUNNEL_LEVEL_INNER, 4,\n+\t{proto_hdr_l2tpv2,\n+\t proto_hdr_ppp,\n+\t proto_hdr_ipv4_with_prot,\n+\t proto_hdr_udp}\n+};\n+\n+struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv4_tcp_tmplt = {\n+\tTUNNEL_LEVEL_INNER, 4,\n+\t{proto_hdr_l2tpv2,\n+\t proto_hdr_ppp,\n+\t proto_hdr_ipv4_with_prot,\n+\t proto_hdr_tcp}\n+};\n+\n+struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv6_udp_tmplt = {\n+\tTUNNEL_LEVEL_INNER, 4,\n+\t{proto_hdr_l2tpv2,\n+\t proto_hdr_ppp,\n+\t proto_hdr_ipv6_with_prot,\n+\t proto_hdr_udp}\n+};\n+\n+struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv6_tcp_tmplt = {\n+\tTUNNEL_LEVEL_INNER, 4,\n+\t{proto_hdr_l2tpv2,\n+\t proto_hdr_ppp,\n+\t proto_hdr_ipv6_with_prot,\n+\t proto_hdr_tcp}\n+};\n+\n /* rss type super set */\n \n /* IPv4 outer */\n@@ -493,6 +547,13 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {\n \t{iavf_pattern_eth_ipv6_gre_ipv4_tcp,\tIAVF_RSS_TYPE_INNER_IPV4_TCP, &inner_ipv4_tcp_tmplt},\n \t{iavf_pattern_eth_ipv4_gre_ipv4_udp,\tIAVF_RSS_TYPE_INNER_IPV4_UDP, &inner_ipv4_udp_tmplt},\n \t{iavf_pattern_eth_ipv6_gre_ipv4_udp,\tIAVF_RSS_TYPE_INNER_IPV4_UDP, &inner_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4,\tIAVF_RSS_TYPE_INNER_IPV4,\t&udp_l2tpv2_ppp_ipv4_tmplt},\n+\t{iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4_udp,\tIAVF_RSS_TYPE_INNER_IPV4_UDP,\t&udp_l2tpv2_ppp_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4_tcp,\tIAVF_RSS_TYPE_INNER_IPV4_TCP,\t&udp_l2tpv2_ppp_ipv4_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4,\tIAVF_RSS_TYPE_INNER_IPV4,\t&udp_l2tpv2_ppp_ipv4_tmplt},\n+\t{iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4_udp,\tIAVF_RSS_TYPE_INNER_IPV4_UDP,\t&udp_l2tpv2_ppp_ipv4_udp_tmplt},\n+\t{iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4_tcp,\tIAVF_RSS_TYPE_INNER_IPV4_TCP,\t&udp_l2tpv2_ppp_ipv4_tcp_tmplt},\n+\n \t/* IPv6 */\n \t{iavf_pattern_eth_ipv6,\t\t\t\tIAVF_RSS_TYPE_OUTER_IPV6,\t&outer_ipv6_tmplt},\n \t{iavf_pattern_eth_ipv6_frag_ext,\t\tIAVF_RSS_TYPE_OUTER_IPV6_FRAG,\t&outer_ipv6_frag_tmplt},\n@@ -553,6 +614,13 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {\n \t{iavf_pattern_eth_ipv6_gre_ipv6_tcp,\tIAVF_RSS_TYPE_INNER_IPV6_TCP, &inner_ipv6_tcp_tmplt},\n \t{iavf_pattern_eth_ipv4_gre_ipv6_udp,\tIAVF_RSS_TYPE_INNER_IPV6_UDP, &inner_ipv6_udp_tmplt},\n \t{iavf_pattern_eth_ipv6_gre_ipv6_udp,\tIAVF_RSS_TYPE_INNER_IPV6_UDP, &inner_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6,\tIAVF_RSS_TYPE_INNER_IPV6,\t&udp_l2tpv2_ppp_ipv6_tmplt},\n+\t{iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6_udp,\tIAVF_RSS_TYPE_INNER_IPV6_UDP,\t&udp_l2tpv2_ppp_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6_tcp,\tIAVF_RSS_TYPE_INNER_IPV6_TCP,\t&udp_l2tpv2_ppp_ipv6_tcp_tmplt},\n+\t{iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6,\tIAVF_RSS_TYPE_INNER_IPV6,\t&udp_l2tpv2_ppp_ipv6_tmplt},\n+\t{iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6_udp,\tIAVF_RSS_TYPE_INNER_IPV6_UDP,\t&udp_l2tpv2_ppp_ipv6_udp_tmplt},\n+\t{iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6_tcp,\tIAVF_RSS_TYPE_INNER_IPV6_TCP,\t&udp_l2tpv2_ppp_ipv6_tcp_tmplt},\n+\n };\n \n static struct iavf_flow_engine iavf_hash_engine = {\n@@ -687,13 +755,17 @@ iavf_hash_parse_pattern(const struct rte_flow_item pattern[], uint64_t *phint,\n \n \t\tswitch (item->type) {\n \t\tcase RTE_FLOW_ITEM_TYPE_IPV4:\n-\t\t\tif (!(*phint & IAVF_PHINT_GTPU_MSK) && !(*phint & IAVF_PHINT_GRE))\n+\t\t\tif (!(*phint & IAVF_PHINT_GTPU_MSK) &&\n+\t\t\t !(*phint & IAVF_PHINT_GRE) &&\n+\t\t\t !(*phint & IAVF_PHINT_L2TPV2))\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\tif (!(*phint & IAVF_PHINT_GTPU_MSK) &&\n+\t\t\t !(*phint & IAVF_PHINT_GRE) &&\n+\t\t\t !(*phint & IAVF_PHINT_L2TPV2))\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@@ -728,6 +800,10 @@ iavf_hash_parse_pattern(const struct rte_flow_item pattern[], uint64_t *phint,\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_GRE:\n \t\t\t*phint |= IAVF_PHINT_GRE;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_L2TPV2:\n+\t\t\t*phint |= IAVF_PHINT_L2TPV2;\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tbreak;\n \t\t}\n@@ -1050,12 +1126,40 @@ iavf_refine_proto_hdrs_by_pattern(struct virtchnl_proto_hdrs *proto_hdrs,\n \tproto_hdrs->tunnel_level = tun_lvl;\n }\n \n+static void\n+iavf_refine_proto_hdrs_l2tpv2(struct virtchnl_proto_hdrs *proto_hdrs,\n+\t\t\t uint64_t phint)\n+{\n+\tstruct virtchnl_proto_hdr *hdr1;\n+\tint i;\n+\n+\tif (!(phint & IAVF_PHINT_L2TPV2))\n+\t\treturn;\n+\n+\tif (proto_hdrs->tunnel_level == TUNNEL_LEVEL_INNER) {\n+\t\t/* shift headers layer */\n+\t\tfor (i = proto_hdrs->count - 1 + 1; i > 0; i--)\n+\t\t\tproto_hdrs->proto_hdr[i] = proto_hdrs->proto_hdr[i - 1];\n+\n+\t\t/* adding outer ip header at layer 0 */\n+\t\thdr1 = &proto_hdrs->proto_hdr[0];\n+\t\thdr1->field_selector = 0;\n+\t\tproto_hdrs->count++;\n+\t\tproto_hdrs->tunnel_level = TUNNEL_LEVEL_OUTER;\n+\t\tif (phint & IAVF_PHINT_OUTER_IPV4)\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, IPV4);\n+\t\telse if (phint & IAVF_PHINT_OUTER_IPV6)\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, IPV6);\n+\t}\n+}\n+\n static void iavf_refine_proto_hdrs(struct virtchnl_proto_hdrs *proto_hdrs,\n \t\t\t\t uint64_t rss_type, uint64_t phint)\n {\n \tiavf_refine_proto_hdrs_l234(proto_hdrs, rss_type);\n \tiavf_refine_proto_hdrs_by_pattern(proto_hdrs, phint);\n \tiavf_refine_proto_hdrs_gtpu(proto_hdrs, rss_type);\n+\tiavf_refine_proto_hdrs_l2tpv2(proto_hdrs, phint);\n }\n \n static uint64_t invalid_rss_comb[] = {\n", "prefixes": [ "v8", "2/3" ] }