Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99913/?format=api
{ "id": 99913, "url": "http://patchwork.dpdk.org/api/patches/99913/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20210928112912.785412-10-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-10-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210928112912.785412-10-andrew.rybchenko@oktetlabs.ru", "date": "2021-09-28T11:29:10", "name": "[09/11] net/sfc: add support for SW stats groups", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "2b0bc4b2393ad9ceeb6a0b6cf1d02727d86e03da", "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-10-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/99913/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/99913/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 10AB7A0032;\n\tTue, 28 Sep 2021 13:30:34 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7E4ED4113F;\n\tTue, 28 Sep 2021 13:29:52 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id B2935410DF\n for <dev@dpdk.org>; Tue, 28 Sep 2021 13:29:48 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id 47A437F6DE; Tue, 28 Sep 2021 14:29:48 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id 1CDEF7F6DB;\n Tue, 28 Sep 2021 14:29:32 +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 1CDEF7F6DB", "Authentication-Results": "shelob.oktetlabs.ru/1CDEF7F6DB; 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:10 +0300", "Message-Id": "<20210928112912.785412-10-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 09/11] net/sfc: add support for SW stats groups", "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\nAdd support for grouping SW stats together. When stats are\ngrouped the corresponding stats values for each queue\nare obtained during calling one read callback. This is useful\nto group per-queue stats 'packets' and 'bytes' to keep stats\nconsistent, i.e. a number of bytes corresponds to a number of\npackets. These stats will be added in the following patches.\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 | 8 ++\n drivers/net/sfc/sfc_sw_stats.c | 153 ++++++++++++++++++++++++++++-----\n 2 files changed, 138 insertions(+), 23 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex 5a40a73c7f..30679014e3 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -30,6 +30,7 @@\n #include \"sfc_sriov.h\"\n #include \"sfc_mae.h\"\n #include \"sfc_dp.h\"\n+#include \"sfc_sw_stats.h\"\n \n #ifdef __cplusplus\n extern \"C\" {\n@@ -219,6 +220,8 @@ struct sfc_counter_rxq {\n \n struct sfc_sw_stat_data {\n \tconst struct sfc_sw_stat_descr *descr;\n+\t/* Cache fragment */\n+\tuint64_t\t\t\t*cache;\n };\n \n struct sfc_sw_stats {\n@@ -227,6 +230,11 @@ struct sfc_sw_stats {\n \t/* Supported SW statistics */\n \tstruct sfc_sw_stat_data\t\t*supp;\n \tunsigned int\t\t\tsupp_count;\n+\n+\t/* Cache for all supported SW statistics */\n+\tuint64_t\t\t\t*cache;\n+\tunsigned int\t\t\tcache_count;\n+\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 63fc334d2b..81bd531a17 100644\n--- a/drivers/net/sfc/sfc_sw_stats.c\n+++ b/drivers/net/sfc/sfc_sw_stats.c\n@@ -10,12 +10,17 @@\n #include \"sfc_tx.h\"\n #include \"sfc_sw_stats.h\"\n \n+#define SFC_SW_STAT_INVALID\t\tUINT64_MAX\n+\n+#define SFC_SW_STATS_GROUP_SIZE_MAX\t1U\n+\n enum sfc_sw_stats_type {\n \tSFC_SW_STATS_RX,\n \tSFC_SW_STATS_TX,\n };\n \n-typedef uint64_t sfc_get_sw_stat_val_t(struct sfc_adapter *sa, uint16_t qid);\n+typedef void sfc_get_sw_stat_val_t(struct sfc_adapter *sa, uint16_t qid,\n+\t\t\t\t uint64_t *values, unsigned int values_count);\n \n struct sfc_sw_stat_descr {\n \tconst char *name;\n@@ -25,31 +30,41 @@ struct sfc_sw_stat_descr {\n };\n \n static sfc_get_sw_stat_val_t sfc_get_sw_stat_val_rx_dbells;\n-static uint64_t\n-sfc_get_sw_stat_val_rx_dbells(struct sfc_adapter *sa, uint16_t qid)\n+static void\n+sfc_get_sw_stat_val_rx_dbells(struct sfc_adapter *sa, uint16_t qid,\n+\t\t\t uint64_t *values, unsigned int values_count)\n {\n \tstruct sfc_adapter_shared *sas = sfc_sa2shared(sa);\n \tstruct sfc_rxq_info *rxq_info;\n \n+\tRTE_SET_USED(values_count);\n+\tSFC_ASSERT(values_count == 1);\n \trxq_info = sfc_rxq_info_by_ethdev_qid(sas, qid);\n-\tif (rxq_info->state & SFC_RXQ_INITIALIZED)\n-\t\treturn rxq_info->dp->dpq.rx_dbells;\n-\treturn 0;\n+\tvalues[0] = rxq_info->state & SFC_RXQ_INITIALIZED ?\n+\t\t rxq_info->dp->dpq.rx_dbells : 0;\n }\n \n static sfc_get_sw_stat_val_t sfc_get_sw_stat_val_tx_dbells;\n-static uint64_t\n-sfc_get_sw_stat_val_tx_dbells(struct sfc_adapter *sa, uint16_t qid)\n+static void\n+sfc_get_sw_stat_val_tx_dbells(struct sfc_adapter *sa, uint16_t qid,\n+\t\t\t uint64_t *values, unsigned int values_count)\n {\n \tstruct sfc_adapter_shared *sas = sfc_sa2shared(sa);\n \tstruct sfc_txq_info *txq_info;\n \n+\tRTE_SET_USED(values_count);\n+\tSFC_ASSERT(values_count == 1);\n \ttxq_info = sfc_txq_info_by_ethdev_qid(sas, qid);\n-\tif (txq_info->state & SFC_TXQ_INITIALIZED)\n-\t\treturn txq_info->dp->dpq.tx_dbells;\n-\treturn 0;\n+\tvalues[0] = txq_info->state & SFC_TXQ_INITIALIZED ?\n+\t\t txq_info->dp->dpq.tx_dbells : 0;\n }\n \n+/*\n+ * SW stats can be grouped together. When stats are grouped the corresponding\n+ * stats values for each queue are obtained during calling one get value\n+ * callback. Stats of the same group are contiguous in the structure below.\n+ * The start of the group is denoted by stat implementing get value callback.\n+ */\n const struct sfc_sw_stat_descr sfc_sw_stats_descr[] = {\n \t{\n \t\t.name = \"dbells\",\n@@ -228,9 +243,53 @@ sfc_sw_xstat_get_names_by_id(struct sfc_adapter *sa,\n \treturn 0;\n }\n \n+static uint64_t\n+sfc_sw_stat_get_val(struct sfc_adapter *sa,\n+\t\t unsigned int sw_stat_idx, uint16_t qid)\n+{\n+\tstruct sfc_sw_stats *sw_stats = &sa->sw_stats;\n+\tuint64_t *res = &sw_stats->supp[sw_stat_idx].cache[qid];\n+\tuint64_t values[SFC_SW_STATS_GROUP_SIZE_MAX];\n+\tunsigned int group_start_idx;\n+\tunsigned int group_size;\n+\tunsigned int i;\n+\n+\tif (*res != SFC_SW_STAT_INVALID)\n+\t\treturn *res;\n+\n+\t/*\n+\t * Search for the group start, i.e. the stat that implements\n+\t * get value callback.\n+\t */\n+\tgroup_start_idx = sw_stat_idx;\n+\twhile (sw_stats->supp[group_start_idx].descr->get_val == NULL)\n+\t\tgroup_start_idx--;\n+\n+\t/*\n+\t * Calculate number of elements in the group with loop till the next\n+\t * group start or the list end.\n+\t */\n+\tgroup_size = 1;\n+\tfor (i = sw_stat_idx + 1; i < sw_stats->supp_count; i++) {\n+\t\tif (sw_stats->supp[i].descr->get_val != NULL)\n+\t\t\tbreak;\n+\t\tgroup_size++;\n+\t}\n+\tgroup_size += sw_stat_idx - group_start_idx;\n+\n+\tSFC_ASSERT(group_size <= SFC_SW_STATS_GROUP_SIZE_MAX);\n+\tsw_stats->supp[group_start_idx].descr->get_val(sa, qid, values,\n+\t\t\t\t\t\t group_size);\n+\tfor (i = group_start_idx; i < (group_start_idx + group_size); i++)\n+\t\tsw_stats->supp[i].cache[qid] = values[i - group_start_idx];\n+\n+\treturn *res;\n+}\n+\n static void\n sfc_sw_xstat_get_values(struct sfc_adapter *sa,\n \t\t\tconst struct sfc_sw_stat_descr *sw_stat,\n+\t\t\tunsigned int sw_stat_idx,\n \t\t\tstruct rte_eth_xstat *xstats,\n \t\t\tunsigned int xstats_size,\n \t\t\tunsigned int *nb_written,\n@@ -260,7 +319,7 @@ sfc_sw_xstat_get_values(struct sfc_adapter *sa,\n \t}\n \n \tfor (qid = 0; qid < nb_queues; ++qid) {\n-\t\tvalue = sw_stat->get_val(sa, qid);\n+\t\tvalue = sfc_sw_stat_get_val(sa, sw_stat_idx, qid);\n \n \t\tif (*nb_written < xstats_size) {\n \t\t\txstats[*nb_written].id = *nb_written;\n@@ -276,6 +335,7 @@ sfc_sw_xstat_get_values(struct sfc_adapter *sa,\n static void\n sfc_sw_xstat_get_values_by_id(struct sfc_adapter *sa,\n \t\t\t const struct sfc_sw_stat_descr *sw_stat,\n+\t\t\t unsigned int sw_stat_idx,\n \t\t\t const uint64_t *ids,\n \t\t\t uint64_t *values,\n \t\t\t unsigned int ids_size,\n@@ -316,7 +376,7 @@ sfc_sw_xstat_get_values_by_id(struct sfc_adapter *sa,\n \t\t\t}\n \t\t\tid_base_q = id_base + sw_stat->provide_total;\n \t\t\tqid = ids[i] - id_base_q;\n-\t\t\tvalues[i] = sw_stat->get_val(sa, qid);\n+\t\t\tvalues[i] = sfc_sw_stat_get_val(sa, sw_stat_idx, qid);\n \t\t\ttotal_value += values[i];\n \n \t\t\trte_bitmap_set(bmp, qid);\n@@ -328,7 +388,9 @@ sfc_sw_xstat_get_values_by_id(struct sfc_adapter *sa,\n \t\tfor (qid = 0; qid < nb_queues; ++qid) {\n \t\t\tif (rte_bitmap_get(bmp, qid) != 0)\n \t\t\t\tcontinue;\n-\t\t\tvalues[total_value_idx] += sw_stat->get_val(sa, qid);\n+\t\t\tvalues[total_value_idx] += sfc_sw_stat_get_val(sa,\n+\t\t\t\t\t\t\t\t sw_stat_idx,\n+\t\t\t\t\t\t\t\t qid);\n \t\t}\n \t\tvalues[total_value_idx] += total_value;\n \t}\n@@ -344,6 +406,16 @@ sfc_sw_xstats_get_nb_supported(struct sfc_adapter *sa)\n \treturn sa->sw_stats.xstats_count;\n }\n \n+static void\n+sfc_sw_stats_clear_cache(struct sfc_adapter *sa)\n+{\n+\tunsigned int cache_count = sa->sw_stats.cache_count;\n+\tuint64_t *cache = sa->sw_stats.cache;\n+\n+\tRTE_BUILD_BUG_ON(UINT64_C(0xffffffffffffffff) != SFC_SW_STAT_INVALID);\n+\tmemset(cache, 0xff, cache_count * sizeof(*cache));\n+}\n+\n void\n sfc_sw_xstats_get_vals(struct sfc_adapter *sa,\n \t\t struct rte_eth_xstat *xstats,\n@@ -358,11 +430,13 @@ sfc_sw_xstats_get_vals(struct sfc_adapter *sa,\n \n \tsfc_adapter_lock(sa);\n \n+\tsfc_sw_stats_clear_cache(sa);\n+\n \tsw_xstats_offset = *nb_supported;\n \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+\tfor (i = 0; i < sw_stats->supp_count; i++) {\n+\t\tsfc_sw_xstat_get_values(sa, sw_stats->supp[i].descr, i,\n+\t\t\t\txstats, xstats_count, nb_written, nb_supported);\n \t}\n \n \tfor (i = sw_xstats_offset; i < *nb_written; i++)\n@@ -413,11 +487,13 @@ sfc_sw_xstats_get_vals_by_id(struct sfc_adapter *sa,\n \n \tsfc_adapter_lock(sa);\n \n+\tsfc_sw_stats_clear_cache(sa);\n+\n \tsw_xstats_offset = *nb_supported;\n \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\tsfc_sw_xstat_get_values_by_id(sa, sw_stats->supp[i].descr, i,\n+\t\t\t\t\t ids, values, n, nb_supported);\n \t}\n \n \tfor (i = 0; i < n; i++) {\n@@ -460,6 +536,7 @@ sfc_sw_xstats_get_names_by_id(struct sfc_adapter *sa,\n static void\n sfc_sw_xstat_reset(struct sfc_adapter *sa,\n \t\t const struct sfc_sw_stat_descr *sw_stat,\n+\t\t unsigned int sw_stat_idx,\n \t\t uint64_t *reset_vals)\n {\n \tunsigned int nb_queues;\n@@ -483,7 +560,7 @@ sfc_sw_xstat_reset(struct sfc_adapter *sa,\n \t}\n \n \tfor (qid = 0; qid < nb_queues; ++qid) {\n-\t\treset_vals[qid] = sw_stat->get_val(sa, qid);\n+\t\treset_vals[qid] = sfc_sw_stat_get_val(sa, sw_stat_idx, qid);\n \t\tif (sw_stat->provide_total)\n \t\t\t*total_xstat_reset += reset_vals[qid];\n \t}\n@@ -498,8 +575,10 @@ sfc_sw_xstats_reset(struct sfc_adapter *sa)\n \n \tSFC_ASSERT(sfc_adapter_is_locked(sa));\n \n+\tsfc_sw_stats_clear_cache(sa);\n+\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\tsfc_sw_xstat_reset(sa, sw_stats->supp[i].descr, i, 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@@ -510,6 +589,9 @@ 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+\tunsigned int cache_count = 0;\n+\tuint64_t **cache = &sa->sw_stats.cache;\n+\tuint64_t *stat_cache;\n \tsize_t nb_supported = 0;\n \tunsigned int i;\n \tint rc;\n@@ -524,9 +606,12 @@ sfc_sw_xstats_configure(struct sfc_adapter *sa)\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 < sw_stats->supp_count; 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 sw_stats->supp[i].descr);\n+\t\tcache_count += sfc_sw_stat_get_queue_count(sa,\n+\t\t\t\t\t\t sw_stats->supp[i].descr);\n+\t}\n \tsa->sw_stats.xstats_count = nb_supported;\n \n \t*reset_vals = rte_realloc(*reset_vals,\n@@ -538,8 +623,25 @@ sfc_sw_xstats_configure(struct sfc_adapter *sa)\n \n \tmemset(*reset_vals, 0, nb_supported * sizeof(**reset_vals));\n \n+\t*cache = rte_realloc(*cache, cache_count * sizeof(*cache), 0);\n+\tif (*cache == NULL) {\n+\t\trc = ENOMEM;\n+\t\tgoto fail_cache;\n+\t}\n+\tsa->sw_stats.cache_count = cache_count;\n+\tstat_cache = *cache;\n+\n+\tfor (i = 0; i < sw_stats->supp_count; i++) {\n+\t\tsw_stats->supp[i].cache = stat_cache;\n+\t\tstat_cache += sfc_sw_stat_get_queue_count(sa,\n+\t\t\t\t\t\t sw_stats->supp[i].descr);\n+\t}\n+\n \treturn 0;\n \n+fail_cache:\n+\trte_free(*reset_vals);\n+\t*reset_vals = NULL;\n fail_reset_vals:\n \tsa->sw_stats.xstats_count = 0;\n \trte_free(sw_stats->supp);\n@@ -594,6 +696,8 @@ sfc_sw_xstats_init(struct sfc_adapter *sa)\n \tsa->sw_stats.xstats_count = 0;\n \tsa->sw_stats.supp = NULL;\n \tsa->sw_stats.supp_count = 0;\n+\tsa->sw_stats.cache = NULL;\n+\tsa->sw_stats.cache_count = 0;\n \tsa->sw_stats.reset_vals = NULL;\n \n \treturn sfc_sw_xstats_alloc_queues_bitmap(sa);\n@@ -603,8 +707,11 @@ void\n sfc_sw_xstats_close(struct sfc_adapter *sa)\n {\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.cache);\n+\tsa->sw_stats.cache = NULL;\n+\tsa->sw_stats.cache_count = 0;\n+\trte_free(sa->sw_stats.reset_vals);\n \trte_free(sa->sw_stats.supp);\n \tsa->sw_stats.supp = NULL;\n \tsa->sw_stats.supp_count = 0;\n", "prefixes": [ "09/11" ] }