From patchwork Wed May 22 16:12:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 140277 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 5434F44099; Wed, 22 May 2024 18:15:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7994A40693; Wed, 22 May 2024 18:14:48 +0200 (CEST) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mails.dpdk.org (Postfix) with ESMTP id 5B63340685 for ; Wed, 22 May 2024 18:14:43 +0200 (CEST) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1f333c7e702so2733785ad.3 for ; Wed, 22 May 2024 09:14:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1716394482; x=1716999282; 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=ekPx9/GEBtWA2PFIz5jsI9rSmpG0Tpo1ZXgR014YskVUEfPMq6x63U7dzgyUx72gtQ Q57tm+WrDVFHGR+GjaPLuD95LfPR7huiska2J4aREBcAfzIQkFrmAnMq0y2hPapPgZ1k irxrJeHMc6d8mekwX+AJfqiK+Lxu6Pz8MkclQxDIWJnkB9cIkhTg8ZQoBG1DctQ7alDP D5ZbTbjMEJEUaHjxKhFQohqJZ7VO3t+vdK3Zl9X/FREb7oy2kXrPwvu0NMzX04jIvtcS 5QKGALGJb94P+12If4g3bk09yKO9btMxU2Lcv2rp2a/PgYMYcVTcuCtZGRyd7PpNHt4P fp6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716394482; x=1716999282; 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=pptMG/L0PXJ5x7K+35PwE8VOjod+s3CDrr8T3ruNYLSJIp9ByAhUihBe4C9DK2cDoC ceeeeizc3a5P2bb8CES6Yj7Fep8QSiGNSG4OhEQga85x9/FpQKTniHICPszmb9OurTT6 1ltZb++4PQ+YsNgV0g4Pkem6yCUJW5qOyWNXr/CF3o4jNLP/K+3ZbgQqzCWhPlulcitp q5vOggMXHK39pJOmJg04bVlr98uRCfxWeuqMmPv2t9WtvZC+KYo0lEMKrvVKqzCtO5cJ ru8zPbOYxDWCV6bkWcntpPUdGL+WjOPau5EN9CR7o6+Y/V1gcSIo1vzwXLHhL9vJ3gt5 1rUQ== X-Gm-Message-State: AOJu0Yy8BFdIu7sHE8/qO4vKLy0QExoBddBrNMY4vlzBSjpovZheQ+8N quC1ENmFNf6myyLcIVPTpRO72MtJZSEPA88k+pG65zLQeidw/kaqs/6W1sPzDhbC0OuM1Okrgkx rvUA= X-Google-Smtp-Source: AGHT+IHLFwn9eHnm4HxQgrT5hP8vo5rbWylW66Y6zMJ64z4iFXFVhHyCtsCJd2xRx4KKU5WFRmFVMQ== X-Received: by 2002:a17:902:e80d:b0:1ea:5aff:c8ce with SMTP id d9443c01a7336-1f31c992575mr25717805ad.29.1716394482536; Wed, 22 May 2024 09:14:42 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f327ae4647sm13684175ad.224.2024.05.22.09.14.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 09:14:41 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson Subject: [PATCH v10 6/8] net/ring: use generic SW stats Date: Wed, 22 May 2024 09:12:30 -0700 Message-ID: <20240522161427.64568-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522161427.64568-1-stephen@networkplumber.org> References: <20240510050507.14381-1-stephen@networkplumber.org> <20240522161427.64568-1-stephen@networkplumber.org> MIME-Version: 1.0 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