Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/109363/?format=api
{ "id": 109363, "url": "http://patches.dpdk.org/api/patches/109363/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220407105706.18889-12-kevinx.liu@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": "<20220407105706.18889-12-kevinx.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220407105706.18889-12-kevinx.liu@intel.com", "date": "2022-04-07T10:56:38", "name": "[11/39] net/ice/base: add VXLAN support for switch filter", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "92aeac6621db995da52488a6bf535d37ffde43ed", "submitter": { "id": 2440, "url": "http://patches.dpdk.org/api/people/2440/?format=api", "name": "Kevin Liu", "email": "kevinx.liu@intel.com" }, "delegate": { "id": 1540, "url": "http://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220407105706.18889-12-kevinx.liu@intel.com/mbox/", "series": [ { "id": 22387, "url": "http://patches.dpdk.org/api/series/22387/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=22387", "date": "2022-04-07T10:56:27", "name": "support full function of DCF", "version": 1, "mbox": "http://patches.dpdk.org/series/22387/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/109363/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/109363/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 62550A0508;\n\tThu, 7 Apr 2022 04:59:13 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 533214285E;\n\tThu, 7 Apr 2022 04:58:48 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by mails.dpdk.org (Postfix) with ESMTP id A887E410DD\n for <dev@dpdk.org>; Thu, 7 Apr 2022 04:58:46 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 06 Apr 2022 19:58:46 -0700", "from intel-cd-odc-kevin.cd.intel.com ([10.240.178.195])\n by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 06 Apr 2022 19:58:43 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1649300326; x=1680836326;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=Ej+hNt6aRetaFtO6hTS6hPkvkACq5l0iXPnR186tnes=;\n b=ZiZ4kQYPLPBVsugu6DbLuzRwda57PF981crE3tU3xN1G9ss6snXjZNp0\n wBQhLvxjji18KmzZNfhhn452hm0Ypnxlz65dBotJ7B0/idhn7aPna3WCS\n 6GjVpwWyXktFzRsTfSmcqdu2kHe0IdIc8wexawBAkgrNCmPLFixKRi2Ui\n 8ekbKFDUQJJ2tjhPv9C8huqoxgMclJDo7WD0+xS3s4zRhchkPKbiVfO8h\n WcbiJX6Y4RD/b6hbEwhnC4FmrNtaELgUpNAwUslmEgzdrXGM24cOyQNqD\n LVpiI5kb6VB/e4QFL37TKCL/zV/N7LW70E6oTlU7sxGR2jBYMPPJ9xyzp Q==;", "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10309\"; a=\"248738353\"", "E=Sophos;i=\"5.90,241,1643702400\"; d=\"scan'208\";a=\"248738353\"", "E=Sophos;i=\"5.90,241,1643702400\"; d=\"scan'208\";a=\"570850559\"" ], "From": "Kevin Liu <kevinx.liu@intel.com>", "To": "dev@dpdk.org", "Cc": "qiming.yang@intel.com, qi.z.zhang@intel.com, stevex.yang@intel.com,\n Junfeng Guo <junfeng.guo@intel.com>, Kevin Liu <kevinx.liu@intel.com>", "Subject": "[PATCH 11/39] net/ice/base: add VXLAN support for switch filter", "Date": "Thu, 7 Apr 2022 10:56:38 +0000", "Message-Id": "<20220407105706.18889-12-kevinx.liu@intel.com>", "X-Mailer": "git-send-email 2.33.1", "In-Reply-To": "<20220407105706.18889-1-kevinx.liu@intel.com>", "References": "<20220407105706.18889-1-kevinx.liu@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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" }, "content": "From: Junfeng Guo <junfeng.guo@intel.com>\n\n1. Add profile rule for VXLAN on Switch Filter, including\n\tpattern_eth_ipv4_udp_vxlan_any\n\tpattern_eth_ipv6_udp_vxlan_any\n\tpattern_eth_ipv4_udp_vxlan_eth_ipv4\n\tpattern_eth_ipv4_udp_vxlan_eth_ipv6\n\tpattern_eth_ipv6_udp_vxlan_eth_ipv4\n\tpattern_eth_ipv6_udp_vxlan_eth_ipv6\n\n2. Add common rule for VXLAN on Switch Filter, including\n\n+-----------------+-----------------------------------------------------+\n| Pattern | Input Set |\n+-----------------+-----------------------------------------------------+\n| ipv4_vxlan_ipv4 | vni, inner dmac, inner dst/src ip, outer dst/src ip |\n| ipv4_vxlan_ipv6 | vni, inner dmac, inner dst/src ip |\n| ipv6_vxlan_ipv4 | vni, inner dmac, inner dst/src ip |\n| ipv6_vxlan_ipv6 | vni, inner dmac, inner dst/src ip |\n+-----------------+-----------------------------------------------------+\n\nSigned-off-by: Junfeng Guo <junfeng.guo@intel.com>\nSigned-off-by: Kevin Liu <kevinx.liu@intel.com>\n---\n drivers/net/ice/base/ice_protocol_type.h | 6 +\n drivers/net/ice/base/ice_switch.c | 213 ++++++++++++++++++++++-\n drivers/net/ice/base/ice_switch.h | 12 ++\n 3 files changed, 230 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h\nindex 0e6e5990be..d6332c5690 100644\n--- a/drivers/net/ice/base/ice_protocol_type.h\n+++ b/drivers/net/ice/base/ice_protocol_type.h\n@@ -112,6 +112,12 @@ enum ice_sw_tunnel_type {\n \tICE_SW_TUN_IPV6_NAT_T,\n \tICE_SW_TUN_IPV4_L2TPV3,\n \tICE_SW_TUN_IPV6_L2TPV3,\n+\tICE_SW_TUN_PROFID_IPV4_VXLAN,\n+\tICE_SW_TUN_PROFID_IPV4_VXLAN_IPV4,\n+\tICE_SW_TUN_PROFID_IPV4_VXLAN_IPV6,\n+\tICE_SW_TUN_PROFID_IPV6_VXLAN,\n+\tICE_SW_TUN_PROFID_IPV6_VXLAN_IPV4,\n+\tICE_SW_TUN_PROFID_IPV6_VXLAN_IPV6,\n \tICE_SW_TUN_PROFID_IPV6_ESP,\n \tICE_SW_TUN_PROFID_IPV6_AH,\n \tICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3,\ndiff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c\nindex d4cc664ad7..b0c50c8f40 100644\n--- a/drivers/net/ice/base/ice_switch.c\n+++ b/drivers/net/ice/base/ice_switch.c\n@@ -228,6 +228,117 @@ static const u8 dummy_udp_tun_udp_packet[] = {\n \t0x00, 0x08, 0x00, 0x00,\n };\n \n+static const\n+struct ice_dummy_pkt_offsets dummy_udp_tun_ipv6_tcp_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_ETYPE_OL, 12 },\n+\t{ ICE_IPV4_OFOS, 14 },\n+\t{ ICE_UDP_OF, 34 },\n+\t{ ICE_VXLAN, 42 },\n+\t{ ICE_GENEVE, 42 },\n+\t{ ICE_VXLAN_GPE, 42 },\n+\t{ ICE_MAC_IL, 50 },\n+\t{ ICE_IPV6_IL, 64 },\n+\t{ ICE_TCP_IL, 104 },\n+\t{ ICE_PROTOCOL_LAST, 0 },\n+};\n+\n+static const u8 dummy_udp_tun_ipv6_tcp_packet[] = {\n+\t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x08, 0x00, /* ICE_ETYPE_OL 12 */\n+\n+\t0x45, 0x00, 0x00, 0x5a, /* ICE_IPV4_OFOS 14 */\n+\t0x00, 0x01, 0x00, 0x00,\n+\t0x40, 0x11, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x00, 0x00, 0x12, 0xb5, /* ICE_UDP_OF 34 */\n+\t0x00, 0x46, 0x00, 0x00,\n+\n+\t0x00, 0x00, 0x65, 0x58, /* ICE_VXLAN 42 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 50 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x86, 0xdd,\n+\n+\t0x60, 0x00, 0x00, 0x00, /* ICE_IPV4_IL 64 */\n+\t0x00, 0x00, 0x06, 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, 0x00, 0x00, /* ICE_TCP_IL 104 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x50, 0x02, 0x20, 0x00,\n+\t0x00, 0x00, 0x00, 0x00\n+};\n+\n+static const\n+struct ice_dummy_pkt_offsets dummy_udp_tun_ipv6_udp_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS, 0 },\n+\t{ ICE_ETYPE_OL, 12 },\n+\t{ ICE_IPV4_OFOS, 14 },\n+\t{ ICE_UDP_OF, 34 },\n+\t{ ICE_VXLAN, 42 },\n+\t{ ICE_GENEVE, 42 },\n+\t{ ICE_VXLAN_GPE, 42 },\n+\t{ ICE_MAC_IL, 50 },\n+\t{ ICE_IPV6_IL, 64 },\n+\t{ ICE_UDP_ILOS, 104 },\n+\t{ ICE_PROTOCOL_LAST, 0 },\n+};\n+\n+static const u8 dummy_udp_tun_ipv6_udp_packet[] = {\n+\t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x08, 0x00, /* ICE_ETYPE_OL 12 */\n+\n+\t0x45, 0x00, 0x00, 0x4e, /* ICE_IPV4_OFOS 14 */\n+\t0x00, 0x01, 0x00, 0x00,\n+\t0x00, 0x11, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x00, 0x00, 0x12, 0xb5, /* ICE_UDP_OF 34 */\n+\t0x00, 0x3a, 0x00, 0x00,\n+\n+\t0x00, 0x00, 0x65, 0x58, /* ICE_VXLAN 42 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 50 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x86, 0xdd,\n+\n+\t0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_IL 64 */\n+\t0x00, 0x58, 0x11, 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, 0x00, 0x00, /* ICE_UDP_ILOS 104 */\n+\t0x00, 0x08, 0x00, 0x00,\n+};\n+\n /* offset info for MAC + IPv4 + UDP dummy packet */\n static const struct ice_dummy_pkt_offsets dummy_udp_packet_offsets[] = {\n \t{ ICE_MAC_OFOS,\t\t0 },\n@@ -2001,6 +2112,10 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid, bool vlan)\n \tu8 gre_profile[12] = {13, 14, 15, 19, 20, 21, 28, 29, 30, 31, 32, 33};\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+\tbool ipv4_vxlan_ipv4_valid = false;\n+\tbool ipv4_vxlan_ipv6_valid = false;\n+\tbool ipv6_vxlan_ipv4_valid = false;\n+\tbool ipv6_vxlan_ipv6_valid = false;\n \tenum ice_sw_tunnel_type tun_type;\n \tu16 i, j, k, profile_num = 0;\n \tbool non_tun_valid = false;\n@@ -2022,8 +2137,17 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid, bool vlan)\n \t\t}\n \n \t\tfor (i = 0; i < 12; i++) {\n-\t\t\tif (vxlan_profile[i] == j)\n+\t\t\tif (vxlan_profile[i] == j) {\n \t\t\t\tvxlan_valid = true;\n+\t\t\t\tif (i < 3)\n+\t\t\t\t\tipv4_vxlan_ipv4_valid = true;\n+\t\t\t\telse if (i < 6)\n+\t\t\t\t\tipv6_vxlan_ipv4_valid = true;\n+\t\t\t\telse if (i < 9)\n+\t\t\t\t\tipv4_vxlan_ipv6_valid = true;\n+\t\t\t\telse if (i < 12)\n+\t\t\t\t\tipv6_vxlan_ipv6_valid = true;\n+\t\t\t}\n \t\t}\n \n \t\tfor (i = 0; i < 7; i++) {\n@@ -2083,6 +2207,20 @@ static enum ice_sw_tunnel_type ice_get_tun_type_for_recipe(u8 rid, bool vlan)\n \t\t\t\tbreak;\n \t\t\t}\n \t}\n+\tif (tun_type == ICE_SW_TUN_VXLAN) {\n+\t\tif (ipv4_vxlan_ipv4_valid && ipv4_vxlan_ipv6_valid)\n+\t\t\ttun_type = ICE_SW_TUN_PROFID_IPV4_VXLAN;\n+\t\telse if (ipv6_vxlan_ipv4_valid && ipv6_vxlan_ipv6_valid)\n+\t\t\ttun_type = ICE_SW_TUN_PROFID_IPV6_VXLAN;\n+\t\telse if (ipv4_vxlan_ipv4_valid)\n+\t\t\ttun_type = ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV4;\n+\t\telse if (ipv4_vxlan_ipv6_valid)\n+\t\t\ttun_type = ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV6;\n+\t\telse if (ipv6_vxlan_ipv4_valid)\n+\t\t\ttun_type = ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV4;\n+\t\telse if (ipv6_vxlan_ipv6_valid)\n+\t\t\ttun_type = ICE_SW_TUN_PROFID_IPV6_VXLAN_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@@ -7496,6 +7634,12 @@ static bool ice_tun_type_match_word(enum ice_sw_tunnel_type tun_type, u16 *mask)\n \tcase ICE_SW_TUN_VXLAN_GPE:\n \tcase ICE_SW_TUN_GENEVE:\n \tcase ICE_SW_TUN_VXLAN:\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN:\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV4:\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV6:\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN:\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV4:\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV6:\n \tcase ICE_SW_TUN_NVGRE:\n \tcase ICE_SW_TUN_UDP:\n \tcase ICE_ALL_TUNNELS:\n@@ -7613,6 +7757,42 @@ ice_get_compat_fv_bitmap(struct ice_hw *hw, struct ice_adv_rule_info *rinfo,\n \tcase ICE_SW_TUN_PPPOE_IPV6_UDP:\n \t\tice_set_bit(ICE_PROFID_PPPOE_IPV6_UDP, bm);\n \t\treturn;\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN:\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV4_TCP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV4_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV4_OTHER, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV6_TCP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV6_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV6_OTHER, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV4:\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV4_TCP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV4_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV4_OTHER, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV6:\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV6_TCP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV6_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV4_TUN_M_IPV6_OTHER, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN:\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV4_TCP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV4_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV4_OTHER, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV6_TCP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV6_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV6_OTHER, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV4:\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV4_TCP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV4_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV4_OTHER, bm);\n+\t\treturn;\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV6:\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV6_TCP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV6_UDP, bm);\n+\t\tice_set_bit(ICE_PROFID_IPV6_TUN_M_IPV6_OTHER, bm);\n+\t\treturn;\n \tcase ICE_SW_TUN_PROFID_IPV6_ESP:\n \tcase ICE_SW_TUN_IPV6_ESP:\n \t\tice_set_bit(ICE_PROFID_IPV6_ESP, bm);\n@@ -7780,6 +7960,12 @@ bool ice_is_prof_rule(enum ice_sw_tunnel_type type)\n {\n \tswitch (type) {\n \tcase ICE_SW_TUN_AND_NON_TUN:\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN:\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV4:\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV6:\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN:\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV4:\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV6:\n \tcase ICE_SW_TUN_PROFID_IPV6_ESP:\n \tcase ICE_SW_TUN_PROFID_IPV6_AH:\n \tcase ICE_SW_TUN_PROFID_MAC_IPV6_L2TPV3:\n@@ -8396,8 +8582,27 @@ 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_PROFID_IPV4_VXLAN_IPV6 ||\n+\t tun_type == ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV6) {\n+\t\tif (tcp) {\n+\t\t\t*pkt = dummy_udp_tun_ipv6_tcp_packet;\n+\t\t\t*pkt_len = sizeof(dummy_udp_tun_ipv6_tcp_packet);\n+\t\t\t*offsets = dummy_udp_tun_ipv6_tcp_packet_offsets;\n+\t\t\treturn;\n+\t\t}\n+\n+\t\t*pkt = dummy_udp_tun_ipv6_udp_packet;\n+\t\t*pkt_len = sizeof(dummy_udp_tun_ipv6_udp_packet);\n+\t\t*offsets = dummy_udp_tun_ipv6_udp_packet_offsets;\n+\t\treturn;\n+\t}\n+\n \tif (tun_type == ICE_SW_TUN_VXLAN || tun_type == ICE_SW_TUN_GENEVE ||\n \t tun_type == ICE_SW_TUN_VXLAN_GPE || tun_type == ICE_SW_TUN_UDP ||\n+\t tun_type == ICE_SW_TUN_PROFID_IPV4_VXLAN ||\n+\t tun_type == ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV4 ||\n+\t tun_type == ICE_SW_TUN_PROFID_IPV6_VXLAN ||\n+\t tun_type == ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV4 ||\n \t tun_type == ICE_SW_TUN_GENEVE_VLAN ||\n \t tun_type == ICE_SW_TUN_VXLAN_VLAN) {\n \t\tif (tcp) {\n@@ -8613,6 +8818,12 @@ ice_fill_adv_packet_tun(struct ice_hw *hw, enum ice_sw_tunnel_type tun_type,\n \tcase ICE_SW_TUN_AND_NON_TUN:\n \tcase ICE_SW_TUN_VXLAN_GPE:\n \tcase ICE_SW_TUN_VXLAN:\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN:\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV4:\n+\tcase ICE_SW_TUN_PROFID_IPV4_VXLAN_IPV6:\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN:\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV4:\n+\tcase ICE_SW_TUN_PROFID_IPV6_VXLAN_IPV6:\n \tcase ICE_SW_TUN_VXLAN_VLAN:\n \tcase ICE_SW_TUN_UDP:\n \t\tif (!ice_get_open_tunnel_port(hw, TNL_VXLAN, &open_port))\ndiff --git a/drivers/net/ice/base/ice_switch.h b/drivers/net/ice/base/ice_switch.h\nindex a2b3c80107..efb9399b77 100644\n--- a/drivers/net/ice/base/ice_switch.h\n+++ b/drivers/net/ice/base/ice_switch.h\n@@ -20,6 +20,18 @@\n #define ICE_PROFID_IPV4_UDP\t\t5\n #define ICE_PROFID_IPV6_TCP\t\t7\n #define ICE_PROFID_IPV6_UDP\t\t8\n+#define ICE_PROFID_IPV4_TUN_M_IPV4_TCP\t\t10\n+#define ICE_PROFID_IPV4_TUN_M_IPV4_UDP\t\t11\n+#define ICE_PROFID_IPV4_TUN_M_IPV4_OTHER\t12\n+#define ICE_PROFID_IPV6_TUN_M_IPV4_TCP\t\t16\n+#define ICE_PROFID_IPV6_TUN_M_IPV4_UDP\t\t17\n+#define ICE_PROFID_IPV6_TUN_M_IPV4_OTHER\t18\n+#define ICE_PROFID_IPV4_TUN_M_IPV6_TCP\t\t22\n+#define ICE_PROFID_IPV4_TUN_M_IPV6_UDP\t\t23\n+#define ICE_PROFID_IPV4_TUN_M_IPV6_OTHER\t24\n+#define ICE_PROFID_IPV6_TUN_M_IPV6_TCP\t\t25\n+#define ICE_PROFID_IPV6_TUN_M_IPV6_UDP\t\t26\n+#define ICE_PROFID_IPV6_TUN_M_IPV6_OTHER\t27\n #define ICE_PROFID_PPPOE_PAY\t\t34\n #define ICE_PROFID_PPPOE_IPV4_TCP\t35\n #define ICE_PROFID_PPPOE_IPV4_UDP\t36\n", "prefixes": [ "11/39" ] }