From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 2BDF34403F;
Thu, 16 May 2024 01:43:41 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 4B985406B8;
Thu, 16 May 2024 01:43:00 +0200 (CEST)
Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com
[209.85.210.178])
by mails.dpdk.org (Postfix) with ESMTP id E92B54067E
for <dev@dpdk.org>; Thu, 16 May 2024 01:42:51 +0200 (CEST)
Received: by mail-pf1-f178.google.com with SMTP id
d2e1a72fcca58-6f4ed9dc7beso3353074b3a.1
for <dev@dpdk.org>; Wed, 15 May 2024 16:42:51 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715816571;
x=1716421371; darn=dpdk.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=F1v3feu5BR4POSxHAthIeXNE69YI+TXuZU380J4Tk78=;
b=c3DjFaCVuhdwK0DQsyACAUmyMG2ggsZ8OF9EAupUefp0bXBv9xDAFgUVzcNULlJWYz
dshG6BEgphyknEyet9nbXHO6WF16szV/8U0cLUuI5frS3Ms1V+HhCuxu11IQD848K4ls
nLkk+nU3KDvnfok9+l+0m5D+SdGzZuUR/03HJCDdWi4HzVzcMAYBq7vmA/TGPfX0bOfR
pFPmggg/ZiAlWC2uNGZzrzZuo7iWT4y9XoQwAj5tKSLCAAYmSFl5pDXwFt/NR6sp/zd7
FCGoFpRoMA14CYOhXd68fEGLfTv3TwPfnP1hdHWQUn8pCeg8CU0jpIArZnlTWeB4VUEP
eaeA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1715816571; x=1716421371;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=F1v3feu5BR4POSxHAthIeXNE69YI+TXuZU380J4Tk78=;
b=i3oJY/CahYsWJlh8Aq+5HBJD5mHSyDgCZQp3RBS6IsUw/hDVLl5Y58acUCXxQr+ETW
i9Sv+xswqRSJveWeG72lhQv9c+tnlAteHOA5Alu0WoE87uxV/zg2lOc81HE5e6OJ6aVv
CqD1s2QVUGvcjxYrdSERVnas2NB2wg2PVT2UsORj7voa+uryAnJYDO8NlhRW0nXqDRb/
+h3MskaWD4FNtTZR2rxVHC5bJ1G4ZlMiX1Yl2TTGZiYS+6Eyz6CobTcVdkABaOIZ5F8T
2qtnxKiDFmbdJ3Vp4jMWAKosfXzQcp4nifQSL66fRCTL5YUx5zO3fPAI3WrpSJ6/oOaU
trVw==
X-Gm-Message-State: AOJu0Yy3utI4yTN5WsN/slN331ywcXPl3C7ehe2cYB/HzOYCUz5Ighz2
GFs3rIbO7TMom03EyYBUezqRX43RbKRKnbhSnsteP4Yu8y1RYhNOuvmETF3QV6zLFBgndl/s2sm
16yQ=
X-Google-Smtp-Source: AGHT+IF0fL8QuIVto5Tj6P+ZzRB5dhLroyte/5EGULS347boy2GFHnCMZXoGcptODb4zUzm5jVuC4Q==
X-Received: by 2002:a05:6a00:2181:b0:6ed:825b:30c0 with SMTP id
d2e1a72fcca58-6f4c944c9bbmr28434430b3a.15.1715816571132;
Wed, 15 May 2024 16:42:51 -0700 (PDT)
Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-6f67b0cd494sm958479b3a.161.2024.05.15.16.42.50
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 15 May 2024 16:42:50 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Tetsuya Mukawa <mtetsuyah@gmail.com>
Subject: [PATCH v4 8/8] net/null: use generic SW stats
Date: Wed, 15 May 2024 16:41:00 -0700
Message-ID: <20240515234234.5015-9-stephen@networkplumber.org>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20240515234234.5015-1-stephen@networkplumber.org>
References: <20240510050507.14381-1-stephen@networkplumber.org>
<20240515234234.5015-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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Use the new common code for statistics.
This also fixes the bug that this driver was not accounting
for bytes.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/null/rte_eth_null.c | 80 +++++++--------------------------
1 file changed, 17 insertions(+), 63 deletions(-)
diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 7c46004f1e..7786982732 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -8,6 +8,7 @@
#include <rte_mbuf.h>
#include <ethdev_driver.h>
#include <ethdev_vdev.h>
+#include <ethdev_swstats.h>
#include <rte_malloc.h>
#include <rte_memcpy.h>
#include <bus_vdev_driver.h>
@@ -37,8 +38,8 @@ struct null_queue {
struct rte_mempool *mb_pool;
struct rte_mbuf *dummy_packet;
- uint64_t rx_pkts;
- uint64_t tx_pkts;
+ struct rte_eth_counters tx_stats;
+ struct rte_eth_counters rx_stats;
};
struct pmd_options {
@@ -99,11 +100,9 @@ eth_null_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
bufs[i]->data_len = (uint16_t)packet_size;
bufs[i]->pkt_len = packet_size;
bufs[i]->port = h->internals->port_id;
+ rte_eth_count_mbuf(&h->rx_stats, bufs[i]);
}
- /* NOTE: review for potential ordering optimization */
- __atomic_fetch_add(&h->rx_pkts, i, __ATOMIC_SEQ_CST);
-
return i;
}
@@ -127,11 +126,9 @@ eth_null_copy_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
bufs[i]->data_len = (uint16_t)packet_size;
bufs[i]->pkt_len = packet_size;
bufs[i]->port = h->internals->port_id;
+ rte_eth_count_mbuf(&h->rx_stats, bufs[i]);
}
- /* NOTE: review for potential ordering optimization */
- __atomic_fetch_add(&h->rx_pkts, i, __ATOMIC_SEQ_CST);
-
return i;
}
@@ -151,11 +148,10 @@ eth_null_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
if ((q == NULL) || (bufs == NULL))
return 0;
- for (i = 0; i < nb_bufs; i++)
+ for (i = 0; i < nb_bufs; i++) {
+ rte_eth_count_mbuf(&h->tx_stats, bufs[i]);
rte_pktmbuf_free(bufs[i]);
-
- /* NOTE: review for potential ordering optimization */
- __atomic_fetch_add(&h->tx_pkts, i, __ATOMIC_SEQ_CST);
+ }
return i;
}
@@ -174,12 +170,10 @@ eth_null_copy_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
for (i = 0; i < nb_bufs; i++) {
rte_memcpy(h->dummy_packet, rte_pktmbuf_mtod(bufs[i], void *),
packet_size);
+ rte_eth_count_mbuf(&h->tx_stats, bufs[i]);
rte_pktmbuf_free(bufs[i]);
}
- /* NOTE: review for potential ordering optimization */
- __atomic_fetch_add(&h->tx_pkts, i, __ATOMIC_SEQ_CST);
-
return i;
}
@@ -322,60 +316,20 @@ eth_dev_info(struct rte_eth_dev *dev,
}
static int
-eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
+eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
- unsigned int i, num_stats;
- unsigned long rx_total = 0, tx_total = 0;
- const struct pmd_internals *internal;
-
- if ((dev == NULL) || (igb_stats == NULL))
- return -EINVAL;
-
- internal = dev->data->dev_private;
- num_stats = RTE_MIN((unsigned int)RTE_ETHDEV_QUEUE_STAT_CNTRS,
- RTE_MIN(dev->data->nb_rx_queues,
- RTE_DIM(internal->rx_null_queues)));
- for (i = 0; i < num_stats; i++) {
- /* NOTE: review for atomic access */
- igb_stats->q_ipackets[i] =
- internal->rx_null_queues[i].rx_pkts;
- rx_total += igb_stats->q_ipackets[i];
- }
-
- num_stats = RTE_MIN((unsigned int)RTE_ETHDEV_QUEUE_STAT_CNTRS,
- RTE_MIN(dev->data->nb_tx_queues,
- RTE_DIM(internal->tx_null_queues)));
- for (i = 0; i < num_stats; i++) {
- /* NOTE: review for atomic access */
- igb_stats->q_opackets[i] =
- internal->tx_null_queues[i].tx_pkts;
- tx_total += igb_stats->q_opackets[i];
- }
-
- igb_stats->ipackets = rx_total;
- igb_stats->opackets = tx_total;
-
- return 0;
+ return rte_eth_counters_stats_get(dev,
+ offsetof(struct null_queue, tx_stats),
+ offsetof(struct null_queue, rx_stats),
+ stats);
}
static int
eth_stats_reset(struct rte_eth_dev *dev)
{
- unsigned int i;
- struct pmd_internals *internal;
-
- if (dev == NULL)
- return -EINVAL;
-
- internal = dev->data->dev_private;
- for (i = 0; i < RTE_DIM(internal->rx_null_queues); i++)
- /* NOTE: review for atomic access */
- internal->rx_null_queues[i].rx_pkts = 0;
- for (i = 0; i < RTE_DIM(internal->tx_null_queues); i++)
- /* NOTE: review for atomic access */
- internal->tx_null_queues[i].tx_pkts = 0;
-
- return 0;
+ return rte_eth_counters_reset(dev,
+ offsetof(struct null_queue, tx_stats),
+ offsetof(struct null_queue, rx_stats));
}
static void
--
2.43.0