From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 924CA4408D; Tue, 21 May 2024 22:18:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1110E40DF8; Tue, 21 May 2024 22:18:31 +0200 (CEST) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mails.dpdk.org (Postfix) with ESMTP id 49F4E400D7 for ; Tue, 21 May 2024 22:18:09 +0200 (CEST) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1ed96772f92so5107375ad.0 for ; Tue, 21 May 2024 13:18:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1716322688; x=1716927488; 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=bN+U3MlFvHBy6Y5Ch8EA2M37+2VY2m8EGSXVGyhuBX4=; b=gqDl5DVo0UQ16ssCVwN1oRSex8mrNSVUAA8M9TF49JMUMhCcYhzw9rndD85K9VO1Hd 9nlb7KER9KQSuDcRnad59PpxFSy+l4mvP0KY3mRSiAnAM/BOc25girbRMUAx7+kIr+7Q CyiOOYROS6TdzRaaNi4yqxrdrbpFaVgLU4hdwnAI3UXnTVxgomDSmVF0RfMLbc2pyFMz +oruFYoNxzbSkzMgBRKk7WzcgVGsvZyT5DtgbgGNJ2WFc+5EeC6NpXqTJQ8Zt5PuF8jJ KwRWLtadkkf9oCTkb9WTJAMRc7uA5VC4HGo2ZUXoI0G0P0lBBsMxJLUNIDkmSrsD3LGl Gkpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716322688; x=1716927488; 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=bN+U3MlFvHBy6Y5Ch8EA2M37+2VY2m8EGSXVGyhuBX4=; b=lcXY4u8bYTi5nJDdSMy4zsIRbGSDSTwisbk+d+AaH3daCb7P1U/KJx0VQVpwkGCpBY 54JtFuaV0+0+6tts0J9hyuxtSrNf/xPXErkGZsqQa/p6+u8NoTFjo78g0qMnUa+UojOh NUO2L2jAavx3CKJ9tJgpHVhLOOvtJd0MRpqdUveCTiQhqCDFbFKG6XGgABGZ6/h+Cmje tuAaJXMiJ9zCnO+0iEJc9o/5tw2vRlCVUC4Fwy6mceFLM0/YnLxDRtVHi4TYOLQ0f5Bo zhwLx4ZPG5Gz7Oz1zw6Klc3m07HmjVq7u5BQTjYSZpCtsZ1tTECB7gtUpYPvACfBx32g pdow== X-Gm-Message-State: AOJu0Yzz6TvyFL5lO/pRBUC3SZYNDpoEt2ZlkL5q6SpCv9nG+axPofVq kI0mCusCOa50+qYKvquSR5sxtySrUrBEitYbxnaNOTj2N2i7nc+eJpj5LI41hw3gS7kk9sFnrjk b X-Google-Smtp-Source: AGHT+IEbTbUgXJKKo7IhyeLS8LPjLAovcZDkBhMZoLQ0nn9xoE6dTD0pgw5VqzuO+pc/iOsy4RpGSw== X-Received: by 2002:a17:902:7809:b0:1ef:4600:835d with SMTP id d9443c01a7336-1f31c969183mr394915ad.21.1716322688395; Tue, 21 May 2024 13:18:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 13:18:08 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson Subject: [PATCH v9 6/8] net/ring: use generic SW stats Date: Tue, 21 May 2024 13:16:39 -0700 Message-ID: <20240521201801.126886-7-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use generic per-queue infrastructure. Signed-off-by: Stephen Hemminger --- drivers/net/ring/rte_eth_ring.c | 63 +++++++++++---------------------- 1 file changed, 20 insertions(+), 43 deletions(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index b16f5d55f2..36053e4038 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -7,6 +7,7 @@ #include "rte_eth_ring.h" #include #include +#include #include #include #include @@ -44,8 +45,8 @@ enum dev_action { struct ring_queue { struct rte_ring *rng; - RTE_ATOMIC(uint64_t) rx_pkts; - RTE_ATOMIC(uint64_t) tx_pkts; + + struct rte_eth_counters stats; }; struct pmd_internals { @@ -77,12 +78,12 @@ eth_ring_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) { void **ptrs = (void *)&bufs[0]; struct ring_queue *r = q; - const uint16_t nb_rx = (uint16_t)rte_ring_dequeue_burst(r->rng, - ptrs, nb_bufs, NULL); - if (r->rng->flags & RING_F_SC_DEQ) - r->rx_pkts += nb_rx; - else - rte_atomic_fetch_add_explicit(&r->rx_pkts, nb_rx, rte_memory_order_relaxed); + uint16_t nb_rx; + + nb_rx = (uint16_t)rte_ring_dequeue_burst(r->rng, ptrs, nb_bufs, NULL); + + rte_counter64_add(&r->stats.packets, nb_rx); + return nb_rx; } @@ -91,12 +92,12 @@ eth_ring_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) { void **ptrs = (void *)&bufs[0]; struct ring_queue *r = q; - const uint16_t nb_tx = (uint16_t)rte_ring_enqueue_burst(r->rng, - ptrs, nb_bufs, NULL); - if (r->rng->flags & RING_F_SP_ENQ) - r->tx_pkts += nb_tx; - else - rte_atomic_fetch_add_explicit(&r->tx_pkts, nb_tx, rte_memory_order_relaxed); + uint16_t nb_tx; + + nb_tx = (uint16_t)rte_ring_enqueue_burst(r->rng, ptrs, nb_bufs, NULL); + + rte_counter64_add(&r->stats.packets, nb_tx); + return nb_tx; } @@ -193,40 +194,16 @@ eth_dev_info(struct rte_eth_dev *dev, static int eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) { - unsigned int i; - unsigned long rx_total = 0, tx_total = 0; - const struct pmd_internals *internal = dev->data->dev_private; - - for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS && - i < dev->data->nb_rx_queues; i++) { - stats->q_ipackets[i] = internal->rx_ring_queues[i].rx_pkts; - rx_total += stats->q_ipackets[i]; - } - - for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS && - i < dev->data->nb_tx_queues; i++) { - stats->q_opackets[i] = internal->tx_ring_queues[i].tx_pkts; - tx_total += stats->q_opackets[i]; - } - - stats->ipackets = rx_total; - stats->opackets = tx_total; - - return 0; + return rte_eth_counters_stats_get(dev, offsetof(struct ring_queue, stats), + offsetof(struct ring_queue, stats), + stats); } static int eth_stats_reset(struct rte_eth_dev *dev) { - unsigned int i; - struct pmd_internals *internal = dev->data->dev_private; - - for (i = 0; i < dev->data->nb_rx_queues; i++) - internal->rx_ring_queues[i].rx_pkts = 0; - for (i = 0; i < dev->data->nb_tx_queues; i++) - internal->tx_ring_queues[i].tx_pkts = 0; - - return 0; + return rte_eth_counters_reset(dev, offsetof(struct ring_queue, stats), + offsetof(struct ring_queue, stats)); } static void -- 2.43.0