Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/66297/?format=api
{ "id": 66297, "url": "http://patches.dpdk.org/api/patches/66297/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1583405273-14176-7-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": "<1583405273-14176-7-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1583405273-14176-7-git-send-email-arybchenko@solarflare.com", "date": "2020-03-05T10:47:52", "name": "[6/7] net/sfc: generalise flow start and stop path", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6d47561309f002fe4d364e671582be18889e446c", "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/1583405273-14176-7-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 8796, "url": "http://patches.dpdk.org/api/series/8796/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8796", "date": "2020-03-05T10:47:46", "name": "net/sfc: prepare rte_flow to have one more backend", "version": 1, "mbox": "http://patches.dpdk.org/series/8796/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/66297/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/66297/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 3BD1FA0573;\n\tThu, 5 Mar 2020 11:49:09 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id BC4791C02D;\n\tThu, 5 Mar 2020 11:48:15 +0100 (CET)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 45ABD1BFF7\n for <dev@dpdk.org>; Thu, 5 Mar 2020 11:48:09 +0100 (CET)", "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-us4.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n E7ED980005C\n for <dev@dpdk.org>; Thu, 5 Mar 2020 10:48:07 +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.1395.4; Thu, 5 Mar 2020 10:48:01 +0000", "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.1395.4 via Frontend Transport; Thu, 5 Mar 2020 10:48:01 +0000", "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 025Am1oG016229;\n Thu, 5 Mar 2020 10:48:01 GMT", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 6339A161250;\n Thu, 5 Mar 2020 10:48:01 +0000 (GMT)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Ivan Malov <ivan.malov@oktetlabs.ru>", "Date": "Thu, 5 Mar 2020 10:47:52 +0000", "Message-ID": "<1583405273-14176-7-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1583405273-14176-1-git-send-email-arybchenko@solarflare.com>", "References": "<1583405273-14176-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.5.1020-25270.003", "X-TM-AS-Result": "No-0.515900-8.000000-10", "X-TMASE-MatchedRID": "nq5ataBcL0XMdO/aI0cjorsHVDDM5xAPP6Tki+9nU38HZBaLwEXlKIpb\n wG9fIuIT2dHEsrnI/toUH8PmWo2hhRVD58+XxOLjzfqlpbtmcWiVKmGUZ/WnkVxKs73mpQeeo8W\n MkQWv6iXBcIE78YqRWo6HM5rqDwqt9PFWi5kHGuraBcoZ5pK9ANeIwO1z1CB0OAtaW/5nFMReWy\n iXd/GkWY5b6E59CkfsJTsBHl2HKXUPgMP/2kdvWOj9VZxUXI+RhdeYev6ImzWyrFieOBrhBjzcW\n rt/fwYrRcB2ZpPnVjJQ5+rfVDglH5RMZUCEHkRt", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10-0.515900-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1020-25270.003", "X-MDID": "1583405288-z_y0U2rFMT-Q", "Subject": "[dpdk-dev] [PATCH 6/7] net/sfc: generalise flow start and stop path", "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\nAs a preparation step, generalise flow start and stop path using callbacks.\n\nSigned-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/sfc_flow.c | 113 ++++++++++++++++++++++++-------------\n drivers/net/sfc/sfc_flow.h | 6 ++\n 2 files changed, 81 insertions(+), 38 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c\nindex ed91c3cef..b95acff31 100644\n--- a/drivers/net/sfc/sfc_flow.c\n+++ b/drivers/net/sfc/sfc_flow.c\n@@ -26,12 +26,18 @@\n \n struct sfc_flow_ops_by_spec {\n \tsfc_flow_parse_cb_t\t*parse;\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_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.insert = sfc_flow_filter_insert,\n+\t.remove = sfc_flow_filter_remove,\n };\n \n static const struct sfc_flow_ops_by_spec *\n@@ -2379,6 +2385,54 @@ sfc_flow_free(__rte_unused struct sfc_adapter *sa, struct rte_flow *flow)\n \trte_free(flow);\n }\n \n+static int\n+sfc_flow_insert(struct sfc_adapter *sa, struct rte_flow *flow,\n+\t\tstruct rte_flow_error *error)\n+{\n+\tconst struct sfc_flow_ops_by_spec *ops;\n+\tint rc;\n+\n+\tops = sfc_flow_get_ops_by_spec(flow);\n+\tif (ops == NULL || ops->insert == NULL) {\n+\t\trte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,\n+\t\t\t\t \"No backend to handle this flow\");\n+\t\treturn rte_errno;\n+\t}\n+\n+\trc = ops->insert(sa, flow);\n+\tif (rc != 0) {\n+\t\trte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t NULL, \"Failed to insert the flow rule\");\n+\t}\n+\n+\treturn rc;\n+}\n+\n+static int\n+sfc_flow_remove(struct sfc_adapter *sa, struct rte_flow *flow,\n+\t\tstruct rte_flow_error *error)\n+{\n+\tconst struct sfc_flow_ops_by_spec *ops;\n+\tint rc;\n+\n+\tops = sfc_flow_get_ops_by_spec(flow);\n+\tif (ops == NULL || ops->remove == NULL) {\n+\t\trte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,\n+\t\t\t\t \"No backend to handle this flow\");\n+\t\treturn rte_errno;\n+\t}\n+\n+\trc = ops->remove(sa, flow);\n+\tif (rc != 0) {\n+\t\trte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t NULL, \"Failed to remove the flow rule\");\n+\t}\n+\n+\treturn rc;\n+}\n+\n static int\n sfc_flow_validate(struct rte_eth_dev *dev,\n \t\t const struct rte_flow_attr *attr,\n@@ -2425,20 +2479,16 @@ sfc_flow_create(struct rte_eth_dev *dev,\n \tTAILQ_INSERT_TAIL(&sa->flow_list, flow, entries);\n \n \tif (sa->state == SFC_ADAPTER_STARTED) {\n-\t\trc = sfc_flow_filter_insert(sa, flow);\n-\t\tif (rc != 0) {\n-\t\t\trte_flow_error_set(error, rc,\n-\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,\n-\t\t\t\t\"Failed to insert filter\");\n-\t\t\tgoto fail_filter_insert;\n-\t\t}\n+\t\trc = sfc_flow_insert(sa, flow, error);\n+\t\tif (rc != 0)\n+\t\t\tgoto fail_flow_insert;\n \t}\n \n \tsfc_adapter_unlock(sa);\n \n \treturn flow;\n \n-fail_filter_insert:\n+fail_flow_insert:\n \tTAILQ_REMOVE(&sa->flow_list, flow, entries);\n \n fail_bad_value:\n@@ -2449,29 +2499,6 @@ sfc_flow_create(struct rte_eth_dev *dev,\n \treturn NULL;\n }\n \n-static int\n-sfc_flow_remove(struct sfc_adapter *sa,\n-\t\tstruct rte_flow *flow,\n-\t\tstruct rte_flow_error *error)\n-{\n-\tint rc = 0;\n-\n-\tSFC_ASSERT(sfc_adapter_is_locked(sa));\n-\n-\tif (sa->state == SFC_ADAPTER_STARTED) {\n-\t\trc = sfc_flow_filter_remove(sa, flow);\n-\t\tif (rc != 0)\n-\t\t\trte_flow_error_set(error, rc,\n-\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,\n-\t\t\t\t\"Failed to destroy flow rule\");\n-\t}\n-\n-\tTAILQ_REMOVE(&sa->flow_list, flow, entries);\n-\tsfc_flow_free(sa, flow);\n-\n-\treturn rc;\n-}\n-\n static int\n sfc_flow_destroy(struct rte_eth_dev *dev,\n \t\t struct rte_flow *flow,\n@@ -2494,7 +2521,11 @@ sfc_flow_destroy(struct rte_eth_dev *dev,\n \t\tgoto fail_bad_value;\n \t}\n \n-\trc = sfc_flow_remove(sa, flow, error);\n+\tif (sa->state == SFC_ADAPTER_STARTED)\n+\t\trc = sfc_flow_remove(sa, flow, error);\n+\n+\tTAILQ_REMOVE(&sa->flow_list, flow, entries);\n+\tsfc_flow_free(sa, flow);\n \n fail_bad_value:\n \tsfc_adapter_unlock(sa);\n@@ -2508,15 +2539,21 @@ sfc_flow_flush(struct rte_eth_dev *dev,\n {\n \tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n \tstruct rte_flow *flow;\n-\tint rc = 0;\n \tint ret = 0;\n \n \tsfc_adapter_lock(sa);\n \n \twhile ((flow = TAILQ_FIRST(&sa->flow_list)) != NULL) {\n-\t\trc = sfc_flow_remove(sa, flow, error);\n-\t\tif (rc != 0)\n-\t\t\tret = rc;\n+\t\tif (sa->state == SFC_ADAPTER_STARTED) {\n+\t\t\tint rc;\n+\n+\t\t\trc = sfc_flow_remove(sa, flow, error);\n+\t\t\tif (rc != 0)\n+\t\t\t\tret = rc;\n+\t\t}\n+\n+\t\tTAILQ_REMOVE(&sa->flow_list, flow, entries);\n+\t\tsfc_flow_free(sa, flow);\n \t}\n \n \tsfc_adapter_unlock(sa);\n@@ -2583,7 +2620,7 @@ sfc_flow_stop(struct sfc_adapter *sa)\n \tSFC_ASSERT(sfc_adapter_is_locked(sa));\n \n \tTAILQ_FOREACH(flow, &sa->flow_list, entries)\n-\t\tsfc_flow_filter_remove(sa, flow);\n+\t\tsfc_flow_remove(sa, flow, NULL);\n }\n \n int\n@@ -2597,7 +2634,7 @@ sfc_flow_start(struct sfc_adapter *sa)\n \tSFC_ASSERT(sfc_adapter_is_locked(sa));\n \n \tTAILQ_FOREACH(flow, &sa->flow_list, entries) {\n-\t\trc = sfc_flow_filter_insert(sa, flow);\n+\t\trc = sfc_flow_insert(sa, flow, NULL);\n \t\tif (rc != 0)\n \t\t\tgoto fail_bad_flow;\n \t}\ndiff --git a/drivers/net/sfc/sfc_flow.h b/drivers/net/sfc/sfc_flow.h\nindex 19db8fce5..5d87212c1 100644\n--- a/drivers/net/sfc/sfc_flow.h\n+++ b/drivers/net/sfc/sfc_flow.h\n@@ -91,6 +91,12 @@ 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 int (sfc_flow_insert_cb_t)(struct sfc_adapter *sa,\n+\t\t\t\t struct rte_flow *flow);\n+\n+typedef int (sfc_flow_remove_cb_t)(struct sfc_adapter *sa,\n+\t\t\t\t struct rte_flow *flow);\n+\n #ifdef __cplusplus\n }\n #endif\n", "prefixes": [ "6/7" ] }