Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/81518/?format=api
{ "id": 81518, "url": "https://patches.dpdk.org/api/patches/81518/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1603185222-14831-10-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-10-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1603185222-14831-10-git-send-email-arybchenko@solarflare.com", "date": "2020-10-20T09:12:49", "name": "[v2,09/62] net/sfc: add pattern parsing stub to MAE backend", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "d54fba8e6b691439ff1c9db2b2606b1e064d5fe8", "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-10-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/81518/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/81518/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 322C1A04DD;\n\tTue, 20 Oct 2020 11:22:46 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 4289DC8D6;\n\tTue, 20 Oct 2020 11:14:30 +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 E3808C7EE\n for <dev@dpdk.org>; Tue, 20 Oct 2020 11:14:07 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.7.65.64])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n 6ABC46007C for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:06 +0000 (UTC)", "from us4-mdac16-8.ut7.mdlocal (unknown [10.7.65.76])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 69B5B2009B\n for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:06 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.7.66.41])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n E100622004F\n for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:05 +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 9527F4C0060\n for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:05 +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:13:59 +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:13:59 +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 09K9Dx2X028345;\n Tue, 20 Oct 2020 10:13:59 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 4E1C51613AB;\n Tue, 20 Oct 2020 10:13:59 +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:12:49 +0100", "Message-ID": "<1603185222-14831-10-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-1.160300-8.000000-10", "X-TMASE-MatchedRID": "EKKc/431jqX8lEotUf/ZlDIHIyLCTr7ep5HLLTy++LOk+oW3oLzmHu/y\n RkWfD4An9cMrDdv2FUoWsp6eJb7A26H2g9syPs88nFVnNmvv47uWODD/yzpvdwdkFovAReUoilv\n Ab18i4hPZ0cSyucj+2hQfw+ZajaGFFUPnz5fE4uMPe5gzF3TVtwKflB9+9kWVvGAx/1ATZ5vNap\n M94+SzbOr9+n4qMZcckII+BsKkYBAdAyevMk7vZ0aMPBFKXyAUfLNHMurfykjm5xVqTV9Qwbqjm\n k4TdfSm2E6HipP5OtKAMuqetGVetnyef22ep6XYro1URZJFbJsuqecCzEZT/uxThEaCtKZVrlsm\n 5NZNfH70M+u7zdPp/2BqX3RCS4zgNVK/iHXnGXJjRJA9Ku756PhFUezPWSS7xlklxORbxgTw7Jx\n wU0EvZMqEROLb/+yO4/0Jvn0rwAJmtL4Dw+zNb0D/MIf9Orkd", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10-1.160300-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25736.003", "X-MDID": "1603185246-M2cApB9qvmNK", "X-PPE-DISP": "1603185246;M2cApB9qvmNK", "Subject": "[dpdk-dev] [PATCH v2 09/62] net/sfc: add pattern parsing stub to\n\tMAE backend", "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 pattern parsing stub, define and implement flow cleanup method.\nThe latter is needed to free any dynamic structures allocated\nduring flow parsing.\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 drivers/net/sfc/sfc_flow.c | 41 +++++++++++++++++++++++-\n drivers/net/sfc/sfc_flow.h | 8 +++++\n drivers/net/sfc/sfc_mae.c | 65 ++++++++++++++++++++++++++++++++++++++\n drivers/net/sfc/sfc_mae.h | 10 ++++++\n 4 files changed, 123 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c\nindex 86082208d0..634818cdf2 100644\n--- a/drivers/net/sfc/sfc_flow.c\n+++ b/drivers/net/sfc/sfc_flow.c\n@@ -27,20 +27,30 @@\n \n struct sfc_flow_ops_by_spec {\n \tsfc_flow_parse_cb_t\t*parse;\n+\tsfc_flow_cleanup_cb_t\t*cleanup;\n \tsfc_flow_insert_cb_t\t*insert;\n \tsfc_flow_remove_cb_t\t*remove;\n };\n \n static sfc_flow_parse_cb_t sfc_flow_parse_rte_to_filter;\n+static sfc_flow_parse_cb_t sfc_flow_parse_rte_to_mae;\n static sfc_flow_insert_cb_t sfc_flow_filter_insert;\n static sfc_flow_remove_cb_t sfc_flow_filter_remove;\n \n static const struct sfc_flow_ops_by_spec sfc_flow_ops_filter = {\n \t.parse = sfc_flow_parse_rte_to_filter,\n+\t.cleanup = NULL,\n \t.insert = sfc_flow_filter_insert,\n \t.remove = sfc_flow_filter_remove,\n };\n \n+static const struct sfc_flow_ops_by_spec sfc_flow_ops_mae = {\n+\t.parse = sfc_flow_parse_rte_to_mae,\n+\t.cleanup = sfc_mae_flow_cleanup,\n+\t.insert = NULL,\n+\t.remove = NULL,\n+};\n+\n static const struct sfc_flow_ops_by_spec *\n sfc_flow_get_ops_by_spec(struct rte_flow *flow)\n {\n@@ -51,6 +61,9 @@ sfc_flow_get_ops_by_spec(struct rte_flow *flow)\n \tcase SFC_FLOW_SPEC_FILTER:\n \t\tops = &sfc_flow_ops_filter;\n \t\tbreak;\n+\tcase SFC_FLOW_SPEC_MAE:\n+\t\tops = &sfc_flow_ops_mae;\n+\t\tbreak;\n \tdefault:\n \t\tSFC_ASSERT(false);\n \t\tbreak;\n@@ -1184,6 +1197,7 @@ sfc_flow_parse_attr(struct sfc_adapter *sa,\n \t\t}\n \t\tspec->type = SFC_FLOW_SPEC_MAE;\n \t\tspec_mae->priority = attr->priority;\n+\t\tspec_mae->match_spec = NULL;\n \t}\n \n \treturn 0;\n@@ -2408,6 +2422,25 @@ sfc_flow_parse_rte_to_filter(struct rte_eth_dev *dev,\n \treturn rc;\n }\n \n+static int\n+sfc_flow_parse_rte_to_mae(struct rte_eth_dev *dev,\n+\t\t\t const struct rte_flow_item pattern[],\n+\t\t\t __rte_unused const struct rte_flow_action actions[],\n+\t\t\t struct rte_flow *flow,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n+\tstruct sfc_flow_spec *spec = &flow->spec;\n+\tstruct sfc_flow_spec_mae *spec_mae = &spec->mae;\n+\tint rc;\n+\n+\trc = sfc_mae_rule_parse_pattern(sa, pattern, spec_mae, error);\n+\tif (rc != 0)\n+\t\treturn rc;\n+\n+\treturn 0;\n+}\n+\n static int\n sfc_flow_parse(struct rte_eth_dev *dev,\n \t const struct rte_flow_attr *attr,\n@@ -2451,8 +2484,14 @@ sfc_flow_zmalloc(struct rte_flow_error *error)\n }\n \n static void\n-sfc_flow_free(__rte_unused struct sfc_adapter *sa, struct rte_flow *flow)\n+sfc_flow_free(struct sfc_adapter *sa, struct rte_flow *flow)\n {\n+\tconst struct sfc_flow_ops_by_spec *ops;\n+\n+\tops = sfc_flow_get_ops_by_spec(flow);\n+\tif (ops != NULL && ops->cleanup != NULL)\n+\t\tops->cleanup(sa, flow);\n+\n \trte_free(flow);\n }\n \ndiff --git a/drivers/net/sfc/sfc_flow.h b/drivers/net/sfc/sfc_flow.h\nindex 1fbcb878d1..03a68d8633 100644\n--- a/drivers/net/sfc/sfc_flow.h\n+++ b/drivers/net/sfc/sfc_flow.h\n@@ -63,6 +63,8 @@ struct sfc_flow_spec_filter {\n struct sfc_flow_spec_mae {\n \t/* Desired priority level */\n \tunsigned int\t\t\tpriority;\n+\t/* EFX match specification */\n+\tefx_mae_match_spec_t\t\t*match_spec;\n };\n \n /* Flow specification */\n@@ -100,6 +102,7 @@ enum sfc_flow_item_layers {\n /* Flow parse context types */\n enum sfc_flow_parse_ctx_type {\n \tSFC_FLOW_PARSE_CTX_FILTER = 0,\n+\tSFC_FLOW_PARSE_CTX_MAE,\n \n \tSFC_FLOW_PARSE_CTX_NTYPES\n };\n@@ -112,6 +115,8 @@ struct sfc_flow_parse_ctx {\n \tunion {\n \t\t/* Context pointer valid for filter-based (VNIC) flows */\n \t\tefx_filter_spec_t *filter;\n+\t\t/* Context pointer valid for MAE-based flows */\n+\t\tstruct sfc_mae_parse_ctx *mae;\n \t};\n };\n \n@@ -154,6 +159,9 @@ typedef int (sfc_flow_parse_cb_t)(struct rte_eth_dev *dev,\n \t\t\t\t struct rte_flow *flow,\n \t\t\t\t struct rte_flow_error *error);\n \n+typedef void (sfc_flow_cleanup_cb_t)(struct sfc_adapter *sa,\n+\t\t\t\t struct rte_flow *flow);\n+\n typedef int (sfc_flow_insert_cb_t)(struct sfc_adapter *sa,\n \t\t\t\t struct rte_flow *flow);\n \ndiff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c\nindex 487bd61f76..53e141775a 100644\n--- a/drivers/net/sfc/sfc_mae.c\n+++ b/drivers/net/sfc/sfc_mae.c\n@@ -75,3 +75,68 @@ sfc_mae_detach(struct sfc_adapter *sa)\n \n \tsfc_log_init(sa, \"done\");\n }\n+\n+void\n+sfc_mae_flow_cleanup(struct sfc_adapter *sa,\n+\t\t struct rte_flow *flow)\n+{\n+\tstruct sfc_flow_spec *spec;\n+\tstruct sfc_flow_spec_mae *spec_mae;\n+\n+\tif (flow == NULL)\n+\t\treturn;\n+\n+\tspec = &flow->spec;\n+\n+\tif (spec == NULL)\n+\t\treturn;\n+\n+\tspec_mae = &spec->mae;\n+\n+\tif (spec_mae->match_spec != NULL)\n+\t\tefx_mae_match_spec_fini(sa->nic, spec_mae->match_spec);\n+}\n+\n+static const struct sfc_flow_item sfc_flow_items[] = {\n+};\n+\n+int\n+sfc_mae_rule_parse_pattern(struct sfc_adapter *sa,\n+\t\t\t const struct rte_flow_item pattern[],\n+\t\t\t struct sfc_flow_spec_mae *spec,\n+\t\t\t struct rte_flow_error *error)\n+{\n+\tstruct sfc_mae_parse_ctx ctx_mae;\n+\tstruct sfc_flow_parse_ctx ctx;\n+\tint rc;\n+\n+\tmemset(&ctx_mae, 0, sizeof(ctx_mae));\n+\n+\trc = efx_mae_match_spec_init(sa->nic, EFX_MAE_RULE_ACTION,\n+\t\t\t\t spec->priority,\n+\t\t\t\t &ctx_mae.match_spec_action);\n+\tif (rc != 0) {\n+\t\trc = rte_flow_error_set(error, rc,\n+\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,\n+\t\t\t\"Failed to initialise action rule match specification\");\n+\t\tgoto fail_init_match_spec_action;\n+\t}\n+\n+\tctx.type = SFC_FLOW_PARSE_CTX_MAE;\n+\tctx.mae = &ctx_mae;\n+\n+\trc = sfc_flow_parse_pattern(sfc_flow_items, RTE_DIM(sfc_flow_items),\n+\t\t\t\t pattern, &ctx, error);\n+\tif (rc != 0)\n+\t\tgoto fail_parse_pattern;\n+\n+\tspec->match_spec = ctx_mae.match_spec_action;\n+\n+\treturn 0;\n+\n+fail_parse_pattern:\n+\tefx_mae_match_spec_fini(sa->nic, ctx_mae.match_spec_action);\n+\n+fail_init_match_spec_action:\n+\treturn rc;\n+}\ndiff --git a/drivers/net/sfc/sfc_mae.h b/drivers/net/sfc/sfc_mae.h\nindex dd9ca07d15..536dadd092 100644\n--- a/drivers/net/sfc/sfc_mae.h\n+++ b/drivers/net/sfc/sfc_mae.h\n@@ -33,9 +33,19 @@ struct sfc_mae {\n };\n \n struct sfc_adapter;\n+struct sfc_flow_spec;\n+\n+struct sfc_mae_parse_ctx {\n+\tefx_mae_match_spec_t\t\t*match_spec_action;\n+};\n \n int sfc_mae_attach(struct sfc_adapter *sa);\n void sfc_mae_detach(struct sfc_adapter *sa);\n+sfc_flow_cleanup_cb_t sfc_mae_flow_cleanup;\n+int sfc_mae_rule_parse_pattern(struct sfc_adapter *sa,\n+\t\t\t const struct rte_flow_item pattern[],\n+\t\t\t struct sfc_flow_spec_mae *spec,\n+\t\t\t struct rte_flow_error *error);\n \n #ifdef __cplusplus\n }\n", "prefixes": [ "v2", "09/62" ] }