Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99911/?format=api
{ "id": 99911, "url": "http://patchwork.dpdk.org/api/patches/99911/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20210928112912.785412-8-andrew.rybchenko@oktetlabs.ru/", "project": { "id": 1, "url": "http://patchwork.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": "<20210928112912.785412-8-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210928112912.785412-8-andrew.rybchenko@oktetlabs.ru", "date": "2021-09-28T11:29:08", "name": "[07/11] net/sfc: prepare having no some SW stats on an adapter", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "99e40a7ad611cbc7e5880175569337c47e603ce9", "submitter": { "id": 2013, "url": "http://patchwork.dpdk.org/api/people/2013/?format=api", "name": "Andrew Rybchenko", "email": "Andrew.Rybchenko@oktetlabs.ru" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20210928112912.785412-8-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 19227, "url": "http://patchwork.dpdk.org/api/series/19227/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=19227", "date": "2021-09-28T11:29:01", "name": "net/sfc: support per-queue stats on EF100", "version": 1, "mbox": "http://patchwork.dpdk.org/series/19227/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/99911/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/99911/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 EBE7CA0032;\n\tTue, 28 Sep 2021 13:30:21 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4568E41137;\n\tTue, 28 Sep 2021 13:29:47 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id F1C6C4111A\n for <dev@dpdk.org>; Tue, 28 Sep 2021 13:29:43 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id C34947F6D5; Tue, 28 Sep 2021 14:29:43 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id D0AAE7F6D9;\n Tue, 28 Sep 2021 14:29:31 +0300 (MSK)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.8 required=5.0 tests=ALL_TRUSTED,\n DKIM_ADSP_DISCARD,\n URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2", "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru D0AAE7F6D9", "Authentication-Results": "shelob.oktetlabs.ru/D0AAE7F6D9; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>", "Date": "Tue, 28 Sep 2021 14:29:08 +0300", "Message-Id": "<20210928112912.785412-8-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210928112912.785412-1-andrew.rybchenko@oktetlabs.ru>", "References": "<20210928112912.785412-1-andrew.rybchenko@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 07/11] net/sfc: prepare having no some SW stats\n on an adapter", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>\n\nGlobal description structure of SW stats is used currently.\nFollowing patches introduce SW stats that may be unavailable\nfor some adapters, so add per-adapter descriptions to safely\nwork with multiple adapters.\n\nSigned-off-by: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\n---\n drivers/net/sfc/sfc.h | 7 ++++\n drivers/net/sfc/sfc_sw_stats.c | 65 +++++++++++++++++++++++++---------\n 2 files changed, 55 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex b9ff8baed2..5a40a73c7f 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -217,9 +217,16 @@ struct sfc_counter_rxq {\n \tstruct rte_mempool\t\t*mp;\n };\n \n+struct sfc_sw_stat_data {\n+\tconst struct sfc_sw_stat_descr *descr;\n+};\n+\n struct sfc_sw_stats {\n \t/* Number extended statistics provided by SW stats */\n \tunsigned int\t\t\txstats_count;\n+\t/* Supported SW statistics */\n+\tstruct sfc_sw_stat_data\t\t*supp;\n+\tunsigned int\t\t\tsupp_count;\n \tuint64_t\t\t\t*reset_vals;\n \n \trte_spinlock_t\t\t\tqueues_bitmap_lock;\ndiff --git a/drivers/net/sfc/sfc_sw_stats.c b/drivers/net/sfc/sfc_sw_stats.c\nindex 0f93091500..a9ab29064a 100644\n--- a/drivers/net/sfc/sfc_sw_stats.c\n+++ b/drivers/net/sfc/sfc_sw_stats.c\n@@ -341,6 +341,7 @@ sfc_sw_xstats_get_vals(struct sfc_adapter *sa,\n \t\t unsigned int *nb_supported)\n {\n \tuint64_t *reset_vals = sa->sw_stats.reset_vals;\n+\tstruct sfc_sw_stats *sw_stats = &sa->sw_stats;\n \tunsigned int sw_xstats_offset;\n \tunsigned int i;\n \n@@ -348,8 +349,8 @@ sfc_sw_xstats_get_vals(struct sfc_adapter *sa,\n \n \tsw_xstats_offset = *nb_supported;\n \n-\tfor (i = 0; i < RTE_DIM(sfc_sw_stats_descr); i++) {\n-\t\tsfc_sw_xstat_get_values(sa, &sfc_sw_stats_descr[i], xstats,\n+\tfor (i = 0; i < sw_stats->xstats_count; i++) {\n+\t\tsfc_sw_xstat_get_values(sa, sw_stats->supp[i].descr, xstats,\n \t\t\t\t\txstats_count, nb_written, nb_supported);\n \t}\n \n@@ -366,13 +367,14 @@ sfc_sw_xstats_get_names(struct sfc_adapter *sa,\n \t\t\tunsigned int *nb_written,\n \t\t\tunsigned int *nb_supported)\n {\n+\tstruct sfc_sw_stats *sw_stats = &sa->sw_stats;\n \tunsigned int i;\n \tint ret;\n \n \tsfc_adapter_lock(sa);\n \n-\tfor (i = 0; i < RTE_DIM(sfc_sw_stats_descr); i++) {\n-\t\tret = sfc_sw_stat_get_names(sa, &sfc_sw_stats_descr[i],\n+\tfor (i = 0; i < sw_stats->supp_count; i++) {\n+\t\tret = sfc_sw_stat_get_names(sa, sw_stats->supp[i].descr,\n \t\t\t\t\t xstats_names, xstats_count,\n \t\t\t\t\t nb_written, nb_supported);\n \t\tif (ret != 0) {\n@@ -394,6 +396,7 @@ sfc_sw_xstats_get_vals_by_id(struct sfc_adapter *sa,\n \t\t\t unsigned int *nb_supported)\n {\n \tuint64_t *reset_vals = sa->sw_stats.reset_vals;\n+\tstruct sfc_sw_stats *sw_stats = &sa->sw_stats;\n \tunsigned int sw_xstats_offset;\n \tunsigned int i;\n \n@@ -401,8 +404,8 @@ sfc_sw_xstats_get_vals_by_id(struct sfc_adapter *sa,\n \n \tsw_xstats_offset = *nb_supported;\n \n-\tfor (i = 0; i < RTE_DIM(sfc_sw_stats_descr); i++) {\n-\t\tsfc_sw_xstat_get_values_by_id(sa, &sfc_sw_stats_descr[i], ids,\n+\tfor (i = 0; i < sw_stats->supp_count; i++) {\n+\t\tsfc_sw_xstat_get_values_by_id(sa, sw_stats->supp[i].descr, ids,\n \t\t\t\t\t values, n, nb_supported);\n \t}\n \n@@ -421,13 +424,14 @@ sfc_sw_xstats_get_names_by_id(struct sfc_adapter *sa,\n \t\t\t unsigned int size,\n \t\t\t unsigned int *nb_supported)\n {\n+\tstruct sfc_sw_stats *sw_stats = &sa->sw_stats;\n \tunsigned int i;\n \tint ret;\n \n \tsfc_adapter_lock(sa);\n \n-\tfor (i = 0; i < RTE_DIM(sfc_sw_stats_descr); i++) {\n-\t\tret = sfc_sw_xstat_get_names_by_id(sa, &sfc_sw_stats_descr[i],\n+\tfor (i = 0; i < sw_stats->supp_count; i++) {\n+\t\tret = sfc_sw_xstat_get_names_by_id(sa, sw_stats->supp[i].descr,\n \t\t\t\t\t\t ids, xstats_names, size,\n \t\t\t\t\t\t nb_supported);\n \t\tif (ret != 0) {\n@@ -475,15 +479,15 @@ void\n sfc_sw_xstats_reset(struct sfc_adapter *sa)\n {\n \tuint64_t *reset_vals = sa->sw_stats.reset_vals;\n-\tconst struct sfc_sw_stat_descr *sw_stat;\n+\tstruct sfc_sw_stats *sw_stats = &sa->sw_stats;\n \tunsigned int i;\n \n \tSFC_ASSERT(sfc_adapter_is_locked(sa));\n \n-\tfor (i = 0; i < RTE_DIM(sfc_sw_stats_descr); i++) {\n-\t\tsw_stat = &sfc_sw_stats_descr[i];\n-\t\tsfc_sw_xstat_reset(sa, sw_stat, reset_vals);\n-\t\treset_vals += sfc_sw_xstat_get_nb_supported(sa, sw_stat);\n+\tfor (i = 0; i < sw_stats->supp_count; i++) {\n+\t\tsfc_sw_xstat_reset(sa, sw_stats->supp[i].descr, reset_vals);\n+\t\treset_vals += sfc_sw_xstat_get_nb_supported(sa,\n+\t\t\t\t\t\t sw_stats->supp[i].descr);\n \t}\n }\n \n@@ -491,22 +495,44 @@ int\n sfc_sw_xstats_configure(struct sfc_adapter *sa)\n {\n \tuint64_t **reset_vals = &sa->sw_stats.reset_vals;\n+\tstruct sfc_sw_stats *sw_stats = &sa->sw_stats;\n \tsize_t nb_supported = 0;\n \tunsigned int i;\n+\tint rc;\n+\n+\tsw_stats->supp_count = RTE_DIM(sfc_sw_stats_descr);\n+\tif (sw_stats->supp == NULL) {\n+\t\tsw_stats->supp = rte_malloc(NULL, sw_stats->supp_count *\n+\t\t\t\t\t sizeof(*sw_stats->supp), 0);\n+\t\tif (sw_stats->supp == NULL)\n+\t\t\treturn -ENOMEM;\n+\t}\n+\tfor (i = 0; i < sw_stats->supp_count; i++)\n+\t\tsw_stats->supp[i].descr = &sfc_sw_stats_descr[i];\n \n-\tfor (i = 0; i < RTE_DIM(sfc_sw_stats_descr); i++)\n+\tfor (i = 0; i < sw_stats->supp_count; i++)\n \t\tnb_supported += sfc_sw_xstat_get_nb_supported(sa,\n-\t\t\t\t\t\t\t&sfc_sw_stats_descr[i]);\n+\t\t\t\t\t\t sw_stats->supp[i].descr);\n \tsa->sw_stats.xstats_count = nb_supported;\n \n \t*reset_vals = rte_realloc(*reset_vals,\n \t\t\t\t nb_supported * sizeof(**reset_vals), 0);\n-\tif (*reset_vals == NULL)\n-\t\treturn ENOMEM;\n+\tif (*reset_vals == NULL) {\n+\t\trc = -ENOMEM;\n+\t\tgoto fail_reset_vals;\n+\t}\n \n \tmemset(*reset_vals, 0, nb_supported * sizeof(**reset_vals));\n \n \treturn 0;\n+\n+fail_reset_vals:\n+\tsa->sw_stats.xstats_count = 0;\n+\trte_free(sw_stats->supp);\n+\tsw_stats->supp = NULL;\n+\tsw_stats->supp_count = 0;\n+\n+\treturn rc;\n }\n \n static void\n@@ -552,6 +578,8 @@ int\n sfc_sw_xstats_init(struct sfc_adapter *sa)\n {\n \tsa->sw_stats.xstats_count = 0;\n+\tsa->sw_stats.supp = NULL;\n+\tsa->sw_stats.supp_count = 0;\n \tsa->sw_stats.reset_vals = NULL;\n \n \treturn sfc_sw_xstats_alloc_queues_bitmap(sa);\n@@ -563,5 +591,8 @@ sfc_sw_xstats_close(struct sfc_adapter *sa)\n \tsfc_sw_xstats_free_queues_bitmap(sa);\n \trte_free(sa->sw_stats.reset_vals);\n \tsa->sw_stats.reset_vals = NULL;\n+\trte_free(sa->sw_stats.supp);\n+\tsa->sw_stats.supp = NULL;\n+\tsa->sw_stats.supp_count = 0;\n \tsa->sw_stats.xstats_count = 0;\n }\n", "prefixes": [ "07/11" ] }