Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/81528/?format=api
{ "id": 81528, "url": "http://patches.dpdk.org/api/patches/81528/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1603185222-14831-25-git-send-email-arybchenko@solarflare.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": "<1603185222-14831-25-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1603185222-14831-25-git-send-email-arybchenko@solarflare.com", "date": "2020-10-20T09:13:04", "name": "[v2,24/62] net/sfc: implement flow insert/remove in MAE backend", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "677293c25df30461515762c0da14a50281008874", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.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/1603185222-14831-25-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 13137, "url": "http://patches.dpdk.org/api/series/13137/?format=api", "web_url": "http://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": "http://patches.dpdk.org/series/13137/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/81528/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/81528/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 7558BA04DD;\n\tTue, 20 Oct 2020 11:26:23 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6E48CCF89;\n\tTue, 20 Oct 2020 11:14:47 +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 37A82C7EC\n for <dev@dpdk.org>; Tue, 20 Oct 2020 11:14:11 +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 0860360071 for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:11 +0000 (UTC)", "from us4-mdac16-45.ut7.mdlocal (unknown [10.7.64.27])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 078E98009B\n for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:11 +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 87CC1280050\n for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:10 +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 3DE1C600053\n for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:10 +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:00 +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:00 +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 09K9E0Sw028407;\n Tue, 20 Oct 2020 10:14:00 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 1EF941613A9;\n Tue, 20 Oct 2020 10:14:00 +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:04 +0100", "Message-ID": "<1603185222-14831-25-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-2.982400-8.000000-10", "X-TMASE-MatchedRID": "dVzadZCF5tYlz4C9OtA2e5gGnz93PV93BGwExtNOAA9wkdIrVt8X1ciT\n Wug2C4DNNNN0dk/lb45w5T4Iaj538mJZXQNDzktSGjzBgnFZvQ7DAPSbMWlGt1FbgxCd+zKGPrj\n aiRilgiwMZr+lYNb/8r63P8J12sUXOEtsg517d6TnZxuPj9aY+2BEcY81WiodkaEC8FJraL9EVs\n 72CfOZxwwWw3YfEYiZM28UTYAOM135s5ZGHFKFGFPYbfHD41eOCiTOKJLx+V5PVK5ftmf2maPFj\n JEFr+olwXCBO/GKkVqOhzOa6g8Krc1kOIDM//a900biN6gSpxWpzOixtNvOCnUihSSgJn/Y49tz\n u/xkfOID0yiSYmyK5oxGLNNcqzA5Ci1Ldcdy6zi0LcoC+AhqUoXXmHr+iJs1sqxYnjga4QY83Fq\n 7f38GK0XAdmaT51YyUOfq31Q4JR9nIxZyJs78kg==", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10-2.982400-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25736.003", "X-MDID": "1603185251-L-av07QJ2KbS", "X-PPE-DISP": "1603185251;L-av07QJ2KbS", "Subject": "[dpdk-dev] [PATCH v2 24/62] net/sfc: implement flow insert/remove\n\tin MAE 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\nExercise action set allocation / release and action rule\ninsertion / removal in order to let flow API callers\nactually get created flows functioning.\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 | 5 +-\n drivers/net/sfc/sfc_flow.h | 2 +\n drivers/net/sfc/sfc_mae.c | 108 +++++++++++++++++++++++++++++++++++++\n drivers/net/sfc/sfc_mae.h | 12 +++++\n 4 files changed, 125 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c\nindex f4d53bf770..3af95ac8ee 100644\n--- a/drivers/net/sfc/sfc_flow.c\n+++ b/drivers/net/sfc/sfc_flow.c\n@@ -50,8 +50,8 @@ static const struct sfc_flow_ops_by_spec sfc_flow_ops_mae = {\n \t.parse = sfc_flow_parse_rte_to_mae,\n \t.verify = sfc_mae_flow_verify,\n \t.cleanup = sfc_mae_flow_cleanup,\n-\t.insert = NULL,\n-\t.remove = NULL,\n+\t.insert = sfc_mae_flow_insert,\n+\t.remove = sfc_mae_flow_remove,\n };\n \n static const struct sfc_flow_ops_by_spec *\n@@ -1202,6 +1202,7 @@ sfc_flow_parse_attr(struct sfc_adapter *sa,\n \t\tspec_mae->priority = attr->priority;\n \t\tspec_mae->match_spec = NULL;\n \t\tspec_mae->action_set = NULL;\n+\t\tspec_mae->rule_id.id = EFX_MAE_RSRC_ID_INVALID;\n \t}\n \n \treturn 0;\ndiff --git a/drivers/net/sfc/sfc_flow.h b/drivers/net/sfc/sfc_flow.h\nindex 7d15f47e60..d3bdbd5f75 100644\n--- a/drivers/net/sfc/sfc_flow.h\n+++ b/drivers/net/sfc/sfc_flow.h\n@@ -67,6 +67,8 @@ struct sfc_flow_spec_mae {\n \tefx_mae_match_spec_t\t\t*match_spec;\n \t/* Action set registry entry */\n \tstruct sfc_mae_action_set\t*action_set;\n+\t/* Firmware-allocated rule ID */\n+\tefx_mae_rule_id_t\t\trule_id;\n };\n \n /* Flow specification */\ndiff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c\nindex 057eef537b..ea15ccaedb 100644\n--- a/drivers/net/sfc/sfc_mae.c\n+++ b/drivers/net/sfc/sfc_mae.c\n@@ -113,6 +113,8 @@ sfc_mae_action_set_add(struct sfc_adapter *sa,\n \taction_set->refcnt = 1;\n \taction_set->spec = spec;\n \n+\taction_set->fw_rsrc.aset_id.id = EFX_MAE_RSRC_ID_INVALID;\n+\n \tTAILQ_INSERT_TAIL(&mae->action_sets, action_set, entries);\n \n \t*action_setp = action_set;\n@@ -134,11 +136,62 @@ sfc_mae_action_set_del(struct sfc_adapter *sa,\n \tif (action_set->refcnt != 0)\n \t\treturn;\n \n+\tSFC_ASSERT(action_set->fw_rsrc.aset_id.id == EFX_MAE_RSRC_ID_INVALID);\n+\tSFC_ASSERT(action_set->fw_rsrc.refcnt == 0);\n+\n \tefx_mae_action_set_spec_fini(sa->nic, action_set->spec);\n \tTAILQ_REMOVE(&mae->action_sets, action_set, entries);\n \trte_free(action_set);\n }\n \n+static int\n+sfc_mae_action_set_enable(struct sfc_adapter *sa,\n+\t\t\t struct sfc_mae_action_set *action_set)\n+{\n+\tstruct sfc_mae_fw_rsrc *fw_rsrc = &action_set->fw_rsrc;\n+\tint rc;\n+\n+\tSFC_ASSERT(sfc_adapter_is_locked(sa));\n+\n+\tif (fw_rsrc->refcnt == 0) {\n+\t\tSFC_ASSERT(fw_rsrc->aset_id.id == EFX_MAE_RSRC_ID_INVALID);\n+\t\tSFC_ASSERT(action_set->spec != NULL);\n+\n+\t\trc = efx_mae_action_set_alloc(sa->nic, action_set->spec,\n+\t\t\t\t\t &fw_rsrc->aset_id);\n+\t\tif (rc != 0)\n+\t\t\treturn rc;\n+\t}\n+\n+\t++(fw_rsrc->refcnt);\n+\n+\treturn 0;\n+}\n+\n+static int\n+sfc_mae_action_set_disable(struct sfc_adapter *sa,\n+\t\t\t struct sfc_mae_action_set *action_set)\n+{\n+\tstruct sfc_mae_fw_rsrc *fw_rsrc = &action_set->fw_rsrc;\n+\tint rc;\n+\n+\tSFC_ASSERT(sfc_adapter_is_locked(sa));\n+\tSFC_ASSERT(fw_rsrc->aset_id.id != EFX_MAE_RSRC_ID_INVALID);\n+\tSFC_ASSERT(fw_rsrc->refcnt != 0);\n+\n+\tif (fw_rsrc->refcnt == 1) {\n+\t\trc = efx_mae_action_set_free(sa->nic, &fw_rsrc->aset_id);\n+\t\tif (rc != 0)\n+\t\t\treturn rc;\n+\n+\t\tfw_rsrc->aset_id.id = EFX_MAE_RSRC_ID_INVALID;\n+\t}\n+\n+\t--(fw_rsrc->refcnt);\n+\n+\treturn 0;\n+}\n+\n void\n sfc_mae_flow_cleanup(struct sfc_adapter *sa,\n \t\t struct rte_flow *flow)\n@@ -156,6 +209,8 @@ sfc_mae_flow_cleanup(struct sfc_adapter *sa,\n \n \tspec_mae = &spec->mae;\n \n+\tSFC_ASSERT(spec_mae->rule_id.id == EFX_MAE_RSRC_ID_INVALID);\n+\n \tif (spec_mae->action_set != NULL)\n \t\tsfc_mae_action_set_del(sa, spec_mae->action_set);\n \n@@ -563,3 +618,56 @@ sfc_mae_flow_verify(struct sfc_adapter *sa,\n \n \treturn sfc_mae_action_rule_class_verify(sa, spec_mae);\n }\n+\n+int\n+sfc_mae_flow_insert(struct sfc_adapter *sa,\n+\t\t struct rte_flow *flow)\n+{\n+\tstruct sfc_flow_spec *spec = &flow->spec;\n+\tstruct sfc_flow_spec_mae *spec_mae = &spec->mae;\n+\tstruct sfc_mae_action_set *action_set = spec_mae->action_set;\n+\tstruct sfc_mae_fw_rsrc *fw_rsrc = &action_set->fw_rsrc;\n+\tint rc;\n+\n+\tSFC_ASSERT(spec_mae->rule_id.id == EFX_MAE_RSRC_ID_INVALID);\n+\tSFC_ASSERT(action_set != NULL);\n+\n+\trc = sfc_mae_action_set_enable(sa, action_set);\n+\tif (rc != 0)\n+\t\tgoto fail_action_set_enable;\n+\n+\trc = efx_mae_action_rule_insert(sa->nic, spec_mae->match_spec,\n+\t\t\t\t\tNULL, &fw_rsrc->aset_id,\n+\t\t\t\t\t&spec_mae->rule_id);\n+\tif (rc != 0)\n+\t\tgoto fail_action_rule_insert;\n+\n+\treturn 0;\n+\n+fail_action_rule_insert:\n+\t(void)sfc_mae_action_set_disable(sa, action_set);\n+\n+fail_action_set_enable:\n+\treturn rc;\n+}\n+\n+int\n+sfc_mae_flow_remove(struct sfc_adapter *sa,\n+\t\t struct rte_flow *flow)\n+{\n+\tstruct sfc_flow_spec *spec = &flow->spec;\n+\tstruct sfc_flow_spec_mae *spec_mae = &spec->mae;\n+\tstruct sfc_mae_action_set *action_set = spec_mae->action_set;\n+\tint rc;\n+\n+\tSFC_ASSERT(spec_mae->rule_id.id != EFX_MAE_RSRC_ID_INVALID);\n+\tSFC_ASSERT(action_set != NULL);\n+\n+\trc = efx_mae_action_rule_remove(sa->nic, &spec_mae->rule_id);\n+\tif (rc != 0)\n+\t\treturn rc;\n+\n+\tspec_mae->rule_id.id = EFX_MAE_RSRC_ID_INVALID;\n+\n+\treturn sfc_mae_action_set_disable(sa, action_set);\n+}\ndiff --git a/drivers/net/sfc/sfc_mae.h b/drivers/net/sfc/sfc_mae.h\nindex 1ef582e82b..d9f0ee3cbc 100644\n--- a/drivers/net/sfc/sfc_mae.h\n+++ b/drivers/net/sfc/sfc_mae.h\n@@ -18,11 +18,21 @@\n extern \"C\" {\n #endif\n \n+/** FW-allocatable resource context */\n+struct sfc_mae_fw_rsrc {\n+\tunsigned int\t\t\trefcnt;\n+\tRTE_STD_C11\n+\tunion {\n+\t\tefx_mae_aset_id_t\taset_id;\n+\t};\n+};\n+\n /** Action set registry entry */\n struct sfc_mae_action_set {\n \tTAILQ_ENTRY(sfc_mae_action_set)\tentries;\n \tunsigned int\t\t\trefcnt;\n \tefx_mae_actions_t\t\t*spec;\n+\tstruct sfc_mae_fw_rsrc\t\tfw_rsrc;\n };\n \n TAILQ_HEAD(sfc_mae_action_sets, sfc_mae_action_set);\n@@ -63,6 +73,8 @@ int sfc_mae_rule_parse_actions(struct sfc_adapter *sa,\n \t\t\t struct sfc_mae_action_set **action_setp,\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 \n #ifdef __cplusplus\n }\n", "prefixes": [ "v2", "24/62" ] }