Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/128306/?format=api
{ "id": 128306, "url": "http://patches.dpdk.org/api/patches/128306/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230607130245.8048-18-ivan.malov@arknetworks.am/", "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": "<20230607130245.8048-18-ivan.malov@arknetworks.am>", "list_archive_url": "https://inbox.dpdk.org/dev/20230607130245.8048-18-ivan.malov@arknetworks.am", "date": "2023-06-07T13:02:28", "name": "[v4,17/34] net/sfc: move MAE flow parsing method to MAE-specific source", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "7f961e20a1f24fa97857a361a1ad8979b248554c", "submitter": { "id": 2962, "url": "http://patches.dpdk.org/api/people/2962/?format=api", "name": "Ivan Malov", "email": "ivan.malov@arknetworks.am" }, "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/20230607130245.8048-18-ivan.malov@arknetworks.am/mbox/", "series": [ { "id": 28390, "url": "http://patches.dpdk.org/api/series/28390/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=28390", "date": "2023-06-07T13:02:11", "name": "net/sfc: support HW conntrack assistance", "version": 4, "mbox": "http://patches.dpdk.org/series/28390/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/128306/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/128306/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 9129242C4D;\n\tWed, 7 Jun 2023 15:05:25 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 8FE0C42DAA;\n\tWed, 7 Jun 2023 15:03:08 +0200 (CEST)", "from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80])\n by mails.dpdk.org (Postfix) with ESMTP id 90444410F2\n for <dev@dpdk.org>; Wed, 7 Jun 2023 15:02:56 +0200 (CEST)", "from localhost.localdomain (unknown [78.109.69.83])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by agw.arknetworks.am (Postfix) with ESMTPSA id 1C12DE12C3;\n Wed, 7 Jun 2023 17:02:56 +0400 (+04)" ], "From": "Ivan Malov <ivan.malov@arknetworks.am>", "To": "dev@dpdk.org", "Cc": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Ferruh Yigit <ferruh.yigit@amd.com>, Andy Moreton <amoreton@xilinx.com>", "Subject": "[PATCH v4 17/34] net/sfc: move MAE flow parsing method to\n MAE-specific source", "Date": "Wed, 7 Jun 2023 17:02:28 +0400", "Message-Id": "<20230607130245.8048-18-ivan.malov@arknetworks.am>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20230607130245.8048-1-ivan.malov@arknetworks.am>", "References": "<20230601195538.8265-1-ivan.malov@arknetworks.am>\n <20230607130245.8048-1-ivan.malov@arknetworks.am>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "Doing so will facilitate easier code restructure in the next\npatches required to rework flow housekeeping and indirection.\n\nSigned-off-by: Ivan Malov <ivan.malov@arknetworks.am>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/net/sfc/sfc_flow.c | 47 +-----------------------------\n drivers/net/sfc/sfc_mae.c | 58 ++++++++++++++++++++++++++++++++++++--\n drivers/net/sfc/sfc_mae.h | 14 ++++-----\n 3 files changed, 63 insertions(+), 56 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c\nindex f6d1ae2a5b..6dfbbfd022 100644\n--- a/drivers/net/sfc/sfc_flow.c\n+++ b/drivers/net/sfc/sfc_flow.c\n@@ -2395,53 +2395,8 @@ sfc_flow_parse_rte_to_mae(struct rte_eth_dev *dev,\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-\t/*\n-\t * If the flow is meant to be a TUNNEL rule in a FT context,\n-\t * preparse its actions and save its properties in spec_mae.\n-\t */\n-\trc = sfc_ft_tunnel_rule_detect(sa, actions, spec_mae, error);\n-\tif (rc != 0)\n-\t\tgoto fail;\n-\n-\trc = sfc_mae_rule_parse_pattern(sa, pattern, flow, error);\n-\tif (rc != 0)\n-\t\tgoto fail;\n-\n-\tif (spec_mae->ft_rule_type == SFC_FT_RULE_TUNNEL) {\n-\t\t/*\n-\t\t * By design, this flow should be represented solely by the\n-\t\t * outer rule. But the HW/FW hasn't got support for setting\n-\t\t * Rx mark from RECIRC_ID on outer rule lookup yet. Neither\n-\t\t * does it support outer rule counters. As a workaround, an\n-\t\t * action rule of lower priority is used to do the job.\n-\t\t *\n-\t\t * So don't skip sfc_mae_rule_parse_actions() below.\n-\t\t */\n-\t}\n-\n-\trc = sfc_mae_rule_parse_actions(sa, actions, flow, error);\n-\tif (rc != 0)\n-\t\tgoto fail;\n-\n-\tif (spec_mae->ft_ctx != NULL) {\n-\t\tif (spec_mae->ft_rule_type == SFC_FT_RULE_TUNNEL)\n-\t\t\tspec_mae->ft_ctx->tunnel_rule_is_set = B_TRUE;\n \n-\t\t++(spec_mae->ft_ctx->refcnt);\n-\t}\n-\n-\treturn 0;\n-\n-fail:\n-\t/* Reset these values to avoid confusing sfc_mae_flow_cleanup(). */\n-\tspec_mae->ft_rule_type = SFC_FT_RULE_NONE;\n-\tspec_mae->ft_ctx = NULL;\n-\n-\treturn rc;\n+\treturn sfc_mae_rule_parse(sa, pattern, actions, flow, error);\n }\n \n static int\ndiff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c\nindex 51b2a22357..e2f098ea53 100644\n--- a/drivers/net/sfc/sfc_mae.c\n+++ b/drivers/net/sfc/sfc_mae.c\n@@ -2745,7 +2745,7 @@ sfc_mae_rule_encap_parse_fini(struct sfc_adapter *sa,\n \t\tefx_mae_match_spec_fini(sa->nic, ctx->match_spec_outer);\n }\n \n-int\n+static 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 rte_flow *flow,\n@@ -3770,7 +3770,7 @@ sfc_mae_process_encap_header(struct sfc_adapter *sa,\n \treturn sfc_mae_encap_header_add(sa, bounce_eh, encap_headerp);\n }\n \n-int\n+static int\n sfc_mae_rule_parse_actions(struct sfc_adapter *sa,\n \t\t\t const struct rte_flow_action actions[],\n \t\t\t struct rte_flow *flow,\n@@ -3933,6 +3933,60 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa,\n \treturn rc;\n }\n \n+int\n+sfc_mae_rule_parse(struct sfc_adapter *sa, const struct rte_flow_item pattern[],\n+\t\t const struct rte_flow_action actions[],\n+\t\t struct rte_flow *flow, struct rte_flow_error *error)\n+{\n+\tstruct sfc_flow_spec *spec = &flow->spec;\n+\tstruct sfc_flow_spec_mae *spec_mae = &spec->mae;\n+\tint rc;\n+\n+\t/*\n+\t * If the flow is meant to be a TUNNEL rule in a FT context,\n+\t * preparse its actions and save its properties in spec_mae.\n+\t */\n+\trc = sfc_ft_tunnel_rule_detect(sa, actions, spec_mae, error);\n+\tif (rc != 0)\n+\t\tgoto fail;\n+\n+\trc = sfc_mae_rule_parse_pattern(sa, pattern, flow, error);\n+\tif (rc != 0)\n+\t\tgoto fail;\n+\n+\tif (spec_mae->ft_rule_type == SFC_FT_RULE_TUNNEL) {\n+\t\t/*\n+\t\t * By design, this flow should be represented solely by the\n+\t\t * outer rule. But the HW/FW hasn't got support for setting\n+\t\t * Rx mark from RECIRC_ID on outer rule lookup yet. Neither\n+\t\t * does it support outer rule counters. As a workaround, an\n+\t\t * action rule of lower priority is used to do the job.\n+\t\t *\n+\t\t * So don't skip sfc_mae_rule_parse_actions() below.\n+\t\t */\n+\t}\n+\n+\trc = sfc_mae_rule_parse_actions(sa, actions, flow, error);\n+\tif (rc != 0)\n+\t\tgoto fail;\n+\n+\tif (spec_mae->ft_ctx != NULL) {\n+\t\tif (spec_mae->ft_rule_type == SFC_FT_RULE_TUNNEL)\n+\t\t\tspec_mae->ft_ctx->tunnel_rule_is_set = B_TRUE;\n+\n+\t\t++(spec_mae->ft_ctx->refcnt);\n+\t}\n+\n+\treturn 0;\n+\n+fail:\n+\t/* Reset these values to avoid confusing sfc_mae_flow_cleanup(). */\n+\tspec_mae->ft_rule_type = SFC_FT_RULE_NONE;\n+\tspec_mae->ft_ctx = NULL;\n+\n+\treturn rc;\n+}\n+\n static bool\n sfc_mae_rules_class_cmp(struct sfc_adapter *sa,\n \t\t\tconst efx_mae_match_spec_t *left,\ndiff --git a/drivers/net/sfc/sfc_mae.h b/drivers/net/sfc/sfc_mae.h\nindex f9434e1ab6..1d937c9b5b 100644\n--- a/drivers/net/sfc/sfc_mae.h\n+++ b/drivers/net/sfc/sfc_mae.h\n@@ -345,15 +345,13 @@ struct sfc_mae_parse_ctx {\n \n int sfc_mae_attach(struct sfc_adapter *sa);\n void sfc_mae_detach(struct sfc_adapter *sa);\n+\n+int sfc_mae_rule_parse(struct sfc_adapter *sa,\n+\t\t const struct rte_flow_item pattern[],\n+\t\t const struct rte_flow_action actions[],\n+\t\t struct rte_flow *flow, struct rte_flow_error *error);\n+\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 rte_flow *flow,\n-\t\t\t struct rte_flow_error *error);\n-int sfc_mae_rule_parse_actions(struct sfc_adapter *sa,\n-\t\t\t const struct rte_flow_action actions[],\n-\t\t\t struct rte_flow *flow,\n-\t\t\t struct rte_flow_error *error);\n sfc_flow_verify_cb_t sfc_mae_flow_verify;\n sfc_flow_insert_cb_t sfc_mae_flow_insert;\n sfc_flow_remove_cb_t sfc_mae_flow_remove;\n", "prefixes": [ "v4", "17/34" ] }