Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/91564/?format=api
{ "id": 91564, "url": "https://patches.dpdk.org/api/patches/91564/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210415104751.816581-1-yuying.zhang@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": "<20210415104751.816581-1-yuying.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210415104751.816581-1-yuying.zhang@intel.com", "date": "2021-04-15T10:47:50", "name": "[v6,1/2] net/ice/base: support GTPU for DCF switch filter", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "7e299d6c1dddf98545761d63c58d6b0b8670f7f2", "submitter": { "id": 1844, "url": "https://patches.dpdk.org/api/people/1844/?format=api", "name": "Zhang, Yuying", "email": "yuying.zhang@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/20210415104751.816581-1-yuying.zhang@intel.com/mbox/", "series": [ { "id": 16408, "url": "https://patches.dpdk.org/api/series/16408/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=16408", "date": "2021-04-15T10:47:50", "name": "[v6,1/2] net/ice/base: support GTPU for DCF switch filter", "version": 6, "mbox": "https://patches.dpdk.org/series/16408/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/91564/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/91564/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 251E1A0C3F;\n\tThu, 15 Apr 2021 12:58:33 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E7E601620FE;\n\tThu, 15 Apr 2021 12:58:32 +0200 (CEST)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by mails.dpdk.org (Postfix) with ESMTP id 1AD7C1620FD\n for <dev@dpdk.org>; Thu, 15 Apr 2021 12:58:30 +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 15 Apr 2021 03:58:29 -0700", "from dpdk-yyzhang2.sh.intel.com ([10.67.117.129])\n by fmsmga002.fm.intel.com with ESMTP; 15 Apr 2021 03:58:27 -0700" ], "IronPort-SDR": [ "\n Qm5yq9qjefKJMzhb+9H/Jhcmr3o5avxUujmEXeZQli4gwPjPu2iCLm0EioMEIYZtG43p5TOc4v\n tQLroJYZ+R5g==", "\n yz3WdhAZY6bGsoEFNxHIkI9H/7bhmao+dQ3hN+IRwWDfem56kG+PDT1YOQ7c0YjgqJ9yOsVn7O\n /DRFSPjJimCQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,9954\"; a=\"182329980\"", "E=Sophos;i=\"5.82,223,1613462400\"; d=\"scan'208\";a=\"182329980\"", "E=Sophos;i=\"5.82,223,1613462400\"; d=\"scan'208\";a=\"452868714\"" ], "X-ExtLoop1": "1", "From": "Yuying Zhang <yuying.zhang@intel.com>", "To": "dev@dpdk.org,\n\tqi.z.zhang@intel.com", "Cc": "Yuying Zhang <yuying.zhang@intel.com>", "Date": "Thu, 15 Apr 2021 10:47:50 +0000", "Message-Id": "<20210415104751.816581-1-yuying.zhang@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210318084824.165907-1-yuying.zhang@intel.com>", "References": "<20210318084824.165907-1-yuying.zhang@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v6 1/2] net/ice/base: support GTPU for DCF switch\n filter", "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": "Enable GTPU filtering for DCF switch filter.\n\nSigned-off-by: Yuying Zhang <yuying.zhang@intel.com>\n---\n drivers/net/ice/base/ice_protocol_type.h | 20 ++\n drivers/net/ice/base/ice_switch.c | 263 ++++++++++++++++++++---\n drivers/net/ice/base/ice_switch.h | 5 +\n 3 files changed, 260 insertions(+), 28 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h\nindex 8c9d098e22..d1d266ffd2 100644\n--- a/drivers/net/ice/base/ice_protocol_type.h\n+++ b/drivers/net/ice/base/ice_protocol_type.h\n@@ -76,6 +76,26 @@ enum ice_sw_tunnel_type {\n \tICE_SW_TUN_GTP,\n \tICE_SW_TUN_IPV4_GTPU_NO_PAY,\n \tICE_SW_TUN_IPV6_GTPU_NO_PAY,\n+\tICE_SW_TUN_IPV4_GTPU_EH_IPV4,\n+\tICE_SW_TUN_IPV4_GTPU_IPV4_UDP,\n+\tICE_SW_TUN_IPV4_GTPU_EH_IPV4_UDP,\n+\tICE_SW_TUN_IPV4_GTPU_IPV4_TCP,\n+\tICE_SW_TUN_IPV4_GTPU_EH_IPV4_TCP,\n+\tICE_SW_TUN_IPV4_GTPU_EH_IPV6,\n+\tICE_SW_TUN_IPV4_GTPU_IPV6_UDP,\n+\tICE_SW_TUN_IPV4_GTPU_EH_IPV6_UDP,\n+\tICE_SW_TUN_IPV4_GTPU_IPV6_TCP,\n+\tICE_SW_TUN_IPV4_GTPU_EH_IPV6_TCP,\n+\tICE_SW_TUN_IPV6_GTPU_EH_IPV4,\n+\tICE_SW_TUN_IPV6_GTPU_IPV4_UDP,\n+\tICE_SW_TUN_IPV6_GTPU_EH_IPV4_UDP,\n+\tICE_SW_TUN_IPV6_GTPU_IPV4_TCP,\n+\tICE_SW_TUN_IPV6_GTPU_EH_IPV4_TCP,\n+\tICE_SW_TUN_IPV6_GTPU_EH_IPV6,\n+\tICE_SW_TUN_IPV6_GTPU_IPV6_UDP,\n+\tICE_SW_TUN_IPV6_GTPU_EH_IPV6_UDP,\n+\tICE_SW_TUN_IPV6_GTPU_IPV6_TCP,\n+\tICE_SW_TUN_IPV6_GTPU_EH_IPV6_TCP,\n \tICE_SW_TUN_PPPOE,\n \tICE_SW_TUN_PPPOE_PAY,\n \tICE_SW_TUN_PPPOE_IPV4,\ndiff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c\nindex 45f83cd10c..2a9bea4261 100644\n--- a/drivers/net/ice/base/ice_switch.c\n+++ b/drivers/net/ice/base/ice_switch.c\n@@ -14,6 +14,7 @@\n #define ICE_PPP_IPV6_PROTO_ID\t\t0x0057\n #define ICE_IPV6_ETHER_ID\t\t0x86DD\n #define ICE_TCP_PROTO_ID\t\t0x06\n+#define ICE_GTPU_PROFILE\t\t24\n #define ICE_ETH_P_8021Q\t\t\t0x8100\n \n /* Dummy ethernet header needed in the ice_aqc_sw_rules_elem\n@@ -1123,6 +1124,7 @@ static const u8 dummy_udp_gtp_packet[] = {\n \n \t0x02, 0x00, 0x00, 0x00, /* PDU Session extension header */\n \t0x00, 0x00, 0x00, 0x00,\n+\n };\n \n static const struct ice_dummy_pkt_offsets dummy_ipv4_gtp_no_pay_packet_offsets[] = {\n@@ -1142,6 +1144,32 @@ struct ice_dummy_pkt_offsets dummy_ipv6_gtp_no_pay_packet_offsets[] = {\n \t{ ICE_PROTOCOL_LAST,\t0 },\n };\n \n+static const u8 dummy_ipv6_gtp_packet[] = {\n+\t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x86, 0xdd,\n+\n+\t0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_OFOS 14 */\n+\t0x00, 0x6c, 0x11, 0x00, /* Next header UDP*/\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x08, 0x68, 0x08, 0x68, /* ICE_UDP_OF 54 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x30, 0x00, 0x00, 0x28, /* ICE_GTP 62 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x00, 0x00,\n+};\n+\n static const struct ice_dummy_pkt_offsets dummy_pppoe_packet_offsets[] = {\n \t{ ICE_MAC_OFOS,\t\t0 },\n \t{ ICE_ETYPE_OL,\t\t12 },\n@@ -1785,6 +1813,33 @@ static void ice_collect_result_idx(struct ice_aqc_recipe_data_elem *buf,\n \t\t\t ~ICE_AQ_RECIPE_RESULT_EN, recp->res_idxs);\n }\n \n+static struct ice_prof_type_entry ice_prof_type_tbl[ICE_GTPU_PROFILE] = {\n+\t{ ICE_PROFID_IPV4_GTPU_IPV4_OTHER, ICE_SW_TUN_IPV4_GTPU_IPV4},\n+\t{ ICE_PROFID_IPV4_GTPU_IPV4_UDP, ICE_SW_TUN_IPV4_GTPU_IPV4_UDP},\n+\t{ ICE_PROFID_IPV4_GTPU_IPV4_TCP, ICE_SW_TUN_IPV4_GTPU_IPV4_TCP},\n+\t{ ICE_PROFID_IPV4_GTPU_EH_IPV4_OTHER, ICE_SW_TUN_IPV4_GTPU_EH_IPV4},\n+\t{ ICE_PROFID_IPV4_GTPU_EH_IPV4_UDP, ICE_SW_TUN_IPV4_GTPU_EH_IPV4_UDP},\n+\t{ ICE_PROFID_IPV4_GTPU_EH_IPV4_TCP, ICE_SW_TUN_IPV4_GTPU_EH_IPV4_TCP},\n+\t{ ICE_PROFID_IPV4_GTPU_IPV6_OTHER, ICE_SW_TUN_IPV4_GTPU_IPV6},\n+\t{ ICE_PROFID_IPV4_GTPU_IPV6_UDP, ICE_SW_TUN_IPV4_GTPU_IPV6_UDP},\n+\t{ ICE_PROFID_IPV4_GTPU_IPV6_TCP, ICE_SW_TUN_IPV4_GTPU_IPV6_TCP},\n+\t{ ICE_PROFID_IPV4_GTPU_EH_IPV6_OTHER, ICE_SW_TUN_IPV4_GTPU_EH_IPV6},\n+\t{ ICE_PROFID_IPV4_GTPU_EH_IPV6_UDP, ICE_SW_TUN_IPV4_GTPU_EH_IPV6_UDP},\n+\t{ ICE_PROFID_IPV4_GTPU_EH_IPV6_TCP, ICE_SW_TUN_IPV4_GTPU_EH_IPV6_TCP},\n+\t{ ICE_PROFID_IPV6_GTPU_IPV4_OTHER, ICE_SW_TUN_IPV6_GTPU_IPV4},\n+\t{ ICE_PROFID_IPV6_GTPU_IPV4_UDP, ICE_SW_TUN_IPV6_GTPU_IPV4_UDP},\n+\t{ ICE_PROFID_IPV6_GTPU_IPV4_TCP, ICE_SW_TUN_IPV6_GTPU_IPV4_TCP},\n+\t{ ICE_PROFID_IPV6_GTPU_EH_IPV4_OTHER, ICE_SW_TUN_IPV6_GTPU_EH_IPV4},\n+\t{ ICE_PROFID_IPV6_GTPU_EH_IPV4_UDP, ICE_SW_TUN_IPV6_GTPU_EH_IPV4_UDP},\n+\t{ ICE_PROFID_IPV6_GTPU_EH_IPV4_TCP, ICE_SW_TUN_IPV6_GTPU_EH_IPV4_TCP},\n+\t{ ICE_PROFID_IPV6_GTPU_IPV6_OTHER, ICE_SW_TUN_IPV6_GTPU_IPV6},\n+\t{ ICE_PROFID_IPV6_GTPU_IPV6_UDP, ICE_SW_TUN_IPV6_GTPU_IPV6_UDP},\n+\t{ ICE_PROFID_IPV6_GTPU_IPV6_TCP, ICE_SW_TUN_IPV6_GTPU_IPV6_TCP},\n+\t{ ICE_PROFID_IPV6_GTPU_EH_IPV6_OTHER, ICE_SW_TUN_IPV6_GTPU_EH_IPV6},\n+\t{ ICE_PROFID_IPV6_GTPU_EH_IPV6_UDP, ICE_SW_TUN_IPV6_GTPU_EH_IPV6_UDP},\n+\t{ ICE_PROFID_IPV6_GTPU_EH_IPV6_TCP, ICE_SW_TUN_IPV6_GTPU_EH_IPV6_TCP},\n+};\n+\n /**\n * ice_get_tun_type_for_recipe - get tunnel type for the recipe\n * @rid: recipe ID that we are populating\n@@ -1796,7 +1851,7 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid, bool vlan)\n \tu8 pppoe_profile[7] = {34, 35, 36, 37, 38, 39, 40};\n \tu8 non_tun_profile[6] = {4, 5, 6, 7, 8, 9};\n \tenum ice_sw_tunnel_type tun_type;\n-\tu16 i, j, profile_num = 0;\n+\tu16 i, j, k, profile_num = 0;\n \tbool non_tun_valid = false;\n \tbool pppoe_valid = false;\n \tbool vxlan_valid = false;\n@@ -1870,18 +1925,12 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid, bool vlan)\n \t}\n \n \tif (tun_type == ICE_SW_TUN_GTP) {\n-\t\tif (ice_is_bit_set(recipe_to_profile[rid],\n-\t\t\t\t ICE_PROFID_IPV4_GTPU_IPV4_OTHER))\n-\t\t\ttun_type = ICE_SW_TUN_IPV4_GTPU_IPV4;\n-\t\telse if (ice_is_bit_set(recipe_to_profile[rid],\n-\t\t\t\t\tICE_PROFID_IPV4_GTPU_IPV6_OTHER))\n-\t\t\ttun_type = ICE_SW_TUN_IPV4_GTPU_IPV6;\n-\t\telse if (ice_is_bit_set(recipe_to_profile[rid],\n-\t\t\t\t\tICE_PROFID_IPV6_GTPU_IPV4_OTHER))\n-\t\t\ttun_type = ICE_SW_TUN_IPV6_GTPU_IPV4;\n-\t\telse if (ice_is_bit_set(recipe_to_profile[rid],\n-\t\t\t\t\tICE_PROFID_IPV6_GTPU_IPV6_OTHER))\n-\t\t\ttun_type = ICE_SW_TUN_IPV6_GTPU_IPV6;\n+\t\tfor (k = 0; k < ARRAY_SIZE(ice_prof_type_tbl); k++)\n+\t\t\tif (ice_is_bit_set(recipe_to_profile[rid],\n+\t\t\t\t\t ice_prof_type_tbl[k].prof_id)) {\n+\t\t\t\ttun_type = ice_prof_type_tbl[k].type;\n+\t\t\t\tbreak;\n+\t\t\t}\n \t}\n \n \tif (profile_num == 1 && (flag_valid || non_tun_valid || pppoe_valid)) {\n@@ -6521,7 +6570,7 @@ static const struct ice_prot_ext_tbl_entry ice_prot_ext[ICE_PROTOCOL_LAST] = {\n \t{ ICE_GENEVE,\t\t{ 8, 10, 12, 14 } },\n \t{ ICE_VXLAN_GPE,\t{ 8, 10, 12, 14 } },\n \t{ ICE_NVGRE,\t\t{ 0, 2, 4, 6 } },\n-\t{ ICE_GTP,\t\t{ 8, 10, 12, 14, 16, 18, 20 } },\n+\t{ ICE_GTP,\t\t{ 8, 10, 12, 14, 16, 18, 20, 22 } },\n \t{ ICE_PPPOE,\t\t{ 0, 2, 4, 6 } },\n \t{ ICE_PFCP,\t\t{ 8, 10, 12, 14, 16, 18, 20, 22 } },\n \t{ ICE_L2TPV3,\t\t{ 0, 2, 4, 6, 8, 10 } },\n@@ -7461,38 +7510,100 @@ ice_get_compat_fv_bitmap(struct ice_hw *hw, struct ice_adv_rule_info *rinfo,\n \tcase ICE_SW_IPV6_UDP:\n \t\tice_set_bit(ICE_PROFID_IPV6_UDP, bm);\n \t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_NO_PAY:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_TEID, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_NO_PAY:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_TEID, bm);\n+\t\treturn;\n \tcase ICE_SW_TUN_IPV4_GTPU_IPV4:\n-\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV4_OTHER, bm);\n \t\tice_set_bit(ICE_PROFID_IPV4_GTPU_IPV4_OTHER, bm);\n-\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV4_UDP, bm);\n \t\tice_set_bit(ICE_PROFID_IPV4_GTPU_IPV4_UDP, bm);\n-\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV4_TCP, bm);\n \t\tice_set_bit(ICE_PROFID_IPV4_GTPU_IPV4_TCP, bm);\n \t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_IPV4_UDP:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_IPV4_UDP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_IPV4_TCP:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_IPV4_TCP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_EH_IPV4:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV4_OTHER, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV4_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV4_TCP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_EH_IPV4_UDP:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV4_UDP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_EH_IPV4_TCP:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV4_TCP, bm);\n+\t\treturn;\n \tcase ICE_SW_TUN_IPV6_GTPU_IPV4:\n-\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV4_OTHER, bm);\n \t\tice_set_bit(ICE_PROFID_IPV6_GTPU_IPV4_OTHER, bm);\n-\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV4_UDP, bm);\n \t\tice_set_bit(ICE_PROFID_IPV6_GTPU_IPV4_UDP, bm);\n-\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV4_TCP, bm);\n \t\tice_set_bit(ICE_PROFID_IPV6_GTPU_IPV4_TCP, bm);\n \t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_IPV4_UDP:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_IPV4_UDP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_IPV4_TCP:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_IPV4_TCP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_EH_IPV4:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV4_OTHER, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV4_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV4_TCP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_EH_IPV4_UDP:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV4_UDP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_EH_IPV4_TCP:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV4_TCP, bm);\n+\t\treturn;\n \tcase ICE_SW_TUN_IPV4_GTPU_IPV6:\n-\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV6_OTHER, bm);\n \t\tice_set_bit(ICE_PROFID_IPV4_GTPU_IPV6_OTHER, bm);\n-\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV6_UDP, bm);\n \t\tice_set_bit(ICE_PROFID_IPV4_GTPU_IPV6_UDP, bm);\n-\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV6_TCP, bm);\n \t\tice_set_bit(ICE_PROFID_IPV4_GTPU_IPV6_TCP, bm);\n \t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_IPV6_UDP:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_IPV6_UDP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_IPV6_TCP:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_IPV6_TCP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_EH_IPV6:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV6_OTHER, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV6_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV6_TCP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_EH_IPV6_UDP:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV6_UDP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV4_GTPU_EH_IPV6_TCP:\n+\t\tice_set_bit(ICE_PROFID_IPV4_GTPU_EH_IPV6_TCP, bm);\n+\t\treturn;\n \tcase ICE_SW_TUN_IPV6_GTPU_IPV6:\n-\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV6_OTHER, bm);\n \t\tice_set_bit(ICE_PROFID_IPV6_GTPU_IPV6_OTHER, bm);\n-\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV6_UDP, bm);\n \t\tice_set_bit(ICE_PROFID_IPV6_GTPU_IPV6_UDP, bm);\n-\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV6_TCP, bm);\n \t\tice_set_bit(ICE_PROFID_IPV6_GTPU_IPV6_TCP, bm);\n \t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_IPV6_UDP:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_IPV6_UDP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_IPV6_TCP:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_IPV6_TCP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_EH_IPV6:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV6_OTHER, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV6_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV6_TCP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_EH_IPV6_UDP:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV6_UDP, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_IPV6_GTPU_EH_IPV6_TCP:\n+\t\tice_set_bit(ICE_PROFID_IPV6_GTPU_EH_IPV6_TCP, bm);\n+\t\treturn;\n \tcase ICE_SW_TUN_AND_NON_TUN:\n \tcase ICE_SW_TUN_AND_NON_TUN_QINQ:\n \tdefault:\n@@ -7827,8 +7938,8 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t\t*offsets = dummy_ipv4_gtp_no_pay_packet_offsets;\n \t\treturn;\n \t} else if (tun_type == ICE_SW_TUN_IPV6_GTPU_NO_PAY) {\n-\t\t*pkt = dummy_ipv6_gtpu_ipv6_packet;\n-\t\t*pkt_len = sizeof(dummy_ipv6_gtpu_ipv6_packet);\n+\t\t*pkt = dummy_ipv6_gtp_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv6_gtp_packet);\n \t\t*offsets = dummy_ipv6_gtp_no_pay_packet_offsets;\n \t\treturn;\n \t}\n@@ -7896,6 +8007,102 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t\treturn;\n \t}\n \n+\tif (tun_type == ICE_SW_TUN_IPV4_GTPU_IPV4 ||\n+\t tun_type == ICE_SW_TUN_IPV4_GTPU_EH_IPV4) {\n+\t\t*pkt = dummy_ipv4_gtpu_ipv4_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv4_gtpu_ipv4_packet);\n+\t\t*offsets = dummy_ipv4_gtpu_ipv4_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV4_GTPU_IPV4_UDP ||\n+\t tun_type == ICE_SW_TUN_IPV4_GTPU_EH_IPV4_UDP) {\n+\t\t*pkt = dummy_ipv4_gtpu_ipv4_udp_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv4_gtpu_ipv4_udp_packet);\n+\t\t*offsets = dummy_ipv4_gtpu_ipv4_udp_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV4_GTPU_IPV4_TCP ||\n+\t tun_type == ICE_SW_TUN_IPV4_GTPU_EH_IPV4_TCP) {\n+\t\t*pkt = dummy_ipv4_gtpu_ipv4_tcp_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv4_gtpu_ipv4_tcp_packet);\n+\t\t*offsets = dummy_ipv4_gtpu_ipv4_tcp_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV4_GTPU_IPV6 ||\n+\t tun_type == ICE_SW_TUN_IPV4_GTPU_EH_IPV6) {\n+\t\t*pkt = dummy_ipv4_gtpu_ipv6_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv4_gtpu_ipv6_packet);\n+\t\t*offsets = dummy_ipv4_gtpu_ipv6_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV4_GTPU_IPV6_UDP ||\n+\t tun_type == ICE_SW_TUN_IPV4_GTPU_EH_IPV6_UDP) {\n+\t\t*pkt = dummy_ipv4_gtpu_ipv6_udp_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv4_gtpu_ipv6_udp_packet);\n+\t\t*offsets = dummy_ipv4_gtpu_ipv6_udp_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV4_GTPU_IPV6_TCP ||\n+\t tun_type == ICE_SW_TUN_IPV4_GTPU_EH_IPV6_TCP) {\n+\t\t*pkt = dummy_ipv4_gtpu_ipv6_tcp_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv4_gtpu_ipv6_tcp_packet);\n+\t\t*offsets = dummy_ipv4_gtpu_ipv6_tcp_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV6_GTPU_IPV4 ||\n+\t tun_type == ICE_SW_TUN_IPV6_GTPU_EH_IPV4) {\n+\t\t*pkt = dummy_ipv6_gtpu_ipv4_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv6_gtpu_ipv4_packet);\n+\t\t*offsets = dummy_ipv6_gtpu_ipv4_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV6_GTPU_IPV4_UDP ||\n+\t tun_type == ICE_SW_TUN_IPV6_GTPU_EH_IPV4_UDP) {\n+\t\t*pkt = dummy_ipv6_gtpu_ipv4_udp_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv6_gtpu_ipv4_udp_packet);\n+\t\t*offsets = dummy_ipv6_gtpu_ipv4_udp_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV6_GTPU_IPV4_TCP ||\n+\t tun_type == ICE_SW_TUN_IPV6_GTPU_EH_IPV4_TCP) {\n+\t\t*pkt = dummy_ipv6_gtpu_ipv4_tcp_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv6_gtpu_ipv4_tcp_packet);\n+\t\t*offsets = dummy_ipv6_gtpu_ipv4_tcp_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV6_GTPU_IPV6 ||\n+\t tun_type == ICE_SW_TUN_IPV6_GTPU_EH_IPV6) {\n+\t\t*pkt = dummy_ipv6_gtpu_ipv6_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv6_gtpu_ipv6_packet);\n+\t\t*offsets = dummy_ipv6_gtpu_ipv6_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV6_GTPU_IPV6_UDP ||\n+\t tun_type == ICE_SW_TUN_IPV6_GTPU_EH_IPV6_UDP) {\n+\t\t*pkt = dummy_ipv6_gtpu_ipv6_udp_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv6_gtpu_ipv6_udp_packet);\n+\t\t*offsets = dummy_ipv6_gtpu_ipv6_udp_packet_offsets;\n+\t\treturn;\n+\t}\n+\n+\tif (tun_type == ICE_SW_TUN_IPV6_GTPU_IPV6_TCP ||\n+\t tun_type == ICE_SW_TUN_IPV6_GTPU_EH_IPV6_TCP) {\n+\t\t*pkt = dummy_ipv6_gtpu_ipv6_tcp_packet;\n+\t\t*pkt_len = sizeof(dummy_ipv6_gtpu_ipv6_tcp_packet);\n+\t\t*offsets = dummy_ipv6_gtpu_ipv6_tcp_packet_offsets;\n+\t\treturn;\n+\t}\n+\n \tif (tun_type == ICE_SW_TUN_PPPOE && ipv6) {\n \t\t*pkt = dummy_pppoe_ipv6_packet;\n \t\t*pkt_len = sizeof(dummy_pppoe_ipv6_packet);\ndiff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h\nindex 61be54f9c0..980bae5806 100644\n--- a/drivers/net/ice/base/ice_switch.h\n+++ b/drivers/net/ice/base/ice_switch.h\n@@ -216,6 +216,11 @@ struct ice_adv_lkup_elem {\n \tunion ice_prot_hdr m_u;\t/* Mask of header values to match */\n };\n \n+struct ice_prof_type_entry {\n+\tu16 prof_id;\n+\tenum ice_sw_tunnel_type type;\n+};\n+\n struct ice_sw_act_ctrl {\n \t/* Source VSI for LOOKUP_TX or source port for LOOKUP_RX */\n \tu16 src;\n", "prefixes": [ "v6", "1/2" ] }