Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/96593/?format=api
{ "id": 96593, "url": "http://patchwork.dpdk.org/api/patches/96593/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20210803083817.1243796-15-wenjun1.wu@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": "<20210803083817.1243796-15-wenjun1.wu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210803083817.1243796-15-wenjun1.wu@intel.com", "date": "2021-08-03T08:38:09", "name": "[14/22] net/ice/base: add inner VLAN protocol type for QinQ filter", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "2a5236dd50575dad9efd97bb8ba550a1477af2cd", "submitter": { "id": 2083, "url": "http://patchwork.dpdk.org/api/people/2083/?format=api", "name": "Wenjun Wu", "email": "wenjun1.wu@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/20210803083817.1243796-15-wenjun1.wu@intel.com/mbox/", "series": [ { "id": 18158, "url": "http://patchwork.dpdk.org/api/series/18158/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=18158", "date": "2021-08-03T08:37:55", "name": "backport feature support to DPDK 20.11", "version": 1, "mbox": "http://patchwork.dpdk.org/series/18158/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/96593/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/96593/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 ED001A0C41;\n\tTue, 3 Aug 2021 10:58:39 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2B7B94120E;\n\tTue, 3 Aug 2021 10:57:30 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n by mails.dpdk.org (Postfix) with ESMTP id 0C000411C3\n for <dev@dpdk.org>; Tue, 3 Aug 2021 10:57:15 +0200 (CEST)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 03 Aug 2021 01:57:06 -0700", "from wuwenjun.sh.intel.com ([10.67.110.197])\n by fmsmga008.fm.intel.com with ESMTP; 03 Aug 2021 01:57:05 -0700" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10064\"; a=\"211764408\"", "E=Sophos;i=\"5.84,291,1620716400\"; d=\"scan'208\";a=\"211764408\"", "E=Sophos;i=\"5.84,291,1620716400\"; d=\"scan'208\";a=\"479396656\"" ], "X-ExtLoop1": "1", "From": "Wenjun Wu <wenjun1.wu@intel.com>", "To": "dev@dpdk.org", "Date": "Tue, 3 Aug 2021 16:38:09 +0800", "Message-Id": "<20210803083817.1243796-15-wenjun1.wu@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210803083817.1243796-1-wenjun1.wu@intel.com>", "References": "<20210803083817.1243796-1-wenjun1.wu@intel.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 14/22] net/ice/base: add inner VLAN protocol type\n for QinQ 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": "From: Qi Zhang <qi.z.zhang@intel.com>\n\n[ upstream commit 0475c7770502cb4166b2577df3ff446af9d85515 ]\n\nSince VLAN protocol type 'ICE_VLAN_OFOS' has been changed to map\nthe hardware VLAN protocol ID to 'ICE_VLAN_OF_HW (16)' when in Double\nVLAN mode, and to 'ICE_VLAN_OL_HW (17)' when in Single VLAN mode.\n\nSo 'ICE_VLAN_OFOS' can't be used with 'ICE_VLAN_EX' which is outer VLAN\nhardware protocol ID 'ICE_VLAN_OF_HW (16)' to do the QinQ VLAN pattern.\n\nIntroduce the new inner VLAN protocol type 'ICE_VLAN_IN', which is inner\nVLAN hardware protocol ID 'ICE_VLAN_OL_HW (17)'.\n\nNow for QinQ VLAN pattern, the protocol 'ICE_VLAN_EX' and 'ICE_VLAN_IN'\nshould be used to set the related protocol header fields like VLAN ID.\n\nSigned-off-by: Haiyue Wang <haiyue.wang@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 | 1 +\n drivers/net/ice/base/ice_switch.c | 23 +++++++++++++----------\n 2 files changed, 14 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ice/base/ice_protocol_type.h b/drivers/net/ice/base/ice_protocol_type.h\nindex e8caefd8f9..5dc795868e 100644\n--- a/drivers/net/ice/base/ice_protocol_type.h\n+++ b/drivers/net/ice/base/ice_protocol_type.h\n@@ -53,6 +53,7 @@ enum ice_protocol_type {\n \tICE_NAT_T,\n \tICE_GTP_NO_PAY,\n \tICE_VLAN_EX,\n+\tICE_VLAN_IN,\n \tICE_PROTOCOL_LAST\n };\n \ndiff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c\nindex 887b35ac47..9d8dc88844 100644\n--- a/drivers/net/ice/base/ice_switch.c\n+++ b/drivers/net/ice/base/ice_switch.c\n@@ -1207,7 +1207,7 @@ static const struct ice_dummy_pkt_offsets dummy_qinq_ipv4_packet_offsets[] = {\n \t{ ICE_MAC_OFOS,\t\t0 },\n \t{ ICE_ETYPE_OL, 12 },\n \t{ ICE_VLAN_EX,\t\t14 },\n-\t{ ICE_VLAN_OFOS,\t18 },\n+\t{ ICE_VLAN_IN,\t\t18 },\n \t{ ICE_IPV4_OFOS,\t22 },\n \t{ ICE_PROTOCOL_LAST,\t0 },\n };\n@@ -1220,7 +1220,7 @@ static const u8 dummy_qinq_ipv4_pkt[] = {\n \t0x91, 0x00,\t\t/* ICE_ETYPE_OL 12 */\n \n \t0x00, 0x00, 0x81, 0x00, /* ICE_VLAN_EX 14 */\n-\t0x00, 0x00, 0x08, 0x00, /* ICE_VLAN_OFOS 18 */\n+\t0x00, 0x00, 0x08, 0x00, /* ICE_VLAN_IN 18 */\n \n \t0x45, 0x00, 0x00, 0x1c, /* ICE_IPV4_OFOS 22 */\n \t0x00, 0x01, 0x00, 0x00,\n@@ -1238,7 +1238,7 @@ static const struct ice_dummy_pkt_offsets dummy_qinq_ipv6_packet_offsets[] = {\n \t{ ICE_MAC_OFOS,\t\t0 },\n \t{ ICE_ETYPE_OL, 12 },\n \t{ ICE_VLAN_EX,\t\t14 },\n-\t{ ICE_VLAN_OFOS,\t18 },\n+\t{ ICE_VLAN_IN,\t\t18 },\n \t{ ICE_IPV6_OFOS,\t22 },\n \t{ ICE_PROTOCOL_LAST,\t0 },\n };\n@@ -1251,7 +1251,7 @@ static const u8 dummy_qinq_ipv6_pkt[] = {\n \t0x91, 0x00,\t\t/* ICE_ETYPE_OL 12 */\n \n \t0x00, 0x00, 0x81, 0x00, /* ICE_VLAN_EX 14 */\n-\t0x00, 0x00, 0x86, 0xDD, /* ICE_VLAN_OFOS 18 */\n+\t0x00, 0x00, 0x86, 0xDD, /* ICE_VLAN_IN 18 */\n \n \t0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_OFOS 22 */\n \t0x00, 0x10, 0x11, 0x00, /* Next header UDP */\n@@ -1277,7 +1277,7 @@ static const struct ice_dummy_pkt_offsets dummy_qinq_pppoe_packet_offsets[] = {\n \t{ ICE_MAC_OFOS,\t\t0 },\n \t{ ICE_ETYPE_OL, 12 },\n \t{ ICE_VLAN_EX,\t\t14 },\n-\t{ ICE_VLAN_OFOS,\t18 },\n+\t{ ICE_VLAN_IN,\t\t18 },\n \t{ ICE_PPPOE,\t\t22 },\n \t{ ICE_PROTOCOL_LAST,\t0 },\n };\n@@ -1287,7 +1287,7 @@ struct ice_dummy_pkt_offsets dummy_qinq_pppoe_ipv4_packet_offsets[] = {\n \t{ ICE_MAC_OFOS,\t\t0 },\n \t{ ICE_ETYPE_OL, 12 },\n \t{ ICE_VLAN_EX,\t\t14 },\n-\t{ ICE_VLAN_OFOS,\t18 },\n+\t{ ICE_VLAN_IN,\t\t18 },\n \t{ ICE_PPPOE,\t\t22 },\n \t{ ICE_IPV4_OFOS,\t30 },\n \t{ ICE_PROTOCOL_LAST,\t0 },\n@@ -1301,14 +1301,14 @@ static const u8 dummy_qinq_pppoe_ipv4_pkt[] = {\n \t0x91, 0x00,\t\t/* ICE_ETYPE_OL 12 */\n \n \t0x00, 0x00, 0x81, 0x00, /* ICE_VLAN_EX 14 */\n-\t0x00, 0x00, 0x88, 0x64, /* ICE_VLAN_OFOS 18 */\n+\t0x00, 0x00, 0x88, 0x64, /* ICE_VLAN_IN 18 */\n \n \t0x11, 0x00, 0x00, 0x00, /* ICE_PPPOE 22 */\n \t0x00, 0x16,\n \n \t0x00, 0x21,\t\t/* PPP Link Layer 28 */\n \n-\t0x45, 0x00, 0x00, 0x14, /* ICE_IPV4_IL 30 */\n+\t0x45, 0x00, 0x00, 0x14, /* ICE_IPV4_OFOS 30 */\n \t0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00,\n \t0x00, 0x00, 0x00, 0x00,\n@@ -1322,7 +1322,7 @@ struct ice_dummy_pkt_offsets dummy_qinq_pppoe_packet_ipv6_offsets[] = {\n \t{ ICE_MAC_OFOS,\t\t0 },\n \t{ ICE_ETYPE_OL,\t\t12 },\n \t{ ICE_VLAN_EX,\t\t14},\n-\t{ ICE_VLAN_OFOS,\t18 },\n+\t{ ICE_VLAN_IN,\t\t18 },\n \t{ ICE_PPPOE,\t\t22 },\n \t{ ICE_IPV6_OFOS,\t30 },\n \t{ ICE_PROTOCOL_LAST,\t0 },\n@@ -1336,7 +1336,7 @@ static const u8 dummy_qinq_pppoe_ipv6_packet[] = {\n \t0x91, 0x00,\t\t/* ICE_ETYPE_OL 12 */\n \n \t0x00, 0x00, 0x81, 0x00, /* ICE_VLAN_EX 14 */\n-\t0x00, 0x00, 0x88, 0x64, /* ICE_VLAN_OFOS 18 */\n+\t0x00, 0x00, 0x88, 0x64, /* ICE_VLAN_IN 18 */\n \n \t0x11, 0x00, 0x00, 0x00, /* ICE_PPPOE 22 */\n \t0x00, 0x2a,\n@@ -6126,6 +6126,7 @@ static const struct ice_prot_ext_tbl_entry ice_prot_ext[ICE_PROTOCOL_LAST] = {\n \t{ ICE_NAT_T,\t\t{ 8, 10, 12, 14 } },\n \t{ ICE_GTP_NO_PAY,\t{ 8, 10, 12, 14 } },\n \t{ ICE_VLAN_EX,\t\t{ 0, 2 } },\n+\t{ ICE_VLAN_IN,\t\t{ 0, 2 } },\n };\n \n /* The following table describes preferred grouping of recipes.\n@@ -6160,6 +6161,7 @@ static struct ice_protocol_entry ice_prot_id_tbl[ICE_PROTOCOL_LAST] = {\n \t{ ICE_NAT_T,\t\tICE_UDP_ILOS_HW },\n \t{ ICE_GTP_NO_PAY,\tICE_UDP_ILOS_HW },\n \t{ ICE_VLAN_EX,\t\tICE_VLAN_OF_HW },\n+\t{ ICE_VLAN_IN,\t\tICE_VLAN_OL_HW },\n };\n \n /**\n@@ -7728,6 +7730,7 @@ ice_fill_adv_dummy_packet(struct ice_adv_lkup_elem *lkups, u16 lkups_cnt,\n \t\t\tbreak;\n \t\tcase ICE_VLAN_OFOS:\n \t\tcase ICE_VLAN_EX:\n+\t\tcase ICE_VLAN_IN:\n \t\t\tlen = sizeof(struct ice_vlan_hdr);\n \t\t\tbreak;\n \t\tcase ICE_IPV4_OFOS:\n", "prefixes": [ "14/22" ] }