Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 140146,
    "url": "http://patchwork.dpdk.org/api/1.0/patches/140146/?format=api",
    "project": {
        "id": 1,
        "url": "http://patchwork.dpdk.org/api/1.0/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"
    },
    "msgid": "<20240516154327.64104-8-stephen@networkplumber.org>",
    "date": "2024-05-16T15:40:43",
    "name": "[v5,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/1.0/people/27/?format=api",
        "name": "Stephen Hemminger",
        "email": "stephen@networkplumber.org"
    },
    "delegate": {
        "id": 1,
        "url": "http://patchwork.dpdk.org/api/1.0/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20240516154327.64104-8-stephen@networkplumber.org/mbox/",
    "series": [
        {
            "id": 31939,
            "url": "http://patchwork.dpdk.org/api/1.0/series/31939/?format=api",
            "date": "2024-05-16T15:40:36",
            "name": "Generic 64 bit counters",
            "version": 5,
            "mbox": "http://patchwork.dpdk.org/series/31939/mbox/"
        }
    ],
    "check": "success",
    "checks": "http://patchwork.dpdk.org/api/patches/140146/checks/",
    "tags": {},
    "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 BF25543F81;\n\tThu, 16 May 2024 17:44:36 +0200 (CEST)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 838BC40A67;\n\tThu, 16 May 2024 17:43:50 +0200 (CEST)",
            "from mail-pf1-f180.google.com (mail-pf1-f180.google.com\n [209.85.210.180])\n by mails.dpdk.org (Postfix) with ESMTP id B23884068A\n for <dev@dpdk.org>; Thu, 16 May 2024 17:43:45 +0200 (CEST)",
            "by mail-pf1-f180.google.com with SMTP id\n d2e1a72fcca58-6f467fb2e66so361214b3a.1\n for <dev@dpdk.org>; Thu, 16 May 2024 08:43:45 -0700 (PDT)",
            "from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])\n by smtp.gmail.com with ESMTPSA id\n d2e1a72fcca58-6f67b526b44sm2457430b3a.149.2024.05.16.08.43.44\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 16 May 2024 08:43:44 -0700 (PDT)"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715874225;\n x=1716479025; 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=Cwgyy4lA0dCEmsU4wlOSAxHPvM61pec+MD5mSnBFXGByKxhD7NjT3DBkacuqPRWIAg\n paPtMbjFxn3UFO6jVBWGH56zs1QPEoD+BUtEkjLLwhuR3oZkDXsNjAm4LZua6OBH/2aw\n WrWpj1jF7cReVjkce1Gu6svJNTcMrauf+lU/jwJG+e/Fg15s7BcyEPSXwBWU2ohwBmUg\n /RmvvssNbNezp6S5NDiWy55LHy0Ib+kt+lZ0qllz3p+yn/bRdEwix5GuHPxwGRO+9iOS\n y2Tw28XettXKAFBRiaiZrp4Z89klp999PlIl3hhgJOK3XqKasv9Io1qxfPbIQW/2oYnd\n IyVA==",
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1715874225; x=1716479025;\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=PEVlS8OIG4N3eGMf8FQ7cBOi8+4ZfxUkEGX1yvt3JcL9p+NUInv9iFhG2iYjN4CQMJ\n y+V/gkqlReDnHbxGO/VdD+TYAeQ8E16VzDxW4i3SRV5pHcsW6T8QmP0EmMNcmr1aG9RQ\n 1jtSTHEJdo0mVcur1ZFZwYk79hDn1WeuaylpVNW5KHAJEk22Oc8zlIfyug3JX6QlHiyE\n CEPxalYIAQHWaFhdPVjz7wO8LuCuRhUT8ejZwMDidilKbyMqWmYyBcAo63eBRBjwP7+O\n m4W08/+rO7Dn4JLd2y54bi8hEI2VGrr14bHldvPd/NPZP4AOJPWUV1sgepco0dIrkcJU\n cDyg==",
        "X-Gm-Message-State": "AOJu0YwHEaLSCEBxWP2x9V972CMa76wbzyISEBp31luOzlJtrdvdUBZH\n CgLF3rMTEt2CXbm7BqBBjRmtcSJ6/CUv7nL1Qi4g4GdJ4qvWw/+oVrsVL5JtFTCc4BhuKV8KIWJ\n 7OPw=",
        "X-Google-Smtp-Source": "\n AGHT+IFNZLQ2s7v/aTILZyi3piUrUFTfZU37327YjKw0Fkx+hFA/i/sKR4+CONchGQZlPO6FBNTGgw==",
        "X-Received": "by 2002:a05:6a00:1483:b0:6ea:f422:64ce with SMTP id\n d2e1a72fcca58-6f4e03a3acfmr26956349b3a.33.1715874224952;\n Thu, 16 May 2024 08:43:44 -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 v5 7/9] net/ring: use generic SW stats",
        "Date": "Thu, 16 May 2024 08:40:43 -0700",
        "Message-ID": "<20240516154327.64104-8-stephen@networkplumber.org>",
        "X-Mailer": "git-send-email 2.43.0",
        "In-Reply-To": "<20240516154327.64104-1-stephen@networkplumber.org>",
        "References": "<20240510050507.14381-1-stephen@networkplumber.org>\n <20240516154327.64104-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": [
        "v5",
        "7/9"
    ]
}