Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/127001/?format=api
{ "id": 127001, "url": "http://patchwork.dpdk.org/api/patches/127001/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20230518151638.1207021-8-qiming.yang@intel.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20230518151638.1207021-8-qiming.yang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230518151638.1207021-8-qiming.yang@intel.com", "date": "2023-05-18T15:16:25", "name": "[v2,07/20] net/ice/base: add support for inner etype in switchdev", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "01c3788b4953a9cf1438440abb30624b12ef809a", "submitter": { "id": 522, "url": "http://patchwork.dpdk.org/api/people/522/?format=api", "name": "Qiming Yang", "email": "qiming.yang@intel.com" }, "delegate": { "id": 1540, "url": "http://patchwork.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20230518151638.1207021-8-qiming.yang@intel.com/mbox/", "series": [ { "id": 28063, "url": "http://patchwork.dpdk.org/api/series/28063/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=28063", "date": "2023-05-18T15:16:18", "name": "net/ice/base: code update", "version": 2, "mbox": "http://patchwork.dpdk.org/series/28063/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/127001/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/127001/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 9359342AF1;\n\tThu, 18 May 2023 17:35:19 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id AA4A342D4F;\n\tThu, 18 May 2023 17:34:32 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by mails.dpdk.org (Postfix) with ESMTP id 6FDA742D38\n for <dev@dpdk.org>; Thu, 18 May 2023 17:34:31 +0200 (CEST)", "from fmsmga007.fm.intel.com ([10.253.24.52])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 18 May 2023 08:34:30 -0700", "from dpdk-qiming3.sh.intel.com ([10.67.111.4])\n by fmsmga007.fm.intel.com with ESMTP; 18 May 2023 08:34:29 -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=1684424071; x=1715960071;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=tbiaUYc52V1qoFex36TpdQN/1uWHmtT+l7RrCHi+2I4=;\n b=LtUEgwPocvyicVa7RUKh4wlIBs8g7dFsnI4LY4JZGDP3CPDz6xqNy+l/\n V+BsFatwKyanVBOYcw8Nxz4xSP4kCfqAdID2wlztrXA8OilX6dVc7IQ8V\n mR+1LCH+aJ+KtPUevHjdWX1Uhd9ozoRFw39e4QPTEoI0Jv+fv+zOnJnOC\n vRJSiZuJdYIe0WsTqqg8wjWlxYY+ic9l6S8PEcQAwY2tuczaLvGUiTvgG\n 8jC6eoDH0+FkJpfR/0BPvRgUN5jiUNXzW2GCm+lB8xgJzo5PO0CjiIc5L\n Ub/oVMtpQxnLCwvvbuHZI2Wxps1VtAVjZj5v7B9xFN2WbLt8zHyjMTGCz g==;", "X-IronPort-AV": [ "E=McAfee;i=\"6600,9927,10714\"; a=\"341527670\"", "E=Sophos;i=\"5.99,285,1677571200\"; d=\"scan'208\";a=\"341527670\"", "E=McAfee;i=\"6600,9927,10714\"; a=\"705235089\"", "E=Sophos;i=\"5.99,285,1677571200\"; d=\"scan'208\";a=\"705235089\"" ], "X-ExtLoop1": "1", "From": "Qiming Yang <qiming.yang@intel.com>", "To": "dev@dpdk.org", "Cc": "qi.z.zhang@intel.com, Qiming Yang <qiming.yang@intel.com>,\n Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@intel.com>", "Subject": "[PATCH v2 07/20] net/ice/base: add support for inner etype in\n switchdev", "Date": "Thu, 18 May 2023 15:16:25 +0000", "Message-Id": "<20230518151638.1207021-8-qiming.yang@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20230518151638.1207021-1-qiming.yang@intel.com>", "References": "<20230427062001.478032-1-qiming.yang@intel.com>\n <20230518151638.1207021-1-qiming.yang@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": "Enable support for adding TC rules that filter on the inner\nEtherType field of tunneled packet headers.\n\nSigned-off-by: Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@intel.com>\nSigned-off-by: Qiming Yang <qiming.yang@intel.com>\n---\n drivers/net/ice/base/ice_protocol_type.h | 2 +\n drivers/net/ice/base/ice_switch.c | 270 ++++++++++++++++++++++-\n 2 files changed, 268 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 eeaf044059..8c57cd2081 100644\n--- a/drivers/net/ice/base/ice_protocol_type.h\n+++ b/drivers/net/ice/base/ice_protocol_type.h\n@@ -31,6 +31,7 @@ enum ice_protocol_type {\n \tICE_MAC_OFOS = 0,\n \tICE_MAC_IL,\n \tICE_ETYPE_OL,\n+\tICE_ETYPE_IL,\n \tICE_VLAN_OFOS,\n \tICE_IPV4_OFOS,\n \tICE_IPV4_IL,\n@@ -197,6 +198,7 @@ enum ice_prot_id {\n #define ICE_MAC_OFOS_HW\t\t1\n #define ICE_MAC_IL_HW\t\t4\n #define ICE_ETYPE_OL_HW\t\t9\n+#define ICE_ETYPE_IL_HW\t\t10\n #define ICE_VLAN_OF_HW\t\t16\n #define ICE_VLAN_OL_HW\t\t17\n #define ICE_IPV4_OFOS_HW\t32\ndiff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c\nindex f201c287fc..a9f3ae5bf5 100644\n--- a/drivers/net/ice/base/ice_switch.c\n+++ b/drivers/net/ice/base/ice_switch.c\n@@ -49,6 +49,7 @@ static const struct ice_dummy_pkt_offsets dummy_gre_tcp_packet_offsets[] = {\n \t{ ICE_IPV4_OFOS,\t14 },\n \t{ ICE_NVGRE,\t\t34 },\n \t{ ICE_MAC_IL,\t\t42 },\n+\t{ ICE_ETYPE_IL,\t\t54 },\n \t{ ICE_IPV4_IL,\t\t56 },\n \t{ ICE_TCP_IL,\t\t76 },\n \t{ ICE_PROTOCOL_LAST,\t0 },\n@@ -73,7 +74,8 @@ static const u8 dummy_gre_tcp_packet[] = {\n \t0x00, 0x00, 0x00, 0x00,\t/* ICE_MAC_IL 42 */\n \t0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00,\n-\t0x08, 0x00,\n+\n+\t0x08, 0x00,\t\t/* ICE_ETYPE_IL 54 */\n \n \t0x45, 0x00, 0x00, 0x14,\t/* ICE_IPV4_IL 56 */\n \t0x00, 0x00, 0x00, 0x00,\n@@ -94,6 +96,7 @@ static const struct ice_dummy_pkt_offsets dummy_gre_udp_packet_offsets[] = {\n \t{ ICE_IPV4_OFOS,\t14 },\n \t{ ICE_NVGRE,\t\t34 },\n \t{ ICE_MAC_IL,\t\t42 },\n+\t{ ICE_ETYPE_IL,\t\t54 },\n \t{ ICE_IPV4_IL,\t\t56 },\n \t{ ICE_UDP_ILOS,\t\t76 },\n \t{ ICE_PROTOCOL_LAST,\t0 },\n@@ -118,7 +121,8 @@ static const u8 dummy_gre_udp_packet[] = {\n \t0x00, 0x00, 0x00, 0x00,\t/* ICE_MAC_IL 42 */\n \t0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00,\n-\t0x08, 0x00,\n+\n+\t0x08, 0x00,\t\t/* ICE_ETYPE_IL 54 */\n \n \t0x45, 0x00, 0x00, 0x14,\t/* ICE_IPV4_IL 56 */\n \t0x00, 0x00, 0x00, 0x00,\n@@ -139,6 +143,7 @@ static const struct ice_dummy_pkt_offsets dummy_udp_tun_tcp_packet_offsets[] = {\n \t{ ICE_GENEVE,\t\t42 },\n \t{ ICE_VXLAN_GPE,\t42 },\n \t{ ICE_MAC_IL,\t\t50 },\n+\t{ ICE_ETYPE_IL,\t\t62 },\n \t{ ICE_IPV4_IL,\t\t64 },\n \t{ ICE_TCP_IL,\t\t84 },\n \t{ ICE_PROTOCOL_LAST,\t0 },\n@@ -166,7 +171,8 @@ static const u8 dummy_udp_tun_tcp_packet[] = {\n \t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 50 */\n \t0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00,\n-\t0x08, 0x00,\n+\n+\t0x08, 0x00,\t\t/* ICE_ETYPE_IL 62*/\n \n \t0x45, 0x00, 0x00, 0x28, /* ICE_IPV4_IL 64 */\n \t0x00, 0x01, 0x00, 0x00,\n@@ -190,6 +196,7 @@ static const struct ice_dummy_pkt_offsets dummy_udp_tun_udp_packet_offsets[] = {\n \t{ ICE_GENEVE,\t\t42 },\n \t{ ICE_VXLAN_GPE,\t42 },\n \t{ ICE_MAC_IL,\t\t50 },\n+\t{ ICE_ETYPE_IL,\t\t62 },\n \t{ ICE_IPV4_IL,\t\t64 },\n \t{ ICE_UDP_ILOS,\t\t84 },\n \t{ ICE_PROTOCOL_LAST,\t0 },\n@@ -217,7 +224,8 @@ static const u8 dummy_udp_tun_udp_packet[] = {\n \t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 50 */\n \t0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00,\n-\t0x08, 0x00,\n+\n+\t0x08, 0x00,\t\t/* ICE_ETYPE_IL 62 */\n \n \t0x45, 0x00, 0x00, 0x1c, /* ICE_IPV4_IL 64 */\n \t0x00, 0x01, 0x00, 0x00,\n@@ -229,6 +237,224 @@ static const u8 dummy_udp_tun_udp_packet[] = {\n \t0x00, 0x08, 0x00, 0x00,\n };\n \n+static const struct ice_dummy_pkt_offsets\n+dummy_gre_ipv6_tcp_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_ETYPE_OL,\t\t12 },\n+\t{ ICE_IPV4_OFOS,\t14 },\n+\t{ ICE_NVGRE,\t\t34 },\n+\t{ ICE_MAC_IL,\t\t42 },\n+\t{ ICE_ETYPE_IL,\t\t54 },\n+\t{ ICE_IPV6_IL,\t\t56 },\n+\t{ ICE_TCP_IL,\t\t96 },\n+\t{ ICE_PROTOCOL_LAST,\t0 },\n+};\n+\n+static const u8 dummy_gre_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,\t\t/* ICE_ETYPE_OL 12 */\n+\n+\t0x45, 0x00, 0x00, 0x66, /* ICE_IPV4_OFOS 14 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x2F, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x80, 0x00, 0x65, 0x58, /* ICE_NVGRE 34 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 42 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x86, 0xdd,\t\t/* ICE_ETYPE_IL 54 */\n+\n+\t0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_IL 56 */\n+\t0x00, 0x08, 0x06, 0x40,\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 96 */\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 struct ice_dummy_pkt_offsets\n+dummy_gre_ipv6_udp_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_ETYPE_OL,\t\t12 },\n+\t{ ICE_IPV4_OFOS,\t14 },\n+\t{ ICE_NVGRE,\t\t34 },\n+\t{ ICE_MAC_IL,\t\t42 },\n+\t{ ICE_ETYPE_IL,\t\t54 },\n+\t{ ICE_IPV6_IL,\t\t56 },\n+\t{ ICE_UDP_ILOS,\t\t96 },\n+\t{ ICE_PROTOCOL_LAST,\t0 },\n+};\n+\n+static const u8 dummy_gre_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,\t\t/* ICE_ETYPE_OL 12 */\n+\n+\t0x45, 0x00, 0x00, 0x5a, /* ICE_IPV4_OFOS 14 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x2F, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x80, 0x00, 0x65, 0x58, /* ICE_NVGRE 34 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x00, 0x00, 0x00, 0x00, /* ICE_MAC_IL 42 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x86, 0xdd,\t\t/* ICE_ETYPE_IL 54 */\n+\n+\t0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_IL 56 */\n+\t0x00, 0x08, 0x11, 0x40,\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 96 */\n+\t0x00, 0x08, 0x00, 0x00,\n+};\n+\n+static const struct ice_dummy_pkt_offsets\n+dummy_udp_tun_ipv6_tcp_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_ETYPE_OL,\t\t12 },\n+\t{ ICE_IPV4_OFOS,\t14 },\n+\t{ ICE_UDP_OF,\t\t34 },\n+\t{ ICE_VXLAN,\t\t42 },\n+\t{ ICE_GENEVE,\t\t42 },\n+\t{ ICE_VXLAN_GPE,\t42 },\n+\t{ ICE_MAC_IL,\t\t50 },\n+\t{ ICE_ETYPE_IL,\t\t62 },\n+\t{ ICE_IPV6_IL,\t\t64 },\n+\t{ ICE_TCP_IL,\t\t104 },\n+\t{ ICE_PROTOCOL_LAST,\t0 },\n+};\n+\n+static const u8 dummy_udp_tun_ipv6_tcp_packet[] = {\n+\t0x00, 0x00, 0x00, 0x00,\t /* ICE_MAC_OFOS 0 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x08, 0x00,\t\t/* ICE_ETYPE_OL 12 */\n+\n+\t0x45, 0x00, 0x00, 0x6e, /* 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, 0x5a, 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+\n+\t0x86, 0xdd,\t\t/* ICE_ETYPE_IL 62 */\n+\n+\t0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_IL 64 */\n+\t0x00, 0x08, 0x06, 0x40,\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 struct ice_dummy_pkt_offsets\n+dummy_udp_tun_ipv6_udp_packet_offsets[] = {\n+\t{ ICE_MAC_OFOS,\t\t0 },\n+\t{ ICE_ETYPE_OL,\t\t12 },\n+\t{ ICE_IPV4_OFOS,\t14 },\n+\t{ ICE_UDP_OF,\t\t34 },\n+\t{ ICE_VXLAN,\t\t42 },\n+\t{ ICE_GENEVE,\t\t42 },\n+\t{ ICE_VXLAN_GPE,\t42 },\n+\t{ ICE_MAC_IL,\t\t50 },\n+\t{ ICE_ETYPE_IL,\t\t62 },\n+\t{ ICE_IPV6_IL,\t\t64 },\n+\t{ ICE_UDP_ILOS,\t\t104 },\n+\t{ ICE_PROTOCOL_LAST,\t0 },\n+};\n+\n+static const u8 dummy_udp_tun_ipv6_udp_packet[] = {\n+\t0x00, 0x00, 0x00, 0x00,\t /* ICE_MAC_OFOS 0 */\n+\t0x00, 0x00, 0x00, 0x00,\n+\t0x00, 0x00, 0x00, 0x00,\n+\n+\t0x08, 0x00,\t\t/* ICE_ETYPE_OL 12 */\n+\n+\t0x45, 0x00, 0x00, 0x62, /* 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, 0x4e, 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+\n+\t0x86, 0xdd,\t\t/* ICE_ETYPE_IL 62 */\n+\n+\t0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_IL 64 */\n+\t0x00, 0x08, 0x11, 0x40,\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@@ -8065,6 +8291,7 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t\t const struct ice_dummy_pkt_offsets **offsets)\n {\n \tbool tcp = false, udp = false, outer_ipv6 = false, vlan = false;\n+\tbool inner_ipv6 = false;\n \tbool cvlan = false;\n \tbool gre = false, mpls = false;\n \tu16 i;\n@@ -8088,6 +8315,12 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t\t\t lkups[i].m_u.ethertype.ethtype_id ==\n \t\t\t\tCPU_TO_BE16(0xFFFF))\n \t\t\touter_ipv6 = true;\n+\t\telse if (lkups[i].type == ICE_ETYPE_IL &&\n+\t\t\t lkups[i].h_u.ethertype.ethtype_id ==\n+\t\t\t\tCPU_TO_BE16(ICE_IPV6_ETHER_ID) &&\n+\t\t\t lkups[i].m_u.ethertype.ethtype_id ==\n+\t\t\t\tCPU_TO_BE16(0xFFFF))\n+\t\t\tinner_ipv6 = true;\n \t\telse if (lkups[i].type == ICE_IPV4_OFOS &&\n \t\t\t lkups[i].h_u.ipv4_hdr.protocol ==\n \t\t\t\tICE_IPV4_NVGRE_PROTO_ID &&\n@@ -8441,6 +8674,13 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t}\n \n \tif (tun_type == ICE_SW_TUN_NVGRE || gre) {\n+\t\tif (tcp && inner_ipv6) {\n+\t\t\t*pkt = dummy_gre_ipv6_tcp_packet;\n+\t\t\t*pkt_len = sizeof(dummy_gre_ipv6_tcp_packet);\n+\t\t\t*offsets = dummy_gre_ipv6_tcp_packet_offsets;\n+\t\t\treturn;\n+\t\t}\n+\n \t\tif (tcp) {\n \t\t\t*pkt = dummy_gre_tcp_packet;\n \t\t\t*pkt_len = sizeof(dummy_gre_tcp_packet);\n@@ -8448,6 +8688,13 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t\t\treturn;\n \t\t}\n \n+\t\tif (inner_ipv6) {\n+\t\t\t*pkt = dummy_gre_ipv6_udp_packet;\n+\t\t\t*pkt_len = sizeof(dummy_gre_ipv6_udp_packet);\n+\t\t\t*offsets = dummy_gre_ipv6_udp_packet_offsets;\n+\t\t\treturn;\n+\t\t}\n+\n \t\t*pkt = dummy_gre_udp_packet;\n \t\t*pkt_len = sizeof(dummy_gre_udp_packet);\n \t\t*offsets = dummy_gre_udp_packet_offsets;\n@@ -8458,6 +8705,13 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t tun_type == ICE_SW_TUN_VXLAN_GPE || tun_type == ICE_SW_TUN_UDP ||\n \t tun_type == ICE_SW_TUN_GENEVE_VLAN ||\n \t tun_type == ICE_SW_TUN_VXLAN_VLAN) {\n+\t\tif (tcp && inner_ipv6) {\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\tif (tcp) {\n \t\t\t*pkt = dummy_udp_tun_tcp_packet;\n \t\t\t*pkt_len = sizeof(dummy_udp_tun_tcp_packet);\n@@ -8465,6 +8719,13 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t\t\treturn;\n \t\t}\n \n+\t\tif (inner_ipv6) {\n+\t\t\t*pkt = dummy_udp_tun_ipv6_udp_packet;\n+\t\t\t*pkt_len = sizeof(dummy_udp_tun_ipv6_udp_packet);\n+\t\t\t*offsets = dummy_udp_tun_ipv6_udp_packet_offsets;\n+\t\t\treturn;\n+\t\t}\n+\n \t\t*pkt = dummy_udp_tun_udp_packet;\n \t\t*pkt_len = sizeof(dummy_udp_tun_udp_packet);\n \t\t*offsets = dummy_udp_tun_udp_packet_offsets;\n@@ -8574,6 +8835,7 @@ ice_fill_adv_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t\t\tlen = sizeof(struct ice_ether_hdr);\n \t\t\tbreak;\n \t\tcase ICE_ETYPE_OL:\n+\t\tcase ICE_ETYPE_IL:\n \t\t\tlen = sizeof(struct ice_ethtype_hdr);\n \t\t\tbreak;\n \t\tcase ICE_VLAN_OFOS:\n", "prefixes": [ "v2", "07/20" ] }