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 A95D24408D;
Tue, 21 May 2024 22:18:44 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 6005A40A77;
Tue, 21 May 2024 22:18:28 +0200 (CEST)
Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com
[209.85.215.169])
by mails.dpdk.org (Postfix) with ESMTP id 99F80400D7
for <dev@dpdk.org>; Tue, 21 May 2024 22:18:07 +0200 (CEST)
Received: by mail-pg1-f169.google.com with SMTP id
41be03b00d2f7-5e8470c1cb7so1586167a12.2
for <dev@dpdk.org>; Tue, 21 May 2024 13:18:07 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1716322687;
x=1716927487; 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=mBzpjYE8DoSG3Siz752I1pLevMRX7Gd2+d2mJF6DBuM=;
b=tUCiQR+sT8VMpsLcv1Ch8p4y9xx4yRnbn8rIx7NQkK4Pw3zxtjoQ/4OSns/esDRtTj
HsNdulDQgrcJ10E0NGG9V3Ld+PXocryNP9XkyAAH+Noky62nrMlumxlq5fR6z6T45KZl
jTw02NDRUvq58PL5tEBG4mtlnXrdZXRddO8gJVIWzvmxbkwoeLzmhg/7x3A+0f1E1ETv
xdKol9/jtOoaVfovPbA9ugEYjlSZxtuMzq8gB7U2bDznhTI5xWb73EBJuD0BKGIxmMCL
XpwDN5Ib/yHBCwlSksp4gNmwFCtAkBhudylh/rAgpR8gwKdI9FXHz0yRT7YJjWelDdsE
qLOg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1716322687; x=1716927487;
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=mBzpjYE8DoSG3Siz752I1pLevMRX7Gd2+d2mJF6DBuM=;
b=PsXfQaEA2dFYEml39lDOfbacDgyQoIfd1I0Kk4ti6ZCIxqI94ysSasrNU/y0L15VAG
QSUrvyFQex6up7LMTHAIgrDJeLMtWN5aswv8nf7GASgJWqv7l6sJ1MH88p6fsPd8EgoV
ovTnDX0kRZxlr+y4DAGxT0IKYGAyqusQCRGbo8/1p1oFdw7I0v6srUHsABlLCxBGYe38
7p3FlVIWMeisDiZnoLDf9SfD78INBYCM4Axxu/bEdLfEfcGRjgksniAfIEtZhWGNgssU
su568Y2dneEPN267w0QHYBObSogZMJW1+Biyj/1Yfkm7/5hzEllrdY1Ds1HTu3nG++Am
x6Cw==
X-Gm-Message-State: AOJu0Yz80k7V10AGIXBvN1c8NsnK6MAm0XfQBGNlMldJnuboVF03y+hT
fOQ6rwY/g1OvKlpSD4fuirZW5chgCapdoBgBSJW0BCh4CGFteCibl5ezduCHQGSJp9cpYXKa72g
M
X-Google-Smtp-Source: AGHT+IHi2BRps6THIztGwcPTG7pRuS992Cd9MHkF9h9HLx5fYs6PLBHPrAX5cwjBrtQvYx9Ap/rodw==
X-Received: by 2002:a17:903:94b:b0:1f2:fbda:8671 with SMTP id
d9443c01a7336-1f31c95c500mr382375ad.6.1716322686818;
Tue, 21 May 2024 13:18:06 -0700 (PDT)
Received: from hermes.lan (204-195-96-226.wavecable.com. [204.195.96.226])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-1f30fb5303csm16119075ad.166.2024.05.21.13.18.06
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 21 May 2024 13:18:06 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Ciara Loftus <ciara.loftus@intel.com>
Subject: [PATCH v9 4/8] net/af_xdp: use generic SW stats
Date: Tue, 21 May 2024 13:16:37 -0700
Message-ID: <20240521201801.126886-5-stephen@networkplumber.org>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20240521201801.126886-1-stephen@networkplumber.org>
References: <20240510050507.14381-1-stephen@networkplumber.org>
<20240521201801.126886-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 common code for all SW stats.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/af_xdp/rte_eth_af_xdp.c | 85 ++++++++---------------------
1 file changed, 22 insertions(+), 63 deletions(-)
diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 6ba455bb9b..c563621798 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -20,6 +20,7 @@
#include <rte_ethdev.h>
#include <ethdev_driver.h>
#include <ethdev_vdev.h>
+#include <ethdev_swstats.h>
#include <rte_kvargs.h>
#include <bus_vdev_driver.h>
#include <rte_string_fns.h>
@@ -120,19 +121,13 @@ struct xsk_umem_info {
uint32_t max_xsks;
};
-struct rx_stats {
- uint64_t rx_pkts;
- uint64_t rx_bytes;
- uint64_t rx_dropped;
-};
-
struct pkt_rx_queue {
struct xsk_ring_cons rx;
struct xsk_umem_info *umem;
struct xsk_socket *xsk;
struct rte_mempool *mb_pool;
- struct rx_stats stats;
+ struct rte_eth_counters stats;
struct xsk_ring_prod fq;
struct xsk_ring_cons cq;
@@ -143,17 +138,11 @@ struct pkt_rx_queue {
int busy_budget;
};
-struct tx_stats {
- uint64_t tx_pkts;
- uint64_t tx_bytes;
- uint64_t tx_dropped;
-};
-
struct pkt_tx_queue {
struct xsk_ring_prod tx;
struct xsk_umem_info *umem;
- struct tx_stats stats;
+ struct rte_eth_counters stats;
struct pkt_rx_queue *pair;
int xsk_queue_idx;
@@ -369,9 +358,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
xsk_ring_cons__release(rx, nb_pkts);
(void)reserve_fill_queue(umem, nb_pkts, fq_bufs, fq);
- /* statistics */
- rxq->stats.rx_pkts += nb_pkts;
- rxq->stats.rx_bytes += rx_bytes;
+ rte_eth_count_packets(&rxq->stats, nb_pkts, rx_bytes);
return nb_pkts;
}
@@ -429,10 +416,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
}
xsk_ring_cons__release(rx, nb_pkts);
-
- /* statistics */
- rxq->stats.rx_pkts += nb_pkts;
- rxq->stats.rx_bytes += rx_bytes;
+ rte_eth_count_packets(&rxq->stats, nb_pkts, rx_bytes);
return nb_pkts;
}
@@ -558,6 +542,7 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
umem->mb_pool->header_size;
offset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT;
desc->addr = addr | offset;
+ tx_bytes += mbuf->pkt_len;
count++;
} else {
struct rte_mbuf *local_mbuf =
@@ -585,20 +570,17 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
desc->addr = addr | offset;
rte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *),
desc->len);
+ tx_bytes += mbuf->pkt_len;
rte_pktmbuf_free(mbuf);
count++;
}
-
- tx_bytes += mbuf->pkt_len;
}
out:
xsk_ring_prod__submit(&txq->tx, count);
kick_tx(txq, cq);
- txq->stats.tx_pkts += count;
- txq->stats.tx_bytes += tx_bytes;
- txq->stats.tx_dropped += nb_pkts - count;
+ rte_eth_count_packets(&txq->stats, count, tx_bytes);
return count;
}
@@ -648,8 +630,7 @@ af_xdp_tx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
kick_tx(txq, cq);
- txq->stats.tx_pkts += nb_pkts;
- txq->stats.tx_bytes += tx_bytes;
+ rte_eth_count_packets(&txq->stats, nb_pkts, tx_bytes);
return nb_pkts;
}
@@ -847,39 +828,26 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
static int
eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
- struct pmd_internals *internals = dev->data->dev_private;
struct pmd_process_private *process_private = dev->process_private;
- struct xdp_statistics xdp_stats;
- struct pkt_rx_queue *rxq;
- struct pkt_tx_queue *txq;
- socklen_t optlen;
- int i, ret, fd;
+ unsigned int i;
- for (i = 0; i < dev->data->nb_rx_queues; i++) {
- optlen = sizeof(struct xdp_statistics);
- rxq = &internals->rx_queues[i];
- txq = rxq->pair;
- stats->q_ipackets[i] = rxq->stats.rx_pkts;
- stats->q_ibytes[i] = rxq->stats.rx_bytes;
+ rte_eth_counters_stats_get(dev, offsetof(struct pkt_tx_queue, stats),
+ offsetof(struct pkt_rx_queue, stats), stats);
- stats->q_opackets[i] = txq->stats.tx_pkts;
- stats->q_obytes[i] = txq->stats.tx_bytes;
+ for (i = 0; i < dev->data->nb_rx_queues; i++) {
+ struct xdp_statistics xdp_stats;
+ socklen_t optlen = sizeof(xdp_stats);
+ int fd;
- stats->ipackets += stats->q_ipackets[i];
- stats->ibytes += stats->q_ibytes[i];
- stats->imissed += rxq->stats.rx_dropped;
- stats->oerrors += txq->stats.tx_dropped;
fd = process_private->rxq_xsk_fds[i];
- ret = fd >= 0 ? getsockopt(fd, SOL_XDP, XDP_STATISTICS,
- &xdp_stats, &optlen) : -1;
- if (ret != 0) {
+ if (fd < 0)
+ continue;
+ if (getsockopt(fd, SOL_XDP, XDP_STATISTICS,
+ &xdp_stats, &optlen) < 0) {
AF_XDP_LOG(ERR, "getsockopt() failed for XDP_STATISTICS.\n");
return -1;
}
stats->imissed += xdp_stats.rx_dropped;
-
- stats->opackets += stats->q_opackets[i];
- stats->obytes += stats->q_obytes[i];
}
return 0;
@@ -888,17 +856,8 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
static int
eth_stats_reset(struct rte_eth_dev *dev)
{
- struct pmd_internals *internals = dev->data->dev_private;
- int i;
-
- for (i = 0; i < internals->queue_cnt; i++) {
- memset(&internals->rx_queues[i].stats, 0,
- sizeof(struct rx_stats));
- memset(&internals->tx_queues[i].stats, 0,
- sizeof(struct tx_stats));
- }
-
- return 0;
+ return rte_eth_counters_reset(dev, offsetof(struct pkt_tx_queue, stats),
+ offsetof(struct pkt_rx_queue, stats));
}
#ifdef RTE_NET_AF_XDP_LIBBPF_XDP_ATTACH
--
2.43.0