Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/96206/?format=api
{ "id": 96206, "url": "http://patchwork.dpdk.org/api/patches/96206/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20210722095433.1898589-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": "<20210722095433.1898589-10-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210722095433.1898589-10-andrew.rybchenko@oktetlabs.ru", "date": "2021-07-22T09:54:31", "name": "[v2,09/11] net/sfc: prepare to add more xstats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0b716cc9a6de1085ea1ba046c65321c57a17a699", "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/20210722095433.1898589-10-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 17954, "url": "http://patchwork.dpdk.org/api/series/17954/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=17954", "date": "2021-07-22T09:54:22", "name": "net/sfc: provide Rx/Tx doorbells stats", "version": 2, "mbox": "http://patchwork.dpdk.org/series/17954/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/96206/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/96206/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 A5DD9A0C4E;\n\tThu, 22 Jul 2021 11:55:46 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 174A9410DB;\n\tThu, 22 Jul 2021 11:55:23 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id 83D014113F\n for <dev@dpdk.org>; Thu, 22 Jul 2021 11:55:21 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id 50FC07F6E3; Thu, 22 Jul 2021 12:55:21 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id 28B417F6CC;\n Thu, 22 Jul 2021 12:54:46 +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 28B417F6CC", "Authentication-Results": "shelob.oktetlabs.ru/28B417F6CC; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "David Marchand <david.marchand@redhat.com>,\n Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>,\n Andy Moreton <amoreton@xilinx.com>", "Date": "Thu, 22 Jul 2021 12:54:31 +0300", "Message-Id": "<20210722095433.1898589-10-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210722095433.1898589-1-andrew.rybchenko@oktetlabs.ru>", "References": "<20210604144225.287678-1-andrew.rybchenko@oktetlabs.ru>\n <20210722095433.1898589-1-andrew.rybchenko@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 09/11] net/sfc: prepare to add more xstats", "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\nMove getting MAC stats code that involves locking to separate functions\nto simplify addition of new xstats.\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 | 4 ++\n drivers/net/sfc/sfc_ethdev.c | 73 ++++----------------------------\n drivers/net/sfc/sfc_port.c | 80 ++++++++++++++++++++++++++++++++++++\n 3 files changed, 92 insertions(+), 65 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex 1594f934ba..58b8c2c2ad 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -423,6 +423,10 @@ void sfc_port_stop(struct sfc_adapter *sa);\n void sfc_port_link_mode_to_info(efx_link_mode_t link_mode,\n \t\t\t\tstruct rte_eth_link *link_info);\n int sfc_port_update_mac_stats(struct sfc_adapter *sa, boolean_t manual_update);\n+int sfc_port_get_mac_stats(struct sfc_adapter *sa, struct rte_eth_xstat *xstats,\n+\t\t\t unsigned int xstats_count, unsigned int *nb_written);\n+int sfc_port_get_mac_stats_by_id(struct sfc_adapter *sa, const uint64_t *ids,\n+\t\t\t\t uint64_t *values, unsigned int n);\n int sfc_port_reset_mac_stats(struct sfc_adapter *sa);\n int sfc_set_rx_mode(struct sfc_adapter *sa);\n int sfc_set_rx_mode_unchecked(struct sfc_adapter *sa);\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex f0567a71d0..dd7e5c253a 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -726,41 +726,17 @@ sfc_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n {\n \tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n \tstruct sfc_port *port = &sa->port;\n-\tuint64_t *mac_stats;\n-\tint rc;\n-\tunsigned int i;\n-\tint nstats = 0;\n-\n-\tsfc_adapter_lock(sa);\n+\tunsigned int nb_written = 0;\n+\tunsigned int nb_supp;\n \n \tif (unlikely(xstats == NULL)) {\n-\t\tnstats = port->mac_stats_nb_supported;\n-\t\tgoto unlock;\n-\t}\n-\n-\trc = sfc_port_update_mac_stats(sa, B_FALSE);\n-\tif (rc != 0) {\n-\t\tSFC_ASSERT(rc > 0);\n-\t\tnstats = -rc;\n-\t\tgoto unlock;\n-\t}\n-\n-\tmac_stats = port->mac_stats_buf;\n-\n-\tfor (i = 0; i < EFX_MAC_NSTATS; ++i) {\n-\t\tif (EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, i)) {\n-\t\t\tif (nstats < (int)xstats_count) {\n-\t\t\t\txstats[nstats].id = nstats;\n-\t\t\t\txstats[nstats].value = mac_stats[i];\n-\t\t\t}\n-\t\t\tnstats++;\n-\t\t}\n+\t\tsfc_adapter_lock(sa);\n+\t\tnb_supp = port->mac_stats_nb_supported;\n+\t\tsfc_adapter_unlock(sa);\n+\t\treturn nb_supp;\n \t}\n \n-unlock:\n-\tsfc_adapter_unlock(sa);\n-\n-\treturn nstats;\n+\treturn sfc_port_get_mac_stats(sa, xstats, xstats_count, &nb_written);\n }\n \n static int\n@@ -798,44 +774,11 @@ sfc_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,\n \t\t uint64_t *values, unsigned int n)\n {\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 i;\n-\tint ret;\n-\tint rc;\n \n \tif (unlikely(ids == NULL || values == NULL))\n \t\treturn -EINVAL;\n \n-\tsfc_adapter_lock(sa);\n-\n-\trc = sfc_port_update_mac_stats(sa, B_FALSE);\n-\tif (rc != 0) {\n-\t\tSFC_ASSERT(rc > 0);\n-\t\tret = -rc;\n-\t\tgoto unlock;\n-\t}\n-\n-\tmac_stats = port->mac_stats_buf;\n-\n-\tSFC_ASSERT(port->mac_stats_nb_supported <=\n-\t\t RTE_DIM(port->mac_stats_by_id));\n-\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 = n;\n-\n-unlock:\n-\tsfc_adapter_unlock(sa);\n-\n-\treturn ret;\n+\treturn sfc_port_get_mac_stats_by_id(sa, ids, values, n);\n }\n \n static int\ndiff --git a/drivers/net/sfc/sfc_port.c b/drivers/net/sfc/sfc_port.c\nindex 8c432c15f5..f6689a17c0 100644\n--- a/drivers/net/sfc/sfc_port.c\n+++ b/drivers/net/sfc/sfc_port.c\n@@ -636,3 +636,83 @@ sfc_port_link_mode_to_info(efx_link_mode_t link_mode,\n \n \tlink_info->link_autoneg = ETH_LINK_AUTONEG;\n }\n+\n+int\n+sfc_port_get_mac_stats(struct sfc_adapter *sa, struct rte_eth_xstat *xstats,\n+\t\t unsigned int xstats_count, unsigned int *nb_written)\n+{\n+\tstruct sfc_port *port = &sa->port;\n+\tuint64_t *mac_stats;\n+\tunsigned int i;\n+\tint nstats = 0;\n+\tint ret;\n+\n+\tsfc_adapter_lock(sa);\n+\n+\tret = sfc_port_update_mac_stats(sa, B_FALSE);\n+\tif (ret != 0) {\n+\t\tSFC_ASSERT(ret > 0);\n+\t\tret = -ret;\n+\t\tgoto unlock;\n+\t}\n+\n+\tmac_stats = port->mac_stats_buf;\n+\n+\tfor (i = 0; i < EFX_MAC_NSTATS; ++i) {\n+\t\tif (EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask, i)) {\n+\t\t\tif (nstats < (int)xstats_count) {\n+\t\t\t\txstats[nstats].id = nstats;\n+\t\t\t\txstats[nstats].value = mac_stats[i];\n+\t\t\t\t(*nb_written)++;\n+\t\t\t}\n+\t\t\tnstats++;\n+\t\t}\n+\t}\n+\tret = nstats;\n+\n+unlock:\n+\tsfc_adapter_unlock(sa);\n+\n+\treturn ret;\n+}\n+\n+int\n+sfc_port_get_mac_stats_by_id(struct sfc_adapter *sa, const uint64_t *ids,\n+\t\t\t uint64_t *values, unsigned int n)\n+{\n+\tstruct sfc_port *port = &sa->port;\n+\tuint64_t *mac_stats;\n+\tunsigned int i;\n+\tint ret;\n+\tint rc;\n+\n+\tsfc_adapter_lock(sa);\n+\n+\trc = sfc_port_update_mac_stats(sa, B_FALSE);\n+\tif (rc != 0) {\n+\t\tSFC_ASSERT(rc > 0);\n+\t\tret = -rc;\n+\t\tgoto unlock;\n+\t}\n+\n+\tmac_stats = port->mac_stats_buf;\n+\n+\tSFC_ASSERT(port->mac_stats_nb_supported <=\n+\t\t RTE_DIM(port->mac_stats_by_id));\n+\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 = n;\n+\n+unlock:\n+\tsfc_adapter_unlock(sa);\n+\n+\treturn ret;\n+}\n", "prefixes": [ "v2", "09/11" ] }