Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/83958/?format=api
http://patches.dpdk.org/api/patches/83958/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201111064936.768604-18-jiawenwu@trustnetic.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": "<20201111064936.768604-18-jiawenwu@trustnetic.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201111064936.768604-18-jiawenwu@trustnetic.com", "date": "2020-11-11T06:49:16", "name": "[v2,17/37] net/txgbe: add FDIR parse tunnel rule", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "36937bf5a25718a6a8d0b9e673c884e916cd01d3", "submitter": { "id": 1932, "url": "http://patches.dpdk.org/api/people/1932/?format=api", "name": "Jiawen Wu", "email": "jiawenwu@trustnetic.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/20201111064936.768604-18-jiawenwu@trustnetic.com/mbox/", "series": [ { "id": 13798, "url": "http://patches.dpdk.org/api/series/13798/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=13798", "date": "2020-11-11T06:49:00", "name": "net: add txgbe PMD part 2", "version": 2, "mbox": "http://patches.dpdk.org/series/13798/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/83958/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/83958/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 8244CA09D2;\n\tWed, 11 Nov 2020 07:53:01 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 5CB49BC90;\n\tWed, 11 Nov 2020 07:47:59 +0100 (CET)", "from smtpbg506.qq.com (smtpbg506.qq.com [203.205.250.33])\n by dpdk.org (Postfix) with ESMTP id 77C776A6F\n for <dev@dpdk.org>; Wed, 11 Nov 2020 07:47:46 +0100 (CET)", "from localhost.localdomain.com (unknown [183.129.236.74])\n by esmtp10.qq.com (ESMTP) with\n id ; Wed, 11 Nov 2020 14:47:42 +0800 (CST)" ], "X-QQ-mid": "bizesmtp27t1605077262tg0wqrgr", "X-QQ-SSF": "01400000000000C0C000B00A0000000", "X-QQ-FEAT": "BOakPI+hGgTFq2TulxPcCFkWQzwPKvWUs+t5WJk/RBxiNC8wdmyFPH8SQ0B3M\n LOA1GD++FZNcZmqdCKQ8rQj6/GEEqDKA+y7Vrjk+9GQQVkpW6SeVDTzjlGrWz/64xSk68tv\n TQu2XZLYJlN62DmeokCFre1WbIVY0vdyl2/AXQVTD+OWnOQDewLn+bKeNb43SGj/rSfeRrj\n S4wWvgqjHTz8DFl2wxzhYSqlahAdNe5FDYCKgfVTTkvrrTDaDUmP/yF6WZKFE/prXy2y7YD\n U0/kWWb7wUxEcM6/Q2CTZtO/RpF+prmicL2Nuhu4bHfhinBUjj/2rcQts8l7CN2TnYqSYg6\n MG/HDNkpKqWzcfHcYBBUDJ5pH2E/w==", "X-QQ-GoodBg": "2", "From": "Jiawen Wu <jiawenwu@trustnetic.com>", "To": "dev@dpdk.org", "Cc": "Jiawen Wu <jiawenwu@trustnetic.com>", "Date": "Wed, 11 Nov 2020 14:49:16 +0800", "Message-Id": "<20201111064936.768604-18-jiawenwu@trustnetic.com>", "X-Mailer": "git-send-email 2.18.4", "In-Reply-To": "<20201111064936.768604-1-jiawenwu@trustnetic.com>", "References": "<20201111064936.768604-1-jiawenwu@trustnetic.com>", "X-QQ-SENDSIZE": "520", "Feedback-ID": "bizesmtp:trustnetic.com:qybgforeign:qybgforeign7", "X-QQ-Bgrelay": "1", "Subject": "[dpdk-dev] [PATCH v2 17/37] net/txgbe: add FDIR parse tunnel rule", "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 support to parse tunnel flow for fdir filter.\n\nSigned-off-by: Jiawen Wu <jiawenwu@trustnetic.com>\n---\n drivers/net/txgbe/base/txgbe_type.h | 8 +\n drivers/net/txgbe/txgbe_flow.c | 290 ++++++++++++++++++++++++++++\n 2 files changed, 298 insertions(+)", "diff": "diff --git a/drivers/net/txgbe/base/txgbe_type.h b/drivers/net/txgbe/base/txgbe_type.h\nindex a73f66d39..22efcef78 100644\n--- a/drivers/net/txgbe/base/txgbe_type.h\n+++ b/drivers/net/txgbe/base/txgbe_type.h\n@@ -92,6 +92,14 @@ enum txgbe_atr_flow_type {\n \tTXGBE_ATR_FLOW_TYPE_UDPV6\t\t= 0x5,\n \tTXGBE_ATR_FLOW_TYPE_TCPV6\t\t= 0x6,\n \tTXGBE_ATR_FLOW_TYPE_SCTPV6\t\t= 0x7,\n+\tTXGBE_ATR_FLOW_TYPE_TUNNELED_IPV4\t= 0x10,\n+\tTXGBE_ATR_FLOW_TYPE_TUNNELED_UDPV4\t= 0x11,\n+\tTXGBE_ATR_FLOW_TYPE_TUNNELED_TCPV4\t= 0x12,\n+\tTXGBE_ATR_FLOW_TYPE_TUNNELED_SCTPV4\t= 0x13,\n+\tTXGBE_ATR_FLOW_TYPE_TUNNELED_IPV6\t= 0x14,\n+\tTXGBE_ATR_FLOW_TYPE_TUNNELED_UDPV6\t= 0x15,\n+\tTXGBE_ATR_FLOW_TYPE_TUNNELED_TCPV6\t= 0x16,\n+\tTXGBE_ATR_FLOW_TYPE_TUNNELED_SCTPV6\t= 0x17,\n };\n \n /* Flow Director ATR input struct. */\ndiff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c\nindex ba1be9f12..b7d0e08a9 100644\n--- a/drivers/net/txgbe/txgbe_flow.c\n+++ b/drivers/net/txgbe/txgbe_flow.c\n@@ -2064,6 +2064,291 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev __rte_unused,\n \treturn txgbe_parse_fdir_act_attr(attr, actions, rule, error);\n }\n \n+/**\n+ * Parse the rule to see if it is a VxLAN or NVGRE flow director rule.\n+ * And get the flow director filter info BTW.\n+ * VxLAN PATTERN:\n+ * The first not void item must be ETH.\n+ * The second not void item must be IPV4/ IPV6.\n+ * The third not void item must be NVGRE.\n+ * The next not void item must be END.\n+ * NVGRE PATTERN:\n+ * The first not void item must be ETH.\n+ * The second not void item must be IPV4/ IPV6.\n+ * The third not void item must be NVGRE.\n+ * The next not void item must be END.\n+ * ACTION:\n+ * The first not void action should be QUEUE or DROP.\n+ * The second not void optional action should be MARK,\n+ * mark_id is a uint32_t number.\n+ * The next not void action should be END.\n+ * VxLAN pattern example:\n+ * ITEM\t\tSpec\t\t\tMask\n+ * ETH\t\tNULL\t\t\tNULL\n+ * IPV4/IPV6\tNULL\t\t\tNULL\n+ * UDP\t\tNULL\t\t\tNULL\n+ * VxLAN\tvni{0x00, 0x32, 0x54}\t{0xFF, 0xFF, 0xFF}\n+ * MAC VLAN\ttci\t0x2016\t\t0xEFFF\n+ * END\n+ * NEGRV pattern example:\n+ * ITEM\t\tSpec\t\t\tMask\n+ * ETH\t\tNULL\t\t\tNULL\n+ * IPV4/IPV6\tNULL\t\t\tNULL\n+ * NVGRE\tprotocol\t0x6558\t0xFFFF\n+ *\t\ttni{0x00, 0x32, 0x54}\t{0xFF, 0xFF, 0xFF}\n+ * MAC VLAN\ttci\t0x2016\t\t0xEFFF\n+ * END\n+ * other members in mask and spec should set to 0x00.\n+ * item->last should be NULL.\n+ */\n+static int\n+txgbe_parse_fdir_filter_tunnel(const struct rte_flow_attr *attr,\n+\t\t\t const struct rte_flow_item pattern[],\n+\t\t\t const struct rte_flow_action actions[],\n+\t\t\t struct txgbe_fdir_rule *rule,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tconst struct rte_flow_item *item;\n+\tconst struct rte_flow_item_eth *eth_mask;\n+\tuint32_t j;\n+\n+\tif (!pattern) {\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\tRTE_FLOW_ERROR_TYPE_ITEM_NUM,\n+\t\t\t\t NULL, \"NULL pattern.\");\n+\t\treturn -rte_errno;\n+\t}\n+\n+\tif (!actions) {\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION_NUM,\n+\t\t\t\t NULL, \"NULL action.\");\n+\t\treturn -rte_errno;\n+\t}\n+\n+\tif (!attr) {\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_ATTR,\n+\t\t\t\t NULL, \"NULL attribute.\");\n+\t\treturn -rte_errno;\n+\t}\n+\n+\t/**\n+\t * Some fields may not be provided. Set spec to 0 and mask to default\n+\t * value. So, we need not do anything for the not provided fields later.\n+\t */\n+\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\tmemset(&rule->mask, 0xFF, sizeof(struct txgbe_hw_fdir_mask));\n+\trule->mask.vlan_tci_mask = 0;\n+\n+\t/**\n+\t * The first not void item should be\n+\t * MAC or IPv4 or IPv6 or UDP or VxLAN.\n+\t */\n+\titem = next_no_void_pattern(pattern, NULL);\n+\tif (item->type != RTE_FLOW_ITEM_TYPE_ETH &&\n+\t item->type != RTE_FLOW_ITEM_TYPE_IPV4 &&\n+\t item->type != RTE_FLOW_ITEM_TYPE_IPV6 &&\n+\t item->type != RTE_FLOW_ITEM_TYPE_UDP &&\n+\t item->type != RTE_FLOW_ITEM_TYPE_VXLAN &&\n+\t item->type != RTE_FLOW_ITEM_TYPE_NVGRE) {\n+\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\titem, \"Not supported by fdir filter\");\n+\t\treturn -rte_errno;\n+\t}\n+\n+\trule->mode = RTE_FDIR_MODE_PERFECT_TUNNEL;\n+\n+\t/* Skip MAC. */\n+\tif (item->type == RTE_FLOW_ITEM_TYPE_ETH) {\n+\t\t/* Only used to describe the protocol stack. */\n+\t\tif (item->spec || item->mask) {\n+\t\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\titem, \"Not supported by fdir filter\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t\t/* Not supported last point for range*/\n+\t\tif (item->last) {\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\titem, \"Not supported last point for range\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\n+\t\t/* Check if the next not void item is IPv4 or IPv6. */\n+\t\titem = next_no_void_pattern(pattern, item);\n+\t\tif (item->type != RTE_FLOW_ITEM_TYPE_IPV4 &&\n+\t\t item->type != RTE_FLOW_ITEM_TYPE_IPV6) {\n+\t\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\titem, \"Not supported by fdir filter\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t}\n+\n+\t/* Skip IP. */\n+\tif (item->type == RTE_FLOW_ITEM_TYPE_IPV4 ||\n+\t item->type == RTE_FLOW_ITEM_TYPE_IPV6) {\n+\t\t/* Only used to describe the protocol stack. */\n+\t\tif (item->spec || item->mask) {\n+\t\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\titem, \"Not supported by fdir filter\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t\t/*Not supported last point for range*/\n+\t\tif (item->last) {\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\titem, \"Not supported last point for range\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\n+\t\t/* Check if the next not void item is UDP or NVGRE. */\n+\t\titem = next_no_void_pattern(pattern, item);\n+\t\tif (item->type != RTE_FLOW_ITEM_TYPE_UDP &&\n+\t\t item->type != RTE_FLOW_ITEM_TYPE_NVGRE) {\n+\t\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\titem, \"Not supported by fdir filter\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t}\n+\n+\t/* Skip UDP. */\n+\tif (item->type == RTE_FLOW_ITEM_TYPE_UDP) {\n+\t\t/* Only used to describe the protocol stack. */\n+\t\tif (item->spec || item->mask) {\n+\t\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\titem, \"Not supported by fdir filter\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t\t/*Not supported last point for range*/\n+\t\tif (item->last) {\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\titem, \"Not supported last point for range\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\n+\t\t/* Check if the next not void item is VxLAN. */\n+\t\titem = next_no_void_pattern(pattern, item);\n+\t\tif (item->type != RTE_FLOW_ITEM_TYPE_VXLAN) {\n+\t\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\titem, \"Not supported by fdir filter\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t}\n+\n+\t/* check if the next not void item is MAC */\n+\titem = next_no_void_pattern(pattern, item);\n+\tif (item->type != RTE_FLOW_ITEM_TYPE_ETH) {\n+\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\titem, \"Not supported by fdir filter\");\n+\t\treturn -rte_errno;\n+\t}\n+\n+\t/**\n+\t * Only support vlan and dst MAC address,\n+\t * others should be masked.\n+\t */\n+\n+\tif (!item->mask) {\n+\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\titem, \"Not supported by fdir filter\");\n+\t\treturn -rte_errno;\n+\t}\n+\t/*Not supported last point for range*/\n+\tif (item->last) {\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\titem, \"Not supported last point for range\");\n+\t\treturn -rte_errno;\n+\t}\n+\trule->b_mask = TRUE;\n+\teth_mask = item->mask;\n+\n+\t/* Ether type should be masked. */\n+\tif (eth_mask->type) {\n+\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\titem, \"Not supported by fdir filter\");\n+\t\treturn -rte_errno;\n+\t}\n+\n+\t/* src MAC address should be masked. */\n+\tfor (j = 0; j < RTE_ETHER_ADDR_LEN; j++) {\n+\t\tif (eth_mask->src.addr_bytes[j]) {\n+\t\t\tmemset(rule, 0,\n+\t\t\t sizeof(struct txgbe_fdir_rule));\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\titem, \"Not supported by fdir filter\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t}\n+\trule->mask.mac_addr_byte_mask = 0;\n+\tfor (j = 0; j < ETH_ADDR_LEN; j++) {\n+\t\t/* It's a per byte mask. */\n+\t\tif (eth_mask->dst.addr_bytes[j] == 0xFF) {\n+\t\t\trule->mask.mac_addr_byte_mask |= 0x1 << j;\n+\t\t} else if (eth_mask->dst.addr_bytes[j]) {\n+\t\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\titem, \"Not supported by fdir filter\");\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t}\n+\n+\t/* When no vlan, considered as full mask. */\n+\trule->mask.vlan_tci_mask = rte_cpu_to_be_16(0xEFFF);\n+\n+\t/**\n+\t * Check if the next not void item is vlan or ipv4.\n+\t * IPv6 is not supported.\n+\t */\n+\titem = next_no_void_pattern(pattern, item);\n+\tif (item->type != RTE_FLOW_ITEM_TYPE_VLAN &&\n+\t\titem->type != RTE_FLOW_ITEM_TYPE_IPV4) {\n+\t\tmemset(rule, 0, sizeof(struct txgbe_fdir_rule));\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\titem, \"Not supported by fdir filter\");\n+\t\treturn -rte_errno;\n+\t}\n+\t/*Not supported last point for range*/\n+\tif (item->last) {\n+\t\trte_flow_error_set(error, EINVAL,\n+\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\titem, \"Not supported last point for range\");\n+\t\treturn -rte_errno;\n+\t}\n+\n+\t/**\n+\t * If the tags is 0, it means don't care about the VLAN.\n+\t * Do nothing.\n+\t */\n+\n+\treturn txgbe_parse_fdir_act_attr(attr, actions, rule, error);\n+}\n+\n static int\n txgbe_parse_fdir_filter(struct rte_eth_dev *dev,\n \t\t\tconst struct rte_flow_attr *attr,\n@@ -2081,6 +2366,11 @@ txgbe_parse_fdir_filter(struct rte_eth_dev *dev,\n \tif (!ret)\n \t\tgoto step_next;\n \n+\tret = txgbe_parse_fdir_filter_tunnel(attr, pattern,\n+\t\t\t\t\tactions, rule, error);\n+\tif (ret)\n+\t\treturn ret;\n+\n step_next:\n \n \tif (hw->mac.type == txgbe_mac_raptor &&\n", "prefixes": [ "v2", "17/37" ] }{ "id": 83958, "url": "