Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64660/?format=api
{ "id": 64660, "url": "http://patches.dpdk.org/api/patches/64660/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1579010128-15794-9-git-send-email-bernard.iremonger@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": "<1579010128-15794-9-git-send-email-bernard.iremonger@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1579010128-15794-9-git-send-email-bernard.iremonger@intel.com", "date": "2020-01-14T13:55:22", "name": "[v5,08/14] net/i40e: support ESP flows", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3fd25e6c27cec3fabedeb401baf138c96b9efe42", "submitter": { "id": 91, "url": "http://patches.dpdk.org/api/people/91/?format=api", "name": "Iremonger, Bernard", "email": "bernard.iremonger@intel.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1579010128-15794-9-git-send-email-bernard.iremonger@intel.com/mbox/", "series": [ { "id": 8053, "url": "http://patches.dpdk.org/api/series/8053/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8053", "date": "2020-01-10T15:20:16", "name": "net/i40e: ESP support", "version": 4, "mbox": "http://patches.dpdk.org/series/8053/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/64660/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/64660/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 801FDA04FF;\n\tTue, 14 Jan 2020 14:56:47 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 84D681C1E2;\n\tTue, 14 Jan 2020 14:55:55 +0100 (CET)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by dpdk.org (Postfix) with ESMTP id 7DC421C1D0\n for <dev@dpdk.org>; Tue, 14 Jan 2020 14:55:49 +0100 (CET)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n 14 Jan 2020 05:55:49 -0800", "from sivswdev08.ir.intel.com (HELO localhost.localdomain)\n ([10.237.217.47])\n by fmsmga005.fm.intel.com with ESMTP; 14 Jan 2020 05:55:47 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.69,432,1571727600\"; d=\"scan'208\";a=\"423160536\"", "From": "Bernard Iremonger <bernard.iremonger@intel.com>", "To": "dev@dpdk.org, beilei.xing@intel.com, qi.z.zhang@intel.com,\n declan.doherty@intel.com", "Cc": "konstantin.ananyev@intel.com, stephen1.byrne@intel.com,\n helin.zhang@intel.com, Bernard Iremonger <bernard.iremonger@intel.com>", "Date": "Tue, 14 Jan 2020 13:55:22 +0000", "Message-Id": "<1579010128-15794-9-git-send-email-bernard.iremonger@intel.com>", "X-Mailer": "git-send-email 1.7.0.7", "In-Reply-To": "<1578669630-23866-1-git-send-email-bernard.iremonger@intel.com>", "References": "<1578669630-23866-1-git-send-email-bernard.iremonger@intel.com>", "Subject": "[dpdk-dev] [PATCH v5 08/14] net/i40e: support ESP flows", "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": "add eth/ipv4/esp and eth/ipv6/esp patterns\nadd eth/ipv4/udp/esp and eth/ipv6/esp/udp patterns\nupdate i40e_flow_parse_fdir_filter()\nadd i40e_flow_set_filter_spi()\n\nSigned-off-by: Bernard Iremonger <bernard.iremonger@intel.com>\n---\n drivers/net/i40e/i40e_flow.c | 135 ++++++++++++++++++++++++++++++++++++++++++-\n 1 file changed, 132 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c\nindex 6102103..c585d8b 100644\n--- a/drivers/net/i40e/i40e_flow.c\n+++ b/drivers/net/i40e/i40e_flow.c\n@@ -110,8 +110,7 @@ static int i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf,\n static int i40e_flow_flush_fdir_filter(struct i40e_pf *pf);\n static int i40e_flow_flush_ethertype_filter(struct i40e_pf *pf);\n static int i40e_flow_flush_tunnel_filter(struct i40e_pf *pf);\n-static int\n-i40e_flow_flush_rss_filter(struct rte_eth_dev *dev);\n+static int i40e_flow_flush_rss_filter(struct rte_eth_dev *dev);\n static int\n i40e_flow_parse_qinq_filter(struct rte_eth_dev *dev,\n \t\t\t const struct rte_flow_attr *attr,\n@@ -1615,6 +1614,36 @@ static enum rte_flow_item_type pattern_qinq_1[] = {\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n+static enum rte_flow_item_type pattern_fdir_ipv4_esp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_ESP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+static enum rte_flow_item_type pattern_fdir_ipv6_esp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_ESP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+static enum rte_flow_item_type pattern_fdir_ipv4_udp_esp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_ESP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n+static enum rte_flow_item_type pattern_fdir_ipv6_udp_esp[] = {\n+\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_ESP,\n+\tRTE_FLOW_ITEM_TYPE_END,\n+};\n+\n static struct i40e_valid_pattern i40e_supported_patterns[] = {\n \t/* Ethertype */\n \t{ pattern_ethertype, i40e_flow_parse_ethertype_filter },\n@@ -1628,6 +1657,8 @@ static struct i40e_valid_pattern i40e_supported_patterns[] = {\n \t{ pattern_fdir_ipv4_gtpu, i40e_flow_parse_fdir_filter },\n \t{ pattern_fdir_ipv4_gtpu_ipv4, i40e_flow_parse_fdir_filter },\n \t{ pattern_fdir_ipv4_gtpu_ipv6, i40e_flow_parse_fdir_filter },\n+\t{ pattern_fdir_ipv4_esp, i40e_flow_parse_fdir_filter },\n+\t{ pattern_fdir_ipv4_udp_esp, i40e_flow_parse_fdir_filter },\n \t{ pattern_fdir_ipv6, i40e_flow_parse_fdir_filter },\n \t{ pattern_fdir_ipv6_udp, i40e_flow_parse_fdir_filter },\n \t{ pattern_fdir_ipv6_tcp, i40e_flow_parse_fdir_filter },\n@@ -1636,6 +1667,8 @@ static struct i40e_valid_pattern i40e_supported_patterns[] = {\n \t{ pattern_fdir_ipv6_gtpu, i40e_flow_parse_fdir_filter },\n \t{ pattern_fdir_ipv6_gtpu_ipv4, i40e_flow_parse_fdir_filter },\n \t{ pattern_fdir_ipv6_gtpu_ipv6, i40e_flow_parse_fdir_filter },\n+\t{ pattern_fdir_ipv6_esp, i40e_flow_parse_fdir_filter },\n+\t{ pattern_fdir_ipv6_udp_esp, i40e_flow_parse_fdir_filter },\n \t/* FDIR - support default flow type with flexible payload */\n \t{ pattern_fdir_ethertype_raw_1, i40e_flow_parse_fdir_filter },\n \t{ pattern_fdir_ethertype_raw_2, i40e_flow_parse_fdir_filter },\n@@ -2420,6 +2453,28 @@ i40e_flow_fdir_get_pctype_value(struct i40e_pf *pf,\n \t\t\tcus_pctype = i40e_find_customized_pctype(pf,\n \t\t\t\t\t\t I40E_CUSTOMIZED_GTPU_IPV6);\n \t\tbreak;\n+\tcase RTE_FLOW_ITEM_TYPE_ESP:\n+\t\tif (!filter->input.flow_ext.is_udp) {\n+\t\t\tif (filter->input.flow_ext.oip_type ==\n+\t\t\t\tI40E_FDIR_IPTYPE_IPV4)\n+\t\t\t\tcus_pctype = i40e_find_customized_pctype(pf,\n+\t\t\t\t\t\tI40E_CUSTOMIZED_ESP_IPV4);\n+\t\t\telse if (filter->input.flow_ext.oip_type ==\n+\t\t\t\tI40E_FDIR_IPTYPE_IPV6)\n+\t\t\t\tcus_pctype = i40e_find_customized_pctype(pf,\n+\t\t\t\t\t\tI40E_CUSTOMIZED_ESP_IPV6);\n+\t\t} else {\n+\t\t\tif (filter->input.flow_ext.oip_type ==\n+\t\t\t\tI40E_FDIR_IPTYPE_IPV4)\n+\t\t\t\tcus_pctype = i40e_find_customized_pctype(pf,\n+\t\t\t\t\t\tI40E_CUSTOMIZED_ESP_IPV4_UDP);\n+\t\t\telse if (filter->input.flow_ext.oip_type ==\n+\t\t\t\t\tI40E_FDIR_IPTYPE_IPV6)\n+\t\t\t\tcus_pctype = i40e_find_customized_pctype(pf,\n+\t\t\t\t\t\tI40E_CUSTOMIZED_ESP_IPV6_UDP);\n+\t\t\tfilter->input.flow_ext.is_udp = false;\n+\t\t}\n+\t\tbreak;\n \tdefault:\n \t\tPMD_DRV_LOG(ERR, \"Unsupported item type\");\n \t\tbreak;\n@@ -2431,6 +2486,30 @@ i40e_flow_fdir_get_pctype_value(struct i40e_pf *pf,\n \treturn I40E_FILTER_PCTYPE_INVALID;\n }\n \n+static void\n+i40e_flow_set_filter_spi(struct i40e_fdir_filter_conf *filter,\n+\tconst struct rte_flow_item_esp *esp_spec)\n+{\n+\tif (filter->input.flow_ext.oip_type ==\n+\t\tI40E_FDIR_IPTYPE_IPV4) {\n+\t\tif (filter->input.flow_ext.is_udp)\n+\t\t\tfilter->input.flow.esp_ipv4_udp_flow.spi =\n+\t\t\t\tesp_spec->hdr.spi;\n+\t\telse\n+\t\t\tfilter->input.flow.esp_ipv4_flow.spi =\n+\t\t\t\tesp_spec->hdr.spi;\n+\t}\n+\tif (filter->input.flow_ext.oip_type ==\n+\t\tI40E_FDIR_IPTYPE_IPV6) {\n+\t\tif (filter->input.flow_ext.is_udp)\n+\t\t\tfilter->input.flow.esp_ipv6_udp_flow.spi =\n+\t\t\t\tesp_spec->hdr.spi;\n+\t\telse\n+\t\t\tfilter->input.flow.esp_ipv6_flow.spi =\n+\t\t\t\tesp_spec->hdr.spi;\n+\t}\n+}\n+\n /* 1. Last in item should be NULL as range is not supported.\n * 2. Supported patterns: refer to array i40e_supported_patterns.\n * 3. Default supported flow type and input set: refer to array\n@@ -2459,6 +2538,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n \tconst struct rte_flow_item_udp *udp_spec, *udp_mask;\n \tconst struct rte_flow_item_sctp *sctp_spec, *sctp_mask;\n \tconst struct rte_flow_item_gtp *gtp_spec, *gtp_mask;\n+\tconst struct rte_flow_item_esp *esp_spec, *esp_mask;\n \tconst struct rte_flow_item_raw *raw_spec, *raw_mask;\n \tconst struct rte_flow_item_vf *vf_spec;\n \n@@ -2654,10 +2734,18 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n \t\t\t\t\tipv4_spec->hdr.src_addr;\n \t\t\t\tfilter->input.flow.ip4_flow.dst_ip =\n \t\t\t\t\tipv4_spec->hdr.dst_addr;\n+\n+\t\t\t\tfilter->input.flow_ext.inner_ip = false;\n+\t\t\t\tfilter->input.flow_ext.oip_type =\n+\t\t\t\t\tI40E_FDIR_IPTYPE_IPV4;\n \t\t\t} else if (!ipv4_spec && !ipv4_mask && !outer_ip) {\n \t\t\t\tfilter->input.flow_ext.inner_ip = true;\n \t\t\t\tfilter->input.flow_ext.iip_type =\n \t\t\t\t\tI40E_FDIR_IPTYPE_IPV4;\n+\t\t\t} else if (!ipv4_spec && !ipv4_mask && outer_ip) {\n+\t\t\t\tfilter->input.flow_ext.inner_ip = false;\n+\t\t\t\tfilter->input.flow_ext.oip_type =\n+\t\t\t\t\tI40E_FDIR_IPTYPE_IPV4;\n \t\t\t} else if ((ipv4_spec || ipv4_mask) && !outer_ip) {\n \t\t\t\trte_flow_error_set(error, EINVAL,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n@@ -2716,6 +2804,10 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n \t\t\t\tfilter->input.flow.ipv6_flow.hop_limits =\n \t\t\t\t\tipv6_spec->hdr.hop_limits;\n \n+\t\t\t\tfilter->input.flow_ext.inner_ip = false;\n+\t\t\t\tfilter->input.flow_ext.oip_type =\n+\t\t\t\t\tI40E_FDIR_IPTYPE_IPV6;\n+\n \t\t\t\trte_memcpy(filter->input.flow.ipv6_flow.src_ip,\n \t\t\t\t\t ipv6_spec->hdr.src_addr, 16);\n \t\t\t\trte_memcpy(filter->input.flow.ipv6_flow.dst_ip,\n@@ -2729,6 +2821,10 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n \t\t\t\tfilter->input.flow_ext.inner_ip = true;\n \t\t\t\tfilter->input.flow_ext.iip_type =\n \t\t\t\t\tI40E_FDIR_IPTYPE_IPV6;\n+\t\t\t} else if (!ipv6_spec && !ipv6_mask && outer_ip) {\n+\t\t\t\tfilter->input.flow_ext.inner_ip = false;\n+\t\t\t\tfilter->input.flow_ext.oip_type =\n+\t\t\t\t\tI40E_FDIR_IPTYPE_IPV6;\n \t\t\t} else if ((ipv6_spec || ipv6_mask) && !outer_ip) {\n \t\t\t\trte_flow_error_set(error, EINVAL,\n \t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n@@ -2828,7 +2924,7 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n \t\t\t\t\t\tudp_spec->hdr.dst_port;\n \t\t\t\t}\n \t\t\t}\n-\n+\t\t\tfilter->input.flow_ext.is_udp = true;\n \t\t\tlayer_idx = I40E_FLXPLD_L4_IDX;\n \n \t\t\tbreak;\n@@ -2863,6 +2959,39 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n \t\t\t\tcus_proto = item_type;\n \t\t\t}\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_ESP:\n+\t\t\tif (!pf->esp_support) {\n+\t\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t\t item,\n+\t\t\t\t\t\t \"Unsupported ESP protocol\");\n+\t\t\t\treturn -rte_errno;\n+\t\t\t}\n+\n+\t\t\tesp_spec = item->spec;\n+\t\t\tesp_mask = item->mask;\n+\n+\t\t\tif (!esp_spec || !esp_mask) {\n+\t\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t\t item,\n+\t\t\t\t\t\t \"Invalid ESP item\");\n+\t\t\t\treturn -rte_errno;\n+\t\t\t}\n+\n+\t\t\tif (esp_spec && esp_mask) {\n+\t\t\t\tif (esp_mask->hdr.spi != UINT32_MAX) {\n+\t\t\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t\t item,\n+\t\t\t\t\t\t \"Invalid ESP mask\");\n+\t\t\t\t\treturn -rte_errno;\n+\t\t\t\t}\n+\t\t\t\ti40e_flow_set_filter_spi(filter, esp_spec);\n+\t\t\t\tfilter->input.flow_ext.customized_pctype = true;\n+\t\t\t\tcus_proto = item_type;\n+\t\t\t}\n+\t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_SCTP:\n \t\t\tsctp_spec = item->spec;\n \t\t\tsctp_mask = item->mask;\n", "prefixes": [ "v5", "08/14" ] }