Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/127901/?format=api
{ "id": 127901, "url": "https://patches.dpdk.org/api/patches/127901/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230601195538.8265-29-ivan.malov@arknetworks.am/", "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": "<20230601195538.8265-29-ivan.malov@arknetworks.am>", "list_archive_url": "https://inbox.dpdk.org/dev/20230601195538.8265-29-ivan.malov@arknetworks.am", "date": "2023-06-01T19:55:32", "name": "[28/34] net/sfc: rename SW structures used by transfer flow counters", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e08a6ed9be308f53aeb60182c19f3791ed090384", "submitter": { "id": 2962, "url": "https://patches.dpdk.org/api/people/2962/?format=api", "name": "Ivan Malov", "email": "ivan.malov@arknetworks.am" }, "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/20230601195538.8265-29-ivan.malov@arknetworks.am/mbox/", "series": [ { "id": 28307, "url": "https://patches.dpdk.org/api/series/28307/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=28307", "date": "2023-06-01T19:55:04", "name": "net/sfc: support HW conntrack assistance", "version": 1, "mbox": "https://patches.dpdk.org/series/28307/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/127901/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/127901/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 C8AB142C07;\n\tThu, 1 Jun 2023 21:58:46 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B873F42FF0;\n\tThu, 1 Jun 2023 21:56:16 +0200 (CEST)", "from agw.arknetworks.am (agw.arknetworks.am [79.141.165.80])\n by mails.dpdk.org (Postfix) with ESMTP id 8D64A42D86\n for <dev@dpdk.org>; Thu, 1 Jun 2023 21:55:56 +0200 (CEST)", "from localhost.localdomain (unknown [78.109.69.146])\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 1F3D2E1B68;\n Thu, 1 Jun 2023 23:55: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 28/34] net/sfc: rename SW structures used by transfer flow\n counters", "Date": "Thu, 1 Jun 2023 23:55:32 +0400", "Message-Id": "<20230601195538.8265-29-ivan.malov@arknetworks.am>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20230601195538.8265-1-ivan.malov@arknetworks.am>", "References": "<20230601195538.8265-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 facilitates rearrangements of the next patch needed\nto make software counter objects shareable across many flows.\n\nSigned-off-by: Ivan Malov <ivan.malov@arknetworks.am>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/net/sfc/sfc_mae.c | 14 +++++++-------\n drivers/net/sfc/sfc_mae.h | 14 +++++++-------\n drivers/net/sfc/sfc_mae_counter.c | 31 ++++++++++++++++---------------\n drivers/net/sfc/sfc_mae_counter.h | 16 ++++++++--------\n 4 files changed, 38 insertions(+), 37 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c\nindex c03a43c6dd..98cc60e04d 100644\n--- a/drivers/net/sfc/sfc_mae.c\n+++ b/drivers/net/sfc/sfc_mae.c\n@@ -151,7 +151,7 @@ sfc_mae_attach(struct sfc_adapter *sa)\n \t\tif (rc != 0)\n \t\t\tgoto fail_mae_get_limits;\n \n-\t\tsfc_log_init(sa, \"init MAE counter registry\");\n+\t\tsfc_log_init(sa, \"init MAE counter record registry\");\n \t\trc = sfc_mae_counter_registry_init(&mae->counter_registry,\n \t\t\t\t\t\t limits.eml_max_n_counters);\n \t\tif (rc != 0) {\n@@ -817,7 +817,7 @@ sfc_mae_encap_header_disable(struct sfc_adapter *sa,\n \n static int\n sfc_mae_counters_enable(struct sfc_adapter *sa,\n-\t\t\tstruct sfc_mae_counter_id *counters,\n+\t\t\tstruct sfc_mae_counter *counters,\n \t\t\tunsigned int n_counters,\n \t\t\tefx_mae_actions_t *action_set_spec)\n {\n@@ -833,7 +833,7 @@ sfc_mae_counters_enable(struct sfc_adapter *sa,\n \tSFC_ASSERT(sfc_adapter_is_locked(sa));\n \tSFC_ASSERT(n_counters == 1);\n \n-\trc = sfc_mae_counter_enable(sa, &counters[0]);\n+\trc = sfc_mae_counter_fw_rsrc_enable(sa, &counters[0]);\n \tif (rc != 0) {\n \t\tsfc_err(sa, \"failed to enable MAE counter %u: %s\",\n \t\t\tcounters[0].mae_id.id, rte_strerror(rc));\n@@ -851,7 +851,7 @@ sfc_mae_counters_enable(struct sfc_adapter *sa,\n \treturn 0;\n \n fail_fill_in_id:\n-\t(void)sfc_mae_counter_disable(sa, &counters[0]);\n+\t(void)sfc_mae_counter_fw_rsrc_disable(sa, &counters[0]);\n \n fail_counter_add:\n \tsfc_log_init(sa, \"failed: %s\", rte_strerror(rc));\n@@ -860,7 +860,7 @@ sfc_mae_counters_enable(struct sfc_adapter *sa,\n \n static int\n sfc_mae_counters_disable(struct sfc_adapter *sa,\n-\t\t\t struct sfc_mae_counter_id *counters,\n+\t\t\t struct sfc_mae_counter *counters,\n \t\t\t unsigned int n_counters)\n {\n \tif (n_counters == 0)\n@@ -874,7 +874,7 @@ sfc_mae_counters_disable(struct sfc_adapter *sa,\n \t\treturn EALREADY;\n \t}\n \n-\treturn sfc_mae_counter_disable(sa, &counters[0]);\n+\treturn sfc_mae_counter_fw_rsrc_disable(sa, &counters[0]);\n }\n \n struct sfc_mae_aset_ctx {\n@@ -1039,7 +1039,7 @@ sfc_mae_action_set_enable(struct sfc_adapter *sa,\n \tstruct sfc_mae_encap_header *encap_header;\n \tstruct sfc_mae_mac_addr *dst_mac_addr;\n \tstruct sfc_mae_mac_addr *src_mac_addr;\n-\tstruct sfc_mae_counter_id *counters;\n+\tstruct sfc_mae_counter *counters;\n \tstruct sfc_mae_fw_rsrc *fw_rsrc;\n \tint rc;\n \ndiff --git a/drivers/net/sfc/sfc_mae.h b/drivers/net/sfc/sfc_mae.h\nindex 67fa2ca5c9..7337fcf14d 100644\n--- a/drivers/net/sfc/sfc_mae.h\n+++ b/drivers/net/sfc/sfc_mae.h\n@@ -68,7 +68,7 @@ struct sfc_mae_encap_header {\n TAILQ_HEAD(sfc_mae_encap_headers, sfc_mae_encap_header);\n \n /* Counter ID */\n-struct sfc_mae_counter_id {\n+struct sfc_mae_counter {\n \t/* ID of a counter in MAE */\n \tefx_counter_t\t\t\tmae_id;\n \t/* ID of a counter in RTE */\n@@ -86,7 +86,7 @@ struct sfc_mae_counter_id {\n struct sfc_mae_action_set {\n \tTAILQ_ENTRY(sfc_mae_action_set)\tentries;\n \tunsigned int\t\t\trefcnt;\n-\tstruct sfc_mae_counter_id\t*counters;\n+\tstruct sfc_mae_counter\t\t*counters;\n \tuint32_t\t\t\tn_counters;\n \tefx_mae_actions_t\t\t*spec;\n \tstruct sfc_mae_encap_header\t*encap_header;\n@@ -129,7 +129,7 @@ struct sfc_mae_bounce_eh {\n };\n \n /** Counter collection entry */\n-struct sfc_mae_counter {\n+struct sfc_mae_counter_record {\n \tbool\t\t\t\tinuse;\n \tuint32_t\t\t\tgeneration_count;\n \tunion sfc_pkts_bytes\t\tvalue;\n@@ -143,9 +143,9 @@ struct sfc_mae_counters_xstats {\n \tuint64_t\t\t\trealloc_update;\n };\n \n-struct sfc_mae_counters {\n+struct sfc_mae_counter_records {\n \t/** An array of all MAE counters */\n-\tstruct sfc_mae_counter\t\t*mae_counters;\n+\tstruct sfc_mae_counter_record\t*mae_counters;\n \t/** Extra statistics for counters */\n \tstruct sfc_mae_counters_xstats\txstats;\n \t/** Count of all MAE counters */\n@@ -162,7 +162,7 @@ enum sfc_mae_counter_polling_mode {\n struct sfc_mae_counter_registry {\n \t/* Common counter information */\n \t/** Counters collection */\n-\tstruct sfc_mae_counters\t\tcounters;\n+\tstruct sfc_mae_counter_records\tcounters;\n \n \t/* Information used by counter update service */\n \t/** Callback to get packets from RxQ */\n@@ -219,7 +219,7 @@ struct sfc_mae {\n \tstruct sfc_mae_bounce_eh\tbounce_eh;\n \t/** Flag indicating whether counter-only RxQ is running */\n \tbool\t\t\t\tcounter_rxq_running;\n-\t/** Counter registry */\n+\t/** Counter record registry */\n \tstruct sfc_mae_counter_registry\tcounter_registry;\n \t/**\n \t * Switchdev default rules. They forward traffic from PHY port\ndiff --git a/drivers/net/sfc/sfc_mae_counter.c b/drivers/net/sfc/sfc_mae_counter.c\nindex 818b4dad4a..8170175991 100644\n--- a/drivers/net/sfc/sfc_mae_counter.c\n+++ b/drivers/net/sfc/sfc_mae_counter.c\n@@ -76,12 +76,12 @@ sfc_mae_counter_rxq_required(struct sfc_adapter *sa)\n }\n \n int\n-sfc_mae_counter_enable(struct sfc_adapter *sa,\n-\t\t struct sfc_mae_counter_id *counterp)\n+sfc_mae_counter_fw_rsrc_enable(struct sfc_adapter *sa,\n+\t\t\t struct sfc_mae_counter *counterp)\n {\n \tstruct sfc_mae_counter_registry *reg = &sa->mae.counter_registry;\n-\tstruct sfc_mae_counters *counters = ®->counters;\n-\tstruct sfc_mae_counter *p;\n+\tstruct sfc_mae_counter_records *counters = ®->counters;\n+\tstruct sfc_mae_counter_record *p;\n \tefx_counter_t mae_counter;\n \tuint32_t generation_count;\n \tuint32_t unused;\n@@ -147,12 +147,12 @@ sfc_mae_counter_enable(struct sfc_adapter *sa,\n }\n \n int\n-sfc_mae_counter_disable(struct sfc_adapter *sa,\n-\t\t\tstruct sfc_mae_counter_id *counter)\n+sfc_mae_counter_fw_rsrc_disable(struct sfc_adapter *sa,\n+\t\t\t\tstruct sfc_mae_counter *counter)\n {\n \tstruct sfc_mae_counter_registry *reg = &sa->mae.counter_registry;\n-\tstruct sfc_mae_counters *counters = ®->counters;\n-\tstruct sfc_mae_counter *p;\n+\tstruct sfc_mae_counter_records *counters = ®->counters;\n+\tstruct sfc_mae_counter_record *p;\n \tuint32_t unused;\n \tint rc;\n \n@@ -189,12 +189,13 @@ sfc_mae_counter_disable(struct sfc_adapter *sa,\n \n static void\n sfc_mae_counter_increment(struct sfc_adapter *sa,\n-\t\t\t struct sfc_mae_counters *counters,\n+\t\t\t struct sfc_mae_counter_records *counters,\n \t\t\t uint32_t mae_counter_id,\n \t\t\t uint32_t generation_count,\n \t\t\t uint64_t pkts, uint64_t bytes)\n {\n-\tstruct sfc_mae_counter *p = &counters->mae_counters[mae_counter_id];\n+\tstruct sfc_mae_counter_record *p =\n+\t\t&counters->mae_counters[mae_counter_id];\n \tstruct sfc_mae_counters_xstats *xstats = &counters->xstats;\n \tunion sfc_pkts_bytes cnt_val;\n \tbool inuse;\n@@ -667,7 +668,7 @@ sfc_mae_counter_thread_spawn(struct sfc_adapter *sa,\n }\n \n int\n-sfc_mae_counters_init(struct sfc_mae_counters *counters,\n+sfc_mae_counters_init(struct sfc_mae_counter_records *counters,\n \t\t uint32_t nb_counters_max)\n {\n \tint rc;\n@@ -691,7 +692,7 @@ sfc_mae_counters_init(struct sfc_mae_counters *counters,\n }\n \n void\n-sfc_mae_counters_fini(struct sfc_mae_counters *counters)\n+sfc_mae_counters_fini(struct sfc_mae_counter_records *counters)\n {\n \trte_free(counters->mae_counters);\n \tcounters->mae_counters = NULL;\n@@ -942,13 +943,13 @@ sfc_mae_counter_start(struct sfc_adapter *sa)\n }\n \n int\n-sfc_mae_counter_get(struct sfc_mae_counters *counters,\n-\t\t const struct sfc_mae_counter_id *counter,\n+sfc_mae_counter_get(struct sfc_mae_counter_records *counters,\n+\t\t const struct sfc_mae_counter *counter,\n \t\t struct rte_flow_query_count *data)\n {\n \tstruct sfc_ft_ctx *ft_ctx = counter->ft_ctx;\n \tuint64_t non_reset_tunnel_hit_counter;\n-\tstruct sfc_mae_counter *p;\n+\tstruct sfc_mae_counter_record *p;\n \tunion sfc_pkts_bytes value;\n \n \tSFC_ASSERT(counter->mae_id.id < counters->n_mae_counters);\ndiff --git a/drivers/net/sfc/sfc_mae_counter.h b/drivers/net/sfc/sfc_mae_counter.h\nindex 28d70f7d69..9c6d8103ac 100644\n--- a/drivers/net/sfc/sfc_mae_counter.h\n+++ b/drivers/net/sfc/sfc_mae_counter.h\n@@ -38,15 +38,15 @@ void sfc_mae_counter_rxq_detach(struct sfc_adapter *sa);\n int sfc_mae_counter_rxq_init(struct sfc_adapter *sa);\n void sfc_mae_counter_rxq_fini(struct sfc_adapter *sa);\n \n-int sfc_mae_counters_init(struct sfc_mae_counters *counters,\n+int sfc_mae_counters_init(struct sfc_mae_counter_records *counters,\n \t\t\t uint32_t nb_counters_max);\n-void sfc_mae_counters_fini(struct sfc_mae_counters *counters);\n-int sfc_mae_counter_enable(struct sfc_adapter *sa,\n-\t\t\t struct sfc_mae_counter_id *counterp);\n-int sfc_mae_counter_disable(struct sfc_adapter *sa,\n-\t\t\t struct sfc_mae_counter_id *counter);\n-int sfc_mae_counter_get(struct sfc_mae_counters *counters,\n-\t\t\tconst struct sfc_mae_counter_id *counter,\n+void sfc_mae_counters_fini(struct sfc_mae_counter_records *counters);\n+int sfc_mae_counter_fw_rsrc_enable(struct sfc_adapter *sa,\n+\t\t\t\t struct sfc_mae_counter *counterp);\n+int sfc_mae_counter_fw_rsrc_disable(struct sfc_adapter *sa,\n+\t\t\t\t struct sfc_mae_counter *counter);\n+int sfc_mae_counter_get(struct sfc_mae_counter_records *counters,\n+\t\t\tconst struct sfc_mae_counter *counter,\n \t\t\tstruct rte_flow_query_count *data);\n \n int sfc_mae_counter_start(struct sfc_adapter *sa);\n", "prefixes": [ "28/34" ] }