Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/140046/?format=api
{ "id": 140046, "url": "https://patches.dpdk.org/api/patches/140046/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20240513185448.120356-8-stephen@networkplumber.org/", "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": "<20240513185448.120356-8-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240513185448.120356-8-stephen@networkplumber.org", "date": "2024-05-13T18:52:17", "name": "[RFC,v2,7/7] net/ring: use generic SW stats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "314cacb72b1af5a2ad229874e14b75c4e30585b3", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20240513185448.120356-8-stephen@networkplumber.org/mbox/", "series": [ { "id": 31915, "url": "https://patches.dpdk.org/api/series/31915/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=31915", "date": "2024-05-13T18:52:10", "name": "generic SW counters", "version": 2, "mbox": "https://patches.dpdk.org/series/31915/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/140046/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/140046/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 B175D4401D;\n\tMon, 13 May 2024 20:55:48 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A456A40A76;\n\tMon, 13 May 2024 20:55:09 +0200 (CEST)", "from mail-oo1-f44.google.com (mail-oo1-f44.google.com\n [209.85.161.44]) by mails.dpdk.org (Postfix) with ESMTP id 035A84067C\n for <dev@dpdk.org>; Mon, 13 May 2024 20:55:05 +0200 (CEST)", "by mail-oo1-f44.google.com with SMTP id\n 006d021491bc7-5b2761611e8so2731614eaf.2\n for <dev@dpdk.org>; Mon, 13 May 2024 11:55:04 -0700 (PDT)", "from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])\n by smtp.gmail.com with ESMTPSA id\n 41be03b00d2f7-634103f7237sm8154680a12.71.2024.05.13.11.55.03\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 May 2024 11:55:03 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715626504;\n x=1716231304; darn=dpdk.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=NO4DVKUdt+v+339Dm/0NF9uOVdDeR7qGw415YuijwCU=;\n b=zMzIT++lEq2OTXAJbjJvIKPC38AWwj28+u7ZbHulkxenHfmPyQZ05ENcxylkAxgXJW\n Xk+hLJV0SePpjLe/C7ZdwxMmKniAhZu3qIlrb9qsJ8zehoAoEFu6YKxfI5ec55qxZuYB\n uT8PB6ZG7i4C8YkID4prPLmj0zrd5qP4Vlj3qdAntPm5yaSVI2W8lDPbmvq4k/mMJrrO\n IeEKG+yyVgRFmEX+CqcqvgfLHrzzuxFCyAClxL8Vu5a+O0BweCoo7hq1RY+aG4bI6RId\n UXK/eypSM9yVLWba7HC1JMWiQgXLMrQRvC9HXg1p8vkKUCEOJWXXQGnbwCHVIv6DfDGu\n jYdA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1715626504; x=1716231304;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=NO4DVKUdt+v+339Dm/0NF9uOVdDeR7qGw415YuijwCU=;\n b=P0lBPwY2w2i0yxU6Xz5huc7oh4FXoW4PByHsamf9CnD1gWynsLTnqZSqtIbAjZ9Z7g\n 8xdiQBnMsGK1ggBYOYqiNHCZpr+zX33MAT7+shTQIiwWdBefWZYbfVfup07qPV0xNErz\n y/eJH9dyq4EQTnthZN6pFTeeL0/W4HOHARNF89PDwgzUrf/CndUxg/SG06HgKMfa0qZ/\n duOutMsyNqATVgCkRaM+VIMJv5P9Vrh9WbQ4gTTYi3ozAjy7keHZ1t7sySwAcQTkd2Xm\n gVTkqSsfO9as2tswUBxSgri/YjjV5w8MNlVhybqWmsmYbFsjc6D9fo1kBmThA75lJTma\n aXaA==", "X-Gm-Message-State": "AOJu0YzM1E6zZ4pTQxKjK5QXrgrdf6eryti2A7KLmqHQjSp7OvRNwEz4\n xVykVJTf7wP1syfGeZOiSJ7J2WI/5XEjjaZA0U4TNuiuK/9fxmVIEL9xuekhk3P43H3CVx4C3K1\n 8ftohFg==", "X-Google-Smtp-Source": "\n AGHT+IGLB9jRvCFk9WOaps3IU2RQMYqIkzzs/+NipiQ3rib2soW6VDjrh0RECnnGrwIWzuhGE2enmw==", "X-Received": "by 2002:a05:6359:a3a5:b0:18d:e328:7e7f with SMTP id\n e5c5f4694b2df-193bd000215mr1146584255d.23.1715626504282;\n Mon, 13 May 2024 11:55:04 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Bruce Richardson <bruce.richardson@intel.com>", "Subject": "[RFC v2 7/7] net/ring: use generic SW stats", "Date": "Mon, 13 May 2024 11:52:17 -0700", "Message-ID": "<20240513185448.120356-8-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240513185448.120356-1-stephen@networkplumber.org>", "References": "<20240510050507.14381-1-stephen@networkplumber.org>\n <20240513185448.120356-1-stephen@networkplumber.org>", "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": "Use generic per-queue infrastructure.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/ring/rte_eth_ring.c | 85 +++++++++++++++++----------------\n 1 file changed, 44 insertions(+), 41 deletions(-)", "diff": "diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c\nindex 48953dd7a0..550b927392 100644\n--- a/drivers/net/ring/rte_eth_ring.c\n+++ b/drivers/net/ring/rte_eth_ring.c\n@@ -7,6 +7,7 @@\n #include \"rte_eth_ring.h\"\n #include <rte_mbuf.h>\n #include <ethdev_driver.h>\n+#include <ethdev_swstats.h>\n #include <rte_malloc.h>\n #include <rte_memcpy.h>\n #include <rte_os_shim.h>\n@@ -44,8 +45,8 @@ enum dev_action {\n \n struct ring_queue {\n \tstruct rte_ring *rng;\n-\tuint64_t rx_pkts;\n-\tuint64_t tx_pkts;\n+\n+\tstruct rte_eth_counters stats;\n };\n \n struct pmd_internals {\n@@ -77,12 +78,13 @@ eth_ring_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)\n {\n \tvoid **ptrs = (void *)&bufs[0];\n \tstruct ring_queue *r = q;\n-\tconst uint16_t nb_rx = (uint16_t)rte_ring_dequeue_burst(r->rng,\n-\t\t\tptrs, nb_bufs, NULL);\n-\tif (r->rng->flags & RING_F_SC_DEQ)\n-\t\tr->rx_pkts += nb_rx;\n-\telse\n-\t\t__atomic_fetch_add(&r->rx_pkts, nb_rx, __ATOMIC_RELAXED);\n+\tuint16_t i, nb_rx;\n+\n+\tnb_rx = (uint16_t)rte_ring_dequeue_burst(r->rng, ptrs, nb_bufs, NULL);\n+\n+\tfor (i = 0; i < nb_rx; i++)\n+\t\trte_eth_count_mbuf(&r->stats, bufs[i]);\n+\n \treturn nb_rx;\n }\n \n@@ -90,13 +92,20 @@ static uint16_t\n eth_ring_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)\n {\n \tvoid **ptrs = (void *)&bufs[0];\n+\tuint32_t *sizes;\n \tstruct ring_queue *r = q;\n-\tconst uint16_t nb_tx = (uint16_t)rte_ring_enqueue_burst(r->rng,\n-\t\t\tptrs, nb_bufs, NULL);\n-\tif (r->rng->flags & RING_F_SP_ENQ)\n-\t\tr->tx_pkts += nb_tx;\n-\telse\n-\t\t__atomic_fetch_add(&r->tx_pkts, nb_tx, __ATOMIC_RELAXED);\n+\tuint16_t i, nb_tx;\n+\n+\tsizes = alloca(sizeof(uint32_t) * nb_bufs);\n+\n+\tfor (i = 0; i < nb_bufs; i++)\n+\t\tsizes[i] = rte_pktmbuf_pkt_len(bufs[i]);\n+\n+\tnb_tx = (uint16_t)rte_ring_enqueue_burst(r->rng, ptrs, nb_bufs, NULL);\n+\n+\tfor (i = 0; i < nb_tx; i++)\n+\t\trte_eth_count_packet(&r->stats, sizes[i]);\n+\n \treturn nb_tx;\n }\n \n@@ -193,42 +202,33 @@ eth_dev_info(struct rte_eth_dev *dev,\n static int\n eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n {\n-\tunsigned int i;\n-\tunsigned long rx_total = 0, tx_total = 0;\n-\tconst struct pmd_internals *internal = dev->data->dev_private;\n-\n-\tfor (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&\n-\t\t\ti < dev->data->nb_rx_queues; i++) {\n-\t\tstats->q_ipackets[i] = internal->rx_ring_queues[i].rx_pkts;\n-\t\trx_total += stats->q_ipackets[i];\n-\t}\n-\n-\tfor (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&\n-\t\t\ti < dev->data->nb_tx_queues; i++) {\n-\t\tstats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts;\n-\t\ttx_total += stats->q_opackets[i];\n-\t}\n-\n-\tstats->ipackets = rx_total;\n-\tstats->opackets = tx_total;\n-\n-\treturn 0;\n+\treturn rte_eth_counters_stats_get(dev, offsetof(struct ring_queue, stats),\n+\t\t\t\t\t offsetof(struct ring_queue, stats),\n+\t\t\t\t\t stats);\n }\n \n static int\n eth_stats_reset(struct rte_eth_dev *dev)\n {\n-\tunsigned int i;\n-\tstruct pmd_internals *internal = dev->data->dev_private;\n+\treturn rte_eth_counters_reset(dev, offsetof(struct ring_queue, stats),\n+\t\t\t\t offsetof(struct ring_queue, stats));\n+}\n \n-\tfor (i = 0; i < dev->data->nb_rx_queues; i++)\n-\t\tinternal->rx_ring_queues[i].rx_pkts = 0;\n-\tfor (i = 0; i < dev->data->nb_tx_queues; i++)\n-\t\tinternal->tx_ring_queues[i].tx_pkts = 0;\n+static int\n+eth_xstats_get_names(struct rte_eth_dev *dev, struct rte_eth_xstat_name *names,\n+\t\t __rte_unused unsigned int limit)\n+{\n+\treturn rte_eth_counters_xstats_get_names(dev, names);\n+}\n \n-\treturn 0;\n+static int\n+eth_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, unsigned int n)\n+{\n+\treturn rte_eth_counters_xstats_get(dev, offsetof(struct ring_queue, stats),\n+\t\t\t\t\t offsetof(struct ring_queue, stats), xstats, n);\n }\n \n+\n static void\n eth_mac_addr_remove(struct rte_eth_dev *dev __rte_unused,\n \tuint32_t index __rte_unused)\n@@ -339,6 +339,9 @@ static const struct eth_dev_ops ops = {\n \t.link_update = eth_link_update,\n \t.stats_get = eth_stats_get,\n \t.stats_reset = eth_stats_reset,\n+\t.xstats_get_names = eth_xstats_get_names,\n+\t.xstats_get = eth_xstats_get,\n+\t.xstats_reset = eth_stats_reset,\n \t.mac_addr_remove = eth_mac_addr_remove,\n \t.mac_addr_add = eth_mac_addr_add,\n \t.promiscuous_enable = eth_promiscuous_enable,\n", "prefixes": [ "RFC", "v2", "7/7" ] }