Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/96253/?format=api
{ "id": 96253, "url": "http://patchwork.dpdk.org/api/patches/96253/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20210723131515.2317168-7-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": "<20210723131515.2317168-7-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210723131515.2317168-7-andrew.rybchenko@oktetlabs.ru", "date": "2021-07-23T13:15:10", "name": "[v3,06/11] net/sfc: fix accessing xstats by an unsorted list of IDs", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "aa909a8e5ec4a53bc734f752ccd263217278b56c", "submitter": { "id": 2013, "url": "http://patchwork.dpdk.org/api/people/2013/?format=api", "name": "Andrew Rybchenko", "email": "Andrew.Rybchenko@oktetlabs.ru" }, "delegate": { "id": 24651, "url": "http://patchwork.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20210723131515.2317168-7-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 17972, "url": "http://patchwork.dpdk.org/api/series/17972/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=17972", "date": "2021-07-23T13:15:04", "name": "net/sfc: provide Rx/Tx doorbells stats", "version": 3, "mbox": "http://patchwork.dpdk.org/series/17972/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/96253/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/96253/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 74F9AA0C46;\n\tFri, 23 Jul 2021 15:16:08 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4AB26410FD;\n\tFri, 23 Jul 2021 15:15:54 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id 76F40406A2;\n Fri, 23 Jul 2021 15:15:52 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id 4F59F7F6D6; Fri, 23 Jul 2021 16:15:52 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id C06297F6C9;\n Fri, 23 Jul 2021 16:15:23 +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 C06297F6C9", "Authentication-Results": "shelob.oktetlabs.ru/C06297F6C9; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "dev@dpdk.org, Ivan Malov <ivan.malov@oktetlabs.ru>,\n Remy Horton <remy.horton@intel.com>", "Cc": "David Marchand <david.marchand@redhat.com>,\n Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>, stable@dpdk.org,\n Andy Moreton <amoreton@xilinx.com>", "Date": "Fri, 23 Jul 2021 16:15:10 +0300", "Message-Id": "<20210723131515.2317168-7-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210723131515.2317168-1-andrew.rybchenko@oktetlabs.ru>", "References": "<20210604144225.287678-1-andrew.rybchenko@oktetlabs.ru>\n <20210723131515.2317168-1-andrew.rybchenko@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 06/11] net/sfc: fix accessing xstats by an\n unsorted list of IDs", "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\nDevice may support only some MAC stats. Add mapping from ids to subset\nof supported MAC stats for each port.\n\nFixes: 73280c1e4ff (\"net/sfc: support xstats retrieval by ID\")\nCc: stable@dpdk.org\n\nSigned-off-by: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/net/sfc/sfc.h | 2 ++\n drivers/net/sfc/sfc_ethdev.c | 44 ++++++++++++++++++------------------\n drivers/net/sfc/sfc_port.c | 29 ++++++++++++++++++------\n 3 files changed, 46 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex c7b0e5a30d..972d32606d 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -141,6 +141,8 @@ struct sfc_port {\n \n \tuint32_t\t\tmac_stats_mask[EFX_MAC_STATS_MASK_NPAGES];\n \n+\tunsigned int\t\t\tmac_stats_by_id[EFX_MAC_NSTATS];\n+\n \tuint64_t\t\t\tipackets;\n };\n \ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex fca3f524a1..ae9304f90f 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -788,8 +788,6 @@ sfc_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,\n \tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n \tstruct sfc_port *port = &sa->port;\n \tuint64_t *mac_stats;\n-\tunsigned int nb_supported = 0;\n-\tunsigned int nb_written = 0;\n \tunsigned int i;\n \tint ret;\n \tint rc;\n@@ -808,17 +806,19 @@ sfc_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,\n \n \tmac_stats = port->mac_stats_buf;\n \n-\tfor (i = 0; (i < EFX_MAC_NSTATS) && (nb_written < n); ++i) {\n-\t\tif (!EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, i))\n-\t\t\tcontinue;\n-\n-\t\tif (ids[nb_written] == nb_supported)\n-\t\t\tvalues[nb_written++] = mac_stats[i];\n+\tSFC_ASSERT(port->mac_stats_nb_supported <=\n+\t\t RTE_DIM(port->mac_stats_by_id));\n \n-\t\t++nb_supported;\n+\tfor (i = 0; i < n; i++) {\n+\t\tif (ids[i] < port->mac_stats_nb_supported) {\n+\t\t\tvalues[i] = mac_stats[port->mac_stats_by_id[ids[i]]];\n+\t\t} else {\n+\t\t\tret = i;\n+\t\t\tgoto unlock;\n+\t\t}\n \t}\n \n-\tret = nb_written;\n+\tret = n;\n \n unlock:\n \tsfc_adapter_unlock(sa);\n@@ -833,8 +833,7 @@ sfc_xstats_get_names_by_id(struct rte_eth_dev *dev,\n {\n \tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n \tstruct sfc_port *port = &sa->port;\n-\tunsigned int nb_supported = 0;\n-\tunsigned int nb_written = 0;\n+\tunsigned int nb_supported;\n \tunsigned int i;\n \n \tif (unlikely(xstats_names == NULL && ids != NULL) ||\n@@ -849,23 +848,24 @@ sfc_xstats_get_names_by_id(struct rte_eth_dev *dev,\n \t\treturn nb_supported;\n \t}\n \n-\tfor (i = 0; (i < EFX_MAC_NSTATS) && (nb_written < size); ++i) {\n-\t\tif (!EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, i))\n-\t\t\tcontinue;\n-\n-\t\tif (ids[nb_written] == nb_supported) {\n-\t\t\tchar *name = xstats_names[nb_written++].name;\n+\tSFC_ASSERT(port->mac_stats_nb_supported <=\n+\t\t RTE_DIM(port->mac_stats_by_id));\n \n-\t\t\tstrlcpy(name, efx_mac_stat_name(sa->nic, i),\n+\tfor (i = 0; i < size; i++) {\n+\t\tif (ids[i] < port->mac_stats_nb_supported) {\n+\t\t\tstrlcpy(xstats_names[i].name,\n+\t\t\t\tefx_mac_stat_name(sa->nic,\n+\t\t\t\t\t\t port->mac_stats_by_id[ids[i]]),\n \t\t\t\tsizeof(xstats_names[0].name));\n+\t\t} else {\n+\t\t\tsfc_adapter_unlock(sa);\n+\t\t\treturn i;\n \t\t}\n-\n-\t\t++nb_supported;\n \t}\n \n \tsfc_adapter_unlock(sa);\n \n-\treturn nb_written;\n+\treturn size;\n }\n \n static int\ndiff --git a/drivers/net/sfc/sfc_port.c b/drivers/net/sfc/sfc_port.c\nindex cdc0f94f19..bb9e01d96b 100644\n--- a/drivers/net/sfc/sfc_port.c\n+++ b/drivers/net/sfc/sfc_port.c\n@@ -157,6 +157,27 @@ sfc_port_phy_caps_to_max_link_speed(uint32_t phy_caps)\n \n #endif\n \n+static void\n+sfc_port_fill_mac_stats_info(struct sfc_adapter *sa)\n+{\n+\tunsigned int mac_stats_nb_supported = 0;\n+\tstruct sfc_port *port = &sa->port;\n+\tunsigned int stat_idx;\n+\n+\tefx_mac_stats_get_mask(sa->nic, port->mac_stats_mask,\n+\t\t\t sizeof(port->mac_stats_mask));\n+\n+\tfor (stat_idx = 0; stat_idx < EFX_MAC_NSTATS; ++stat_idx) {\n+\t\tif (!EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, stat_idx))\n+\t\t\tcontinue;\n+\n+\t\tport->mac_stats_by_id[mac_stats_nb_supported] = stat_idx;\n+\t\tmac_stats_nb_supported++;\n+\t}\n+\n+\tport->mac_stats_nb_supported = mac_stats_nb_supported;\n+}\n+\n int\n sfc_port_start(struct sfc_adapter *sa)\n {\n@@ -165,7 +186,6 @@ sfc_port_start(struct sfc_adapter *sa)\n \tuint32_t phy_adv_cap;\n \tconst uint32_t phy_pause_caps =\n \t\t((1u << EFX_PHY_CAP_PAUSE) | (1u << EFX_PHY_CAP_ASYM));\n-\tunsigned int i;\n \n \tsfc_log_init(sa, \"entry\");\n \n@@ -259,12 +279,7 @@ sfc_port_start(struct sfc_adapter *sa)\n \t\tport->mac_stats_reset_pending = B_FALSE;\n \t}\n \n-\tefx_mac_stats_get_mask(sa->nic, port->mac_stats_mask,\n-\t\t\t sizeof(port->mac_stats_mask));\n-\n-\tfor (i = 0, port->mac_stats_nb_supported = 0; i < EFX_MAC_NSTATS; ++i)\n-\t\tif (EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, i))\n-\t\t\tport->mac_stats_nb_supported++;\n+\tsfc_port_fill_mac_stats_info(sa);\n \n \tport->mac_stats_update_generation = 0;\n \n", "prefixes": [ "v3", "06/11" ] }