Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/72940/?format=api
{ "id": 72940, "url": "https://patches.dpdk.org/api/patches/72940/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200703061938.13045-2-wei.zhao1@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": "<20200703061938.13045-2-wei.zhao1@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200703061938.13045-2-wei.zhao1@intel.com", "date": "2020-07-03T06:19:34", "name": "[v6,1/5] net/ice: add support more PPPoE packeat type for switch", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "f1d58c221f2b4082bfa3dbc67261385613cd4c4f", "submitter": { "id": 495, "url": "https://patches.dpdk.org/api/people/495/?format=api", "name": "Zhao1, Wei", "email": "wei.zhao1@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/20200703061938.13045-2-wei.zhao1@intel.com/mbox/", "series": [ { "id": 10757, "url": "https://patches.dpdk.org/api/series/10757/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=10757", "date": "2020-07-03T06:19:33", "name": "enable more PPPoE packet type for switch", "version": 6, "mbox": "https://patches.dpdk.org/series/10757/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/72940/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/72940/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 58651A0519;\n\tFri, 3 Jul 2020 08:44:47 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 79E4F1D9A6;\n\tFri, 3 Jul 2020 08:44:45 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by dpdk.org (Postfix) with ESMTP id A2C2B1D8E9;\n Fri, 3 Jul 2020 08:44:43 +0200 (CEST)", "from orsmga001.jf.intel.com ([10.7.209.18])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 02 Jul 2020 23:44:41 -0700", "from unknown (HELO localhost.localdomain.bj.intel.com)\n ([172.16.182.123])\n by orsmga001.jf.intel.com with ESMTP; 02 Jul 2020 23:44:38 -0700" ], "IronPort-SDR": [ "\n TlVO3x6Whz+0oJHvpJW237fEp1dF0jj6cXmMpoLzjEmDId9T9JMoruRqPlytcOsmDXp+qvTwli\n QHRdpWGaeloQ==", "\n LFF6cLX8VB2mOUGWcQUBWKeXBS4+tSjzGq+qNzoSH/q5hw0PvpXxDVuTMNxQ3uZrt7/w7rx0Lv\n grWmpcYi98mQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9670\"; a=\"146190769\"", "E=Sophos;i=\"5.75,307,1589266800\"; d=\"scan'208\";a=\"146190769\"", "E=Sophos;i=\"5.75,307,1589266800\"; d=\"scan'208\";a=\"356689689\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "From": "Wei Zhao <wei.zhao1@intel.com>", "To": "dev@dpdk.org", "Cc": "stable@dpdk.org, qi.z.zhang@intel.com, nannan.lu@intel.com,\n Wei Zhao <wei.zhao1@intel.com>", "Date": "Fri, 3 Jul 2020 14:19:34 +0800", "Message-Id": "<20200703061938.13045-2-wei.zhao1@intel.com>", "X-Mailer": "git-send-email 2.19.1", "In-Reply-To": "<20200703061938.13045-1-wei.zhao1@intel.com>", "References": "<20200629051030.3541-1-wei.zhao1@intel.com>\n <20200703061938.13045-1-wei.zhao1@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v6 1/5] net/ice: add support more PPPoE packeat\n\ttype for switch", "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 more support for switch parser of pppoe packet,\nit enable parse tcp/udp L4 layer and ipv4/ipv6 L3 layer parser for\npppoe payload, so we can use L4 dst/src port and L3 ip address as\ninput set for switch filter pppoe related rule.\n\nSigned-off-by: Wei Zhao <wei.zhao1@intel.com>\n---\n doc/guides/rel_notes/release_20_08.rst | 1 +\n drivers/net/ice/ice_switch_filter.c | 115 +++++++++++++++++++++----\n 2 files changed, 101 insertions(+), 15 deletions(-)", "diff": "diff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst\nindex 5cbc4ce14..f4b858727 100644\n--- a/doc/guides/rel_notes/release_20_08.rst\n+++ b/doc/guides/rel_notes/release_20_08.rst\n@@ -90,6 +90,7 @@ New Features\n Updated the Intel ice driver with new features and improvements, including:\n \n * Added support for DCF datapath configuration.\n+ * Added support for more PPPoE packet type for switch filter.\n \n * **Added support for BPF_ABS/BPF_IND load instructions.**\n \ndiff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c\nindex cc0af23ad..12a015f87 100644\n--- a/drivers/net/ice/ice_switch_filter.c\n+++ b/drivers/net/ice/ice_switch_filter.c\n@@ -27,6 +27,8 @@\n \n \n #define MAX_QGRP_NUM_TYPE 7\n+#define ICE_PPP_IPV4_PROTO\t0x0021\n+#define ICE_PPP_IPV6_PROTO\t0x0057\n \n #define ICE_SW_INSET_ETHER ( \\\n \tICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)\n@@ -96,6 +98,18 @@\n \tICE_INSET_VLAN_OUTER | ICE_INSET_VLAN_INNER | \\\n \tICE_INSET_DMAC | ICE_INSET_ETHERTYPE | ICE_INSET_PPPOE_SESSION | \\\n \tICE_INSET_PPPOE_PROTO)\n+#define ICE_SW_INSET_MAC_PPPOE_IPV4 ( \\\n+\tICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV4)\n+#define ICE_SW_INSET_MAC_PPPOE_IPV4_TCP ( \\\n+\tICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV4_TCP)\n+#define ICE_SW_INSET_MAC_PPPOE_IPV4_UDP ( \\\n+\tICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV4_UDP)\n+#define ICE_SW_INSET_MAC_PPPOE_IPV6 ( \\\n+\tICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV6)\n+#define ICE_SW_INSET_MAC_PPPOE_IPV6_TCP ( \\\n+\tICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV6_TCP)\n+#define ICE_SW_INSET_MAC_PPPOE_IPV6_UDP ( \\\n+\tICE_SW_INSET_MAC_PPPOE | ICE_SW_INSET_MAC_IPV6_UDP)\n #define ICE_SW_INSET_MAC_IPV4_ESP ( \\\n \tICE_SW_INSET_MAC_IPV4 | ICE_INSET_ESP_SPI)\n #define ICE_SW_INSET_MAC_IPV6_ESP ( \\\n@@ -155,10 +169,6 @@ ice_pattern_match_item ice_switch_pattern_dist_comms[] = {\n \t\t\tICE_SW_INSET_DIST_NVGRE_IPV4_UDP, ICE_INSET_NONE},\n \t{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,\n \t\t\tICE_SW_INSET_DIST_NVGRE_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_pppoed,\n-\t\t\tICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoed,\n-\t\t\tICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},\n \t{pattern_eth_pppoes,\n \t\t\tICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},\n \t{pattern_eth_vlan_pppoes,\n@@ -167,6 +177,30 @@ ice_pattern_match_item ice_switch_pattern_dist_comms[] = {\n \t\t\tICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},\n \t{pattern_eth_vlan_pppoes_proto,\n \t\t\tICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4_tcp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4_udp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6_tcp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6_udp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4_tcp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4_udp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6_tcp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6_udp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},\n \t{pattern_eth_ipv4_esp,\n \t\t\tICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},\n \t{pattern_eth_ipv4_udp_esp,\n@@ -255,10 +289,6 @@ ice_pattern_match_item ice_switch_pattern_perm[] = {\n \t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_UDP, ICE_INSET_NONE},\n \t{pattern_eth_ipv4_nvgre_eth_ipv4_tcp,\n \t\t\tICE_SW_INSET_PERM_TUNNEL_IPV4_TCP, ICE_INSET_NONE},\n-\t{pattern_eth_pppoed,\n-\t\t\tICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},\n-\t{pattern_eth_vlan_pppoed,\n-\t\t\tICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},\n \t{pattern_eth_pppoes,\n \t\t\tICE_SW_INSET_MAC_PPPOE, ICE_INSET_NONE},\n \t{pattern_eth_vlan_pppoes,\n@@ -267,6 +297,30 @@ ice_pattern_match_item ice_switch_pattern_perm[] = {\n \t\t\tICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},\n \t{pattern_eth_vlan_pppoes_proto,\n \t\t\tICE_SW_INSET_MAC_PPPOE_PROTO, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4_tcp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv4_udp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6_tcp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},\n+\t{pattern_eth_pppoes_ipv6_udp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4_tcp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_TCP, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv4_udp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV4_UDP, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6_tcp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_TCP, ICE_INSET_NONE},\n+\t{pattern_eth_vlan_pppoes_ipv6_udp,\n+\t\t\tICE_SW_INSET_MAC_PPPOE_IPV6_UDP, ICE_INSET_NONE},\n \t{pattern_eth_ipv4_esp,\n \t\t\tICE_SW_INSET_MAC_IPV4_ESP, ICE_INSET_NONE},\n \t{pattern_eth_ipv4_udp_esp,\n@@ -417,13 +471,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \tconst struct rte_flow_item_l2tpv3oip *l2tp_spec, *l2tp_mask;\n \tconst struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;\n \tuint64_t input_set = ICE_INSET_NONE;\n-\tuint16_t j, t = 0;\n+\tbool pppoe_elem_valid = 0;\n+\tbool pppoe_patt_valid = 0;\n+\tbool pppoe_prot_valid = 0;\n \tbool profile_rule = 0;\n \tbool tunnel_valid = 0;\n-\tbool pppoe_valid = 0;\n \tbool ipv6_valiad = 0;\n \tbool ipv4_valiad = 0;\n \tbool udp_valiad = 0;\n+\tbool tcp_valiad = 0;\n+\tuint16_t j, t = 0;\n \n \tfor (item = pattern; item->type !=\n \t\t\tRTE_FLOW_ITEM_TYPE_END; item++) {\n@@ -753,6 +810,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\tcase RTE_FLOW_ITEM_TYPE_TCP:\n \t\t\ttcp_spec = item->spec;\n \t\t\ttcp_mask = item->mask;\n+\t\t\ttcp_valiad = 1;\n \t\t\tif (tcp_spec && tcp_mask) {\n \t\t\t\t/* Check TCP mask and update input set */\n \t\t\t\tif (tcp_mask->hdr.sent_seq ||\n@@ -970,6 +1028,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\t\"Invalid pppoe item\");\n \t\t\t\treturn 0;\n \t\t\t}\n+\t\t\tpppoe_patt_valid = 1;\n \t\t\tif (pppoe_spec && pppoe_mask) {\n \t\t\t\t/* Check pppoe mask and update input set */\n \t\t\t\tif (pppoe_mask->length ||\n@@ -990,7 +1049,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\tinput_set |= ICE_INSET_PPPOE_SESSION;\n \t\t\t\t}\n \t\t\t\tt++;\n-\t\t\t\tpppoe_valid = 1;\n+\t\t\t\tpppoe_elem_valid = 1;\n \t\t\t}\n \t\t\tbreak;\n \n@@ -1011,7 +1070,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\treturn 0;\n \t\t\t}\n \t\t\tif (pppoe_proto_spec && pppoe_proto_mask) {\n-\t\t\t\tif (pppoe_valid)\n+\t\t\t\tif (pppoe_elem_valid)\n \t\t\t\t\tt--;\n \t\t\t\tlist[t].type = ICE_PPPOE;\n \t\t\t\tif (pppoe_proto_mask->proto_id) {\n@@ -1020,9 +1079,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\tlist[t].m_u.pppoe_hdr.ppp_prot_id =\n \t\t\t\t\t\tpppoe_proto_mask->proto_id;\n \t\t\t\t\tinput_set |= ICE_INSET_PPPOE_PROTO;\n+\n+\t\t\t\t\tpppoe_prot_valid = 1;\n \t\t\t\t}\n+\t\t\t\tif ((pppoe_proto_mask->proto_id &\n+\t\t\t\t\tpppoe_proto_spec->proto_id) !=\n+\t\t\t\t\t CPU_TO_BE16(ICE_PPP_IPV4_PROTO) &&\n+\t\t\t\t\t(pppoe_proto_mask->proto_id &\n+\t\t\t\t\tpppoe_proto_spec->proto_id) !=\n+\t\t\t\t\t CPU_TO_BE16(ICE_PPP_IPV6_PROTO))\n+\t\t\t\t\t*tun_type = ICE_SW_TUN_PPPOE_PAY;\n+\t\t\t\telse\n+\t\t\t\t\t*tun_type = ICE_SW_TUN_PPPOE;\n \t\t\t\tt++;\n \t\t\t}\n+\n \t\t\tbreak;\n \n \t\tcase RTE_FLOW_ITEM_TYPE_ESP:\n@@ -1233,6 +1304,23 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t}\n \t}\n \n+\tif (pppoe_patt_valid && !pppoe_prot_valid) {\n+\t\tif (ipv6_valiad && udp_valiad)\n+\t\t\t*tun_type = ICE_SW_TUN_PPPOE_IPV6_UDP;\n+\t\telse if (ipv6_valiad && tcp_valiad)\n+\t\t\t*tun_type = ICE_SW_TUN_PPPOE_IPV6_TCP;\n+\t\telse if (ipv4_valiad && udp_valiad)\n+\t\t\t*tun_type = ICE_SW_TUN_PPPOE_IPV4_UDP;\n+\t\telse if (ipv4_valiad && tcp_valiad)\n+\t\t\t*tun_type = ICE_SW_TUN_PPPOE_IPV4_TCP;\n+\t\telse if (ipv6_valiad)\n+\t\t\t*tun_type = ICE_SW_TUN_PPPOE_IPV6;\n+\t\telse if (ipv4_valiad)\n+\t\t\t*tun_type = ICE_SW_TUN_PPPOE_IPV4;\n+\t\telse\n+\t\t\t*tun_type = ICE_SW_TUN_PPPOE;\n+\t}\n+\n \t*lkups_num = t;\n \n \treturn input_set;\n@@ -1453,9 +1541,6 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,\n \t\t\ttun_type = ICE_SW_TUN_VXLAN;\n \t\tif (item->type == RTE_FLOW_ITEM_TYPE_NVGRE)\n \t\t\ttun_type = ICE_SW_TUN_NVGRE;\n-\t\tif (item->type == RTE_FLOW_ITEM_TYPE_PPPOED ||\n-\t\t\t\titem->type == RTE_FLOW_ITEM_TYPE_PPPOES)\n-\t\t\ttun_type = ICE_SW_TUN_PPPOE;\n \t\tif (item->type == RTE_FLOW_ITEM_TYPE_ETH) {\n \t\t\tconst struct rte_flow_item_eth *eth_mask;\n \t\t\tif (item->mask)\n", "prefixes": [ "v6", "1/5" ] }