Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/140155/?format=api
{ "id": 140155, "url": "http://patchwork.dpdk.org/api/patches/140155/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240517001302.65514-8-stephen@networkplumber.org/", "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": "<20240517001302.65514-8-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240517001302.65514-8-stephen@networkplumber.org", "date": "2024-05-17T00:12:07", "name": "[v6,7/9] net/ring: use generic SW stats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b533c9801b6d6e475f047fc12a0da887fea03627", "submitter": { "id": 27, "url": "http://patchwork.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20240517001302.65514-8-stephen@networkplumber.org/mbox/", "series": [ { "id": 31940, "url": "http://patchwork.dpdk.org/api/series/31940/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31940", "date": "2024-05-17T00:12:00", "name": "Generic 64 bit counters for SW drivers", "version": 6, "mbox": "http://patchwork.dpdk.org/series/31940/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/140155/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/140155/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 60FAC44044;\n\tFri, 17 May 2024 02:14:12 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 55D6E40A6D;\n\tFri, 17 May 2024 02:13:30 +0200 (CEST)", "from mail-pj1-f53.google.com (mail-pj1-f53.google.com\n [209.85.216.53]) by mails.dpdk.org (Postfix) with ESMTP id CAC1340649\n for <dev@dpdk.org>; Fri, 17 May 2024 02:13:18 +0200 (CEST)", "by mail-pj1-f53.google.com with SMTP id\n 98e67ed59e1d1-2a2d82537efso584700a91.2\n for <dev@dpdk.org>; Thu, 16 May 2024 17:13:18 -0700 (PDT)", "from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])\n by smtp.gmail.com with ESMTPSA id\n 98e67ed59e1d1-2b9f5820ce9sm3337495a91.56.2024.05.16.17.13.17\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 16 May 2024 17:13:17 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715904798;\n x=1716509598; 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=ARyQNNqf2hZNrQietIAGIkeF6zKTVmpArCfhMPOZfO4=;\n b=0qmu6H4YkEu4Ld0jWzNcvjz5Az076zdwmwkPKa5hK+K9ubQru3qfYScyOaGzeSDqh6\n GJ1dU4lwmZiv75tCgTpRvFjaGf6MFxpOcz5tB/hGyqgmvX6fAggybvcweeFYQ1RhdgOl\n WM4e1b7dBAW7WJ4CjHkwbnQtGKg1TiLTWE4iK7H05zFE71NUCJ5fPYAT+7x63g1cxBeK\n sN8d+UbtsoMvsq1lOLGOc0TZT+mJXqwGQrbBI/RlTG+PSnSMG/o4QNy0o6bf8qFXvGeC\n AEt7BYr19KQLfTRcMFfjWmLQqYIOWFVAWolVvJ3Oo624r1riykkPgexFn8OSOrmuRQdC\n T7WQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1715904798; x=1716509598;\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=ARyQNNqf2hZNrQietIAGIkeF6zKTVmpArCfhMPOZfO4=;\n b=c4/OVVkeXR2dV2vPuSuJb5j4uYuCbqj5KHkp+E5H1ZD5SRoCJ49Ow9v3veLnlOeOZp\n DmcfjdzZuf6681evtkuVuSFfEuZCT0COArwuo/VaA7t5VX08q0/AP2hwE3lCj3jyxJ4r\n AWD/nhtk7XtCRd87j7eb5DcECo2Ysie6QXC/GUub3JYbAhwFlXE4PlZnFjO+rzujtWYk\n 7AhThJLzpM0AxkLTHHV8U5do63NJCOWzp4KWqmI7CdAX4MlslN87AZPOnvqgx1Mjwjem\n Oq4NY1LZhVG9M+9UtiV/SUkuPiEV3eUZ+Kldrb6Dn5Y2nx9LASbp8Zsae9HF6Jt/wdPE\n e05w==", "X-Gm-Message-State": "AOJu0YyyTXNNthe/t4wPjDVfhOgB8IkqkwmmW69ldieYh3F5iCndKxt3\n NInc43sB6qp6J4sjBJ4lH5nDhbpWod4lwGQZg+0wvVrpPQz32p/+cemrnwpN8IUfoU4vxVj/Chp\n IVOQ=", "X-Google-Smtp-Source": "\n AGHT+IEG8cMvwGmBlnWAwJKC09cPlj3tijsNnnZmfc8Ch4kH7cSRaPn5U16FEy5fUOVrfVBwaVE9KA==", "X-Received": "by 2002:a17:90a:d09:b0:2af:b977:363a with SMTP id\n 98e67ed59e1d1-2b6cd1e352cmr20488185a91.43.1715904797989;\n Thu, 16 May 2024 17:13:17 -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": "[PATCH v6 7/9] net/ring: use generic SW stats", "Date": "Thu, 16 May 2024 17:12:07 -0700", "Message-ID": "<20240517001302.65514-8-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240517001302.65514-1-stephen@networkplumber.org>", "References": "<20240510050507.14381-1-stephen@networkplumber.org>\n <20240517001302.65514-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.\nThis also fixes bug where ring code was not accounting\nfor bytes.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/ring/rte_eth_ring.c | 71 +++++++++++++--------------------\n 1 file changed, 28 insertions(+), 43 deletions(-)", "diff": "diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c\nindex 48953dd7a0..85f14dd679 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,40 +202,16 @@ 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-\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-\n-\treturn 0;\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 static void\n", "prefixes": [ "v6", "7/9" ] }