Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/77403/?format=api
{ "id": 77403, "url": "http://patches.dpdk.org/api/patches/77403/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200911131954.15999-17-qi.z.zhang@intel.com/", "project": { "id": 1, "url": "http://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": "<20200911131954.15999-17-qi.z.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200911131954.15999-17-qi.z.zhang@intel.com", "date": "2020-09-11T13:19:30", "name": "[v2,16/40] net/ice/base: add support for GTP-U type switch rule", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "72910da4264957b10d800236f66a06fb00ee18a2", "submitter": { "id": 504, "url": "http://patches.dpdk.org/api/people/504/?format=api", "name": "Qi Zhang", "email": "qi.z.zhang@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200911131954.15999-17-qi.z.zhang@intel.com/mbox/", "series": [ { "id": 12148, "url": "http://patches.dpdk.org/api/series/12148/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12148", "date": "2020-09-11T13:19:15", "name": "ice base code update", "version": 2, "mbox": "http://patches.dpdk.org/series/12148/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/77403/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/77403/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id BB4C7A04B7;\n\tFri, 11 Sep 2020 15:19:08 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 2DF411C1B9;\n\tFri, 11 Sep 2020 15:16:34 +0200 (CEST)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by dpdk.org (Postfix) with ESMTP id E62631C133\n for <dev@dpdk.org>; Fri, 11 Sep 2020 15:16:24 +0200 (CEST)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 11 Sep 2020 06:16:24 -0700", "from dpdk51.sh.intel.com ([10.67.111.82])\n by FMSMGA003.fm.intel.com with ESMTP; 11 Sep 2020 06:16:23 -0700" ], "IronPort-SDR": [ "\n ICaVwhQn5Pjq/Lf1HRMjPbsLUGmdnWIGbtUSsH0MIMJADvgrJQUCpJ1CVqgfksiY0XtkMXG9Xz\n WqroOkVl1OZg==", "\n FlVhPPgcIAVtx2s8xfmqbkLvWWBcWbQjSnYs9fWFn/m0jgl7lFNgiL8BBiqa2uYpZX57vmcSIw\n +jf+C0iGTPXA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9740\"; a=\"146482235\"", "E=Sophos;i=\"5.76,415,1592895600\"; d=\"scan'208\";a=\"146482235\"", "E=Sophos;i=\"5.76,415,1592895600\"; d=\"scan'208\";a=\"342296600\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Qi Zhang <qi.z.zhang@intel.com>", "To": "ferruh.yigit@intel.com", "Cc": "dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>,\n Wei Zhao <wei.zhao1@intel.com>", "Date": "Fri, 11 Sep 2020 21:19:30 +0800", "Message-Id": "<20200911131954.15999-17-qi.z.zhang@intel.com>", "X-Mailer": "git-send-email 2.13.6", "In-Reply-To": "<20200911131954.15999-1-qi.z.zhang@intel.com>", "References": "<20200907112826.48493-1-qi.z.zhang@intel.com>\n <20200911131954.15999-1-qi.z.zhang@intel.com>", "Subject": "[dpdk-dev] [PATCH v2 16/40] net/ice/base: add support for GTP-U\n\ttype switch rule", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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": "This patch add support for GTP-U type of switch rule.\nIt enable all GTP-U related ptype.\n\nSigned-off-by: Wei Zhao <wei.zhao1@intel.com>\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\nAcked-by: Qiming Yang <qiming.yang@intel.com>\n---\n drivers/net/ice/base/ice_protocol_type.h | 7 +\n drivers/net/ice/base/ice_switch.c | 299 ++++++++++++++++++++++++++++++-\n drivers/net/ice/base/ice_switch.h | 26 ++-\n 3 files changed, 328 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h\nindex 7cc44c172..4d3136fb2 100644\n--- a/drivers/net/ice/base/ice_protocol_type.h\n+++ b/drivers/net/ice/base/ice_protocol_type.h\n@@ -51,6 +51,7 @@ enum ice_protocol_type {\n \tICE_ESP,\n \tICE_AH,\n \tICE_NAT_T,\n+\tICE_GTP_NO_PAY,\n \tICE_PROTOCOL_LAST\n };\n \n@@ -71,6 +72,12 @@ enum ice_sw_tunnel_type {\n \tICE_SW_IPV6_TCP,\n \tICE_SW_IPV6_UDP,\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_IPV4,\n+\tICE_SW_TUN_IPV4_GTPU_IPV6,\n+\tICE_SW_TUN_IPV6_GTPU_IPV4,\n+\tICE_SW_TUN_IPV6_GTPU_IPV6,\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 f2d8514be..69fa64ac9 100644\n--- a/drivers/net/ice/base/ice_switch.c\n+++ b/drivers/net/ice/base/ice_switch.c\n@@ -535,6 +535,207 @@ static const u8 dummy_udp_gtp_packet[] = {\n \t0x00, 0x00, 0x00, 0x00,\n };\n \n+static const\n+struct ice_dummy_pkt_offsets dummy_ipv4_gtpu_ipv4_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_IPV4_OFOS,\t14 },\n+\t{ ICE_UDP_OF,\t\t34 },\n+\t{ ICE_GTP,\t\t42 },\n+\t{ ICE_IPV4_IL,\t\t62 },\n+\t{ ICE_PROTOCOL_LAST,\t0 },\n+};\n+\n+static const u8 dummy_ipv4_gtpu_ipv4_packet[] = {\n+\t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x08, 0x00,\n+\n+\t0x45, 0x00, 0x00, 0x44, /* ICE_IPV4_OFOS 14 */\n+\t0x00, 0x00, 0x40, 0x00,\n+\t0x40, 0x11, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x08, 0x68, 0x08, 0x68, /* ICE_UDP_OF 34 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x34, 0xff, 0x00, 0x28, /* ICE_GTP 42 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x85,\n+\n+\t0x02, 0x00, 0x00, 0x00, /* PDU Session extension header */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x45, 0x00, 0x00, 0x14, /* ICE_IPV4_IL 62 */\n+\t0x00, 0x00, 0x40, 0x00,\n+\t0x40, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00,\n+};\n+\n+static const\n+struct ice_dummy_pkt_offsets dummy_ipv4_gtpu_ipv6_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_IPV4_OFOS,\t14 },\n+\t{ ICE_UDP_OF,\t\t34 },\n+\t{ ICE_GTP,\t\t42 },\n+\t{ ICE_IPV6_IL,\t\t62 },\n+\t{ ICE_PROTOCOL_LAST,\t0 },\n+};\n+\n+static const u8 dummy_ipv4_gtpu_ipv6_packet[] = {\n+\t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x08, 0x00,\n+\n+\t0x45, 0x00, 0x00, 0x58, /* ICE_IPV4_OFOS 14 */\n+\t0x00, 0x00, 0x40, 0x00,\n+\t0x40, 0x11, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x08, 0x68, 0x08, 0x68, /* ICE_UDP_OF 34 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x34, 0xff, 0x00, 0x28, /* ICE_GTP 42 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x85,\n+\n+\t0x02, 0x00, 0x00, 0x00, /* PDU Session extension header */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_IL 62 */\n+\t0x00, 0x00, 0x3b, 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+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x00, 0x00,\n+};\n+\n+static const\n+struct ice_dummy_pkt_offsets dummy_ipv6_gtpu_ipv4_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_IPV6_OFOS,\t14 },\n+\t{ ICE_UDP_OF,\t\t54 },\n+\t{ ICE_GTP,\t\t62 },\n+\t{ ICE_IPV4_IL,\t\t82 },\n+\t{ ICE_PROTOCOL_LAST,\t0 },\n+};\n+\n+static const u8 dummy_ipv6_gtpu_ipv4_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, 0x58, 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+\t0x34, 0xff, 0x00, 0x28, /* ICE_GTP 62 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x85,\n+\n+\t0x02, 0x00, 0x00, 0x00, /* PDU Session extension header */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x45, 0x00, 0x00, 0x14, /* ICE_IPV4_IL 82 */\n+\t0x00, 0x00, 0x40, 0x00,\n+\t0x40, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x00, 0x00,\n+};\n+\n+static const\n+struct ice_dummy_pkt_offsets dummy_ipv6_gtpu_ipv6_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_IPV6_OFOS,\t14 },\n+\t{ ICE_UDP_OF,\t\t54 },\n+\t{ ICE_GTP,\t\t62 },\n+\t{ ICE_IPV6_IL,\t\t82 },\n+\t{ ICE_PROTOCOL_LAST,\t0 },\n+};\n+\n+static const u8 dummy_ipv6_gtpu_ipv6_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+\t0x34, 0xff, 0x00, 0x28, /* ICE_GTP 62 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x85,\n+\n+\t0x02, 0x00, 0x00, 0x00, /* PDU Session extension header */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_OFIL 82 */\n+\t0x00, 0x00, 0x3b, 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+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x00, 0x00,\n+};\n+\n+static const\n+struct ice_dummy_pkt_offsets dummy_ipv4_gtp_no_pay_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_IPV4_OFOS,\t14 },\n+\t{ ICE_UDP_OF,\t\t34 },\n+\t{ ICE_GTP_NO_PAY,\t42 },\n+\t{ ICE_PROTOCOL_LAST,\t0 },\n+};\n+\n+static const\n+struct ice_dummy_pkt_offsets dummy_ipv6_gtp_no_pay_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_IPV6_OFOS,\t14 },\n+\t{ ICE_UDP_OF,\t\t54 },\n+\t{ ICE_GTP_NO_PAY,\t62 },\n+\t{ ICE_PROTOCOL_LAST,\t0 },\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@@ -1070,11 +1271,13 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid)\n \t\t}\n \n \t\tif (j >= ICE_PROFID_IPV4_GTPU_EH_IPV4_OTHER &&\n-\t\t j <= ICE_PROFID_IPV6_GTPU_IPV6_OTHER)\n+\t\t j <= ICE_PROFID_IPV6_GTPU_IPV6_TCP)\n \t\t\tgtp_valid = true;\n \n-\t\tif (j >= ICE_PROFID_IPV4_ESP &&\n-\t\t j <= ICE_PROFID_IPV6_PFCP_SESSION)\n+\t\tif ((j >= ICE_PROFID_IPV4_ESP &&\n+\t\t j <= ICE_PROFID_IPV6_PFCP_SESSION) ||\n+\t\t (j >= ICE_PROFID_IPV4_GTPC_TEID &&\n+\t\t j <= ICE_PROFID_IPV6_GTPU_TEID))\n \t\t\tflag_valid = true;\n \t}\n \n@@ -1092,6 +1295,8 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid)\n \telse if (non_tun_valid && !vxlan_valid && !gre_valid && !gtp_valid &&\n \t\t !pppoe_valid)\n \t\ttun_type = ICE_NON_TUN;\n+\telse\n+\t\ttun_type = ICE_NON_TUN;\n \n \tif (profile_num > 1 && tun_type == ICE_SW_TUN_PPPOE) {\n \t\ti = ice_is_bit_set(recipe_to_profile[rid],\n@@ -1104,6 +1309,21 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid)\n \t\t\ttun_type = ICE_SW_TUN_PPPOE_IPV6;\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}\n+\n \tif (profile_num == 1 && (flag_valid || non_tun_valid || pppoe_valid)) {\n \t\tfor (j = 0; j < ICE_MAX_NUM_PROFILES; j++) {\n \t\t\tif (ice_is_bit_set(recipe_to_profile[rid], j)) {\n@@ -1181,6 +1401,12 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid)\n \t\t\t\tcase ICE_PROFID_MAC_IPV6_L2TPV3:\n \t\t\t\t\ttun_type = ICE_SW_TUN_IPV6_L2TPV3;\n \t\t\t\t\tbreak;\n+\t\t\t\tcase ICE_PROFID_IPV4_GTPU_TEID:\n+\t\t\t\t\ttun_type = ICE_SW_TUN_IPV4_GTPU_NO_PAY;\n+\t\t\t\t\tbreak;\n+\t\t\t\tcase ICE_PROFID_IPV6_GTPU_TEID:\n+\t\t\t\t\ttun_type = ICE_SW_TUN_IPV6_GTPU_NO_PAY;\n+\t\t\t\t\tbreak;\n \t\t\t\tdefault:\n \t\t\t\t\tbreak;\n \t\t\t\t}\n@@ -5608,6 +5834,7 @@ static const struct ice_prot_ext_tbl_entry ice_prot_ext[ICE_PROTOCOL_LAST] = {\n \t{ ICE_ESP,\t\t{ 0, 2, 4, 6 } },\n \t{ ICE_AH,\t\t{ 0, 2, 4, 6, 8, 10 } },\n \t{ ICE_NAT_T,\t\t{ 8, 10, 12, 14 } },\n+\t{ ICE_GTP_NO_PAY,\t{ 8, 10, 12, 14 } },\n };\n \n /* The following table describes preferred grouping of recipes.\n@@ -5640,6 +5867,7 @@ static const struct ice_protocol_entry ice_prot_id_tbl[ICE_PROTOCOL_LAST] = {\n \t{ ICE_ESP,\t\tICE_ESP_HW },\n \t{ ICE_AH,\t\tICE_AH_HW },\n \t{ ICE_NAT_T,\t\tICE_UDP_ILOS_HW },\n+\t{ ICE_GTP_NO_PAY,\tICE_UDP_ILOS_HW },\n };\n \n /**\n@@ -6507,6 +6735,38 @@ 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_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_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_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_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_AND_NON_TUN:\n \tdefault:\n \t\tprof_type = ICE_PROF_ALL;\n@@ -6797,6 +7057,38 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t\t\ttcp = true;\n \t}\n \n+\tif (tun_type == ICE_SW_TUN_IPV4_GTPU_NO_PAY) {\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_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*offsets = dummy_ipv6_gtp_no_pay_packet_offsets;\n+\t\treturn;\n+\t} else if (tun_type == ICE_SW_TUN_IPV4_GTPU_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} else if (tun_type == ICE_SW_TUN_IPV4_GTPU_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} else if (tun_type == ICE_SW_TUN_IPV6_GTPU_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} else if (tun_type == ICE_SW_TUN_IPV6_GTPU_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_IPV4_ESP) {\n \t\t*pkt = dummy_ipv4_esp_pkt;\n \t\t*pkt_len = sizeof(dummy_ipv4_esp_pkt);\n@@ -7111,6 +7403,7 @@ ice_fill_adv_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t\t\tbreak;\n \n \t\tcase ICE_GTP:\n+\t\tcase ICE_GTP_NO_PAY:\n \t\t\tlen = sizeof(struct ice_udp_gtp_hdr);\n \t\t\tbreak;\n \t\tcase ICE_PPPOE:\ndiff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h\nindex aa446774c..a7e94344c 100644\n--- a/drivers/net/ice/base/ice_switch.h\n+++ b/drivers/net/ice/base/ice_switch.h\n@@ -28,8 +28,32 @@\n #define ICE_PROFID_PPPOE_IPV6_UDP\t39\n #define ICE_PROFID_PPPOE_IPV6_OTHER\t40\n #define ICE_PROFID_IPV4_GTPC_TEID\t41\n+#define ICE_PROFID_IPV4_GTPU_TEID\t\t43\n+#define ICE_PROFID_IPV6_GTPU_TEID\t\t46\n #define ICE_PROFID_IPV4_GTPU_EH_IPV4_OTHER\t47\n-#define ICE_PROFID_IPV6_GTPU_IPV6_OTHER\t70\n+#define ICE_PROFID_IPV4_GTPU_IPV4_OTHER\t\t48\n+#define ICE_PROFID_IPV4_GTPU_EH_IPV4_UDP\t49\n+#define ICE_PROFID_IPV4_GTPU_IPV4_UDP\t\t50\n+#define ICE_PROFID_IPV4_GTPU_EH_IPV4_TCP\t51\n+#define ICE_PROFID_IPV4_GTPU_IPV4_TCP\t\t52\n+#define ICE_PROFID_IPV6_GTPU_EH_IPV4_OTHER\t53\n+#define ICE_PROFID_IPV6_GTPU_IPV4_OTHER\t\t54\n+#define ICE_PROFID_IPV6_GTPU_EH_IPV4_UDP\t55\n+#define ICE_PROFID_IPV6_GTPU_IPV4_UDP\t\t56\n+#define ICE_PROFID_IPV6_GTPU_EH_IPV4_TCP\t57\n+#define ICE_PROFID_IPV6_GTPU_IPV4_TCP\t\t58\n+#define ICE_PROFID_IPV4_GTPU_EH_IPV6_OTHER\t59\n+#define ICE_PROFID_IPV4_GTPU_IPV6_OTHER\t\t60\n+#define ICE_PROFID_IPV4_GTPU_EH_IPV6_UDP\t61\n+#define ICE_PROFID_IPV4_GTPU_IPV6_UDP\t\t62\n+#define ICE_PROFID_IPV4_GTPU_EH_IPV6_TCP\t63\n+#define ICE_PROFID_IPV4_GTPU_IPV6_TCP\t\t64\n+#define ICE_PROFID_IPV6_GTPU_EH_IPV6_OTHER\t65\n+#define ICE_PROFID_IPV6_GTPU_IPV6_OTHER\t\t66\n+#define ICE_PROFID_IPV6_GTPU_EH_IPV6_UDP\t67\n+#define ICE_PROFID_IPV6_GTPU_IPV6_UDP\t\t68\n+#define ICE_PROFID_IPV6_GTPU_EH_IPV6_TCP\t69\n+#define ICE_PROFID_IPV6_GTPU_IPV6_TCP\t\t70\n #define ICE_PROFID_IPV4_ESP\t\t71\n #define ICE_PROFID_IPV6_ESP\t\t72\n #define ICE_PROFID_IPV4_AH\t\t73\n", "prefixes": [ "v2", "16/40" ] }