Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/81557/?format=api
{ "id": 81557, "url": "https://patches.dpdk.org/api/patches/81557/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1603185222-14831-54-git-send-email-arybchenko@solarflare.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": "<1603185222-14831-54-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1603185222-14831-54-git-send-email-arybchenko@solarflare.com", "date": "2020-10-20T09:13:33", "name": "[v2,53/62] net/sfc: support flow item TCP in transfer rules", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "fe16b68e93bf209ccae028746b95127a5e0ad3be", "submitter": { "id": 607, "url": "https://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1603185222-14831-54-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 13137, "url": "https://patches.dpdk.org/api/series/13137/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=13137", "date": "2020-10-20T09:12:44", "name": "net/sfc: support flow API transfer rules", "version": 2, "mbox": "https://patches.dpdk.org/series/13137/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/81557/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/81557/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 4675DA04DD;\n\tTue, 20 Oct 2020 11:36:26 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id AA073FC93;\n\tTue, 20 Oct 2020 11:15:48 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 2B618C836\n for <dev@dpdk.org>; Tue, 20 Oct 2020 11:14:17 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.7.65.62])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n EB7666005F for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:16 +0000 (UTC)", "from us4-mdac16-72.ut7.mdlocal (unknown [10.7.64.191])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id EB9008009B\n for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:16 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.7.66.34])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n 78383280052\n for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:16 +0000 (UTC)", "from webmail.solarflare.com (uk.solarflare.com [193.34.186.16])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n (No client certificate requested)\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n 2DD86600053\n for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:16 +0000 (UTC)", "from ukex01.SolarFlarecom.com (10.17.10.4) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id\n 15.0.1497.2; Tue, 20 Oct 2020 10:14:01 +0100", "from opal.uk.solarflarecom.com (10.17.10.1) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id\n 15.0.1497.2 via Frontend Transport; Tue, 20 Oct 2020 10:14:01 +0100", "from ukv-loginhost.uk.solarflarecom.com\n (ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 09K9E1Kt028541;\n Tue, 20 Oct 2020 10:14:01 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id AE2751613A9;\n Tue, 20 Oct 2020 10:14:01 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Ivan Malov <ivan.malov@oktetlabs.ru>", "Date": "Tue, 20 Oct 2020 10:13:33 +0100", "Message-ID": "<1603185222-14831-54-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1603185222-14831-1-git-send-email-arybchenko@solarflare.com>", "References": "<1603183709-23420-1-git-send-email-arybchenko@solarflare.com>\n <1603185222-14831-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.6.1012-25736.003", "X-TM-AS-Result": "No-0.042700-8.000000-10", "X-TMASE-MatchedRID": "3ksEd+Y0lhQfKML5AJtfLS2416nc3bQleouvej40T4gd0WOKRkwsh66P\n KQSZCnDqRjuuru99Q9KPQi9XuOWoOPyUSi1R/9mUpu2VUsoXjOnH6OsXtPNFLU8iLpubparmLYt\n XmTkfIw66wYPx0ATBoKj/gQzO7EtvVumvLS6q4FCSvRb8EMdYRYfQ3g3I7jVbDpCUEeEFm7CGon\n GL0jN7MrAvU1QKVuyLUWBVxR396r7JwIkjG/GOnCL/7WCg9OOSovA/6ONsv0rmQJUUegCCe+xvA\n Z+P6819rIBzH3upzT+/0Zic4ZIFl7Ud2R7XKvn3I7qctJOE9rp9LQinZ4QefPcjNeVeWlqY+gtH\n j7OwNO1Sa+jpKCDmEWz7+ViRut4I3ZNS0z0ZM49hoJiDekd93DNT61j9k+YbvHJcklp+bXU5Ydt\n MJu+Xj06eURWUybDimvjwc3/yjPGG0ZyqkEqBXdpAu0sLxpSoQ8G+yYJYYdZRZDsGiXQioL4jxK\n nHJRLcVcr204P67pw=", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10-0.042700-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25736.003", "X-MDID": "1603185256-buSz5aLqv_vc", "X-PPE-DISP": "1603185256;buSz5aLqv_vc", "Subject": "[dpdk-dev] [PATCH v2 53/62] net/sfc: support flow item TCP in\n\ttransfer rules", "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": "From: Ivan Malov <ivan.malov@oktetlabs.ru>\n\nAdd support for this flow item to MAE-specific RTE flow implementation.\n\nSigned-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n doc/guides/nics/sfc_efx.rst | 2 +\n drivers/net/sfc/sfc_mae.c | 77 +++++++++++++++++++++++++++++++++++++\n drivers/net/sfc/sfc_mae.h | 15 +++++++-\n 3 files changed, 93 insertions(+), 1 deletion(-)", "diff": "diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst\nindex 8209990d23..661af43a20 100644\n--- a/doc/guides/nics/sfc_efx.rst\n+++ b/doc/guides/nics/sfc_efx.rst\n@@ -208,6 +208,8 @@ Supported pattern items (***transfer*** rules):\n - IPV6 (source/destination addresses, IP transport protocol,\n traffic class, hop limit)\n \n+- TCP (source/destination ports, TCP header length + TCP flags)\n+\n Supported actions (***transfer*** rules):\n \n - OF_POP_VLAN\ndiff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c\nindex 2b0121c0ac..59c53a96f3 100644\n--- a/drivers/net/sfc/sfc_mae.c\n+++ b/drivers/net/sfc/sfc_mae.c\n@@ -396,6 +396,19 @@ sfc_mae_rule_process_pattern_data(struct sfc_mae_parse_ctx *ctx,\n \tif (rc != 0)\n \t\tgoto fail;\n \n+\tif (pdata->l3_next_proto_restriction_mask == 0xff) {\n+\t\tif (pdata->l3_next_proto_mask == 0) {\n+\t\t\tpdata->l3_next_proto_mask = 0xff;\n+\t\t\tpdata->l3_next_proto_value =\n+\t\t\t pdata->l3_next_proto_restriction_value;\n+\t\t} else if (pdata->l3_next_proto_mask != 0xff ||\n+\t\t\t pdata->l3_next_proto_value !=\n+\t\t\t pdata->l3_next_proto_restriction_value) {\n+\t\t\trc = EINVAL;\n+\t\t\tgoto fail;\n+\t\t}\n+\t}\n+\n \tvaluep = (const uint8_t *)&pdata->l3_next_proto_value;\n \tmaskp = (const uint8_t *)&pdata->l3_next_proto_mask;\n \trc = efx_mae_match_spec_field_set(efx_spec, EFX_MAE_FIELD_IP_PROTO,\n@@ -1045,6 +1058,63 @@ sfc_mae_rule_parse_item_ipv6(const struct rte_flow_item *item,\n \treturn 0;\n }\n \n+static const struct sfc_mae_field_locator flocs_tcp[] = {\n+\t{\n+\t\tEFX_MAE_FIELD_L4_SPORT_BE,\n+\t\tRTE_SIZEOF_FIELD(struct rte_flow_item_tcp, hdr.src_port),\n+\t\toffsetof(struct rte_flow_item_tcp, hdr.src_port),\n+\t},\n+\t{\n+\t\tEFX_MAE_FIELD_L4_DPORT_BE,\n+\t\tRTE_SIZEOF_FIELD(struct rte_flow_item_tcp, hdr.dst_port),\n+\t\toffsetof(struct rte_flow_item_tcp, hdr.dst_port),\n+\t},\n+\t{\n+\t\tEFX_MAE_FIELD_TCP_FLAGS_BE,\n+\t\t/*\n+\t\t * The values have been picked intentionally since the\n+\t\t * target MAE field is oversize (16 bit). This mapping\n+\t\t * relies on the fact that the MAE field is big-endian.\n+\t\t */\n+\t\tRTE_SIZEOF_FIELD(struct rte_flow_item_tcp, hdr.data_off) +\n+\t\tRTE_SIZEOF_FIELD(struct rte_flow_item_tcp, hdr.tcp_flags),\n+\t\toffsetof(struct rte_flow_item_tcp, hdr.data_off),\n+\t},\n+};\n+\n+static int\n+sfc_mae_rule_parse_item_tcp(const struct rte_flow_item *item,\n+\t\t\t struct sfc_flow_parse_ctx *ctx,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tstruct sfc_mae_parse_ctx *ctx_mae = ctx->mae;\n+\tstruct sfc_mae_pattern_data *pdata = &ctx_mae->pattern_data;\n+\tstruct rte_flow_item_tcp supp_mask;\n+\tconst uint8_t *spec = NULL;\n+\tconst uint8_t *mask = NULL;\n+\tint rc;\n+\n+\tsfc_mae_item_build_supp_mask(flocs_tcp, RTE_DIM(flocs_tcp),\n+\t\t\t\t &supp_mask, sizeof(supp_mask));\n+\n+\trc = sfc_flow_parse_init(item,\n+\t\t\t\t (const void **)&spec, (const void **)&mask,\n+\t\t\t\t (const void *)&supp_mask,\n+\t\t\t\t &rte_flow_item_tcp_mask,\n+\t\t\t\t sizeof(struct rte_flow_item_tcp), error);\n+\tif (rc != 0)\n+\t\treturn rc;\n+\n+\tpdata->l3_next_proto_restriction_value = IPPROTO_TCP;\n+\tpdata->l3_next_proto_restriction_mask = 0xff;\n+\n+\tif (spec == NULL)\n+\t\treturn 0;\n+\n+\treturn sfc_mae_parse_item(flocs_tcp, RTE_DIM(flocs_tcp), spec, mask,\n+\t\t\t\t ctx_mae->match_spec_action, error);\n+}\n+\n static const struct sfc_flow_item sfc_flow_items[] = {\n \t{\n \t\t.type = RTE_FLOW_ITEM_TYPE_PORT_ID,\n@@ -1118,6 +1188,13 @@ static const struct sfc_flow_item sfc_flow_items[] = {\n \t\t.ctx_type = SFC_FLOW_PARSE_CTX_MAE,\n \t\t.parse = sfc_mae_rule_parse_item_ipv6,\n \t},\n+\t{\n+\t\t.type = RTE_FLOW_ITEM_TYPE_TCP,\n+\t\t.prev_layer = SFC_FLOW_ITEM_L3,\n+\t\t.layer = SFC_FLOW_ITEM_L4,\n+\t\t.ctx_type = SFC_FLOW_PARSE_CTX_MAE,\n+\t\t.parse = sfc_mae_rule_parse_item_tcp,\n+\t},\n };\n \n int\ndiff --git a/drivers/net/sfc/sfc_mae.h b/drivers/net/sfc/sfc_mae.h\nindex 993a377861..71046f2308 100644\n--- a/drivers/net/sfc/sfc_mae.h\n+++ b/drivers/net/sfc/sfc_mae.h\n@@ -123,10 +123,23 @@ struct sfc_mae_pattern_data {\n \t/**\n \t * The following two fields keep track of L3 \"proto\" mask and value.\n \t * The corresponding fields get filled in MAE match specification\n-\t * at the end of parsing.\n+\t * at the end of parsing. Also, the information is used by a\n+\t * post-check to enforce consistency requirements:\n+\t *\n+\t * - If a L3 item is followed by an item TCP, the former has\n+\t * its \"proto\" set to either 0x06/0xff or 0x00/0x00.\n \t */\n \tuint8_t\t\t\t\tl3_next_proto_value;\n \tuint8_t\t\t\t\tl3_next_proto_mask;\n+\n+\t/*\n+\t * L4 requirement for L3 item's \"proto\".\n+\t * This contains one of:\n+\t * - 0x06/0xff: TCP\n+\t * - 0x00/0x00: no L4 item\n+\t */\n+\tuint8_t\t\t\t\tl3_next_proto_restriction_value;\n+\tuint8_t\t\t\t\tl3_next_proto_restriction_mask;\n };\n \n struct sfc_mae_parse_ctx {\n", "prefixes": [ "v2", "53/62" ] }