From patchwork Tue May 14 15:35:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 140072 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 8FA104401F; Tue, 14 May 2024 17:39:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1452E40A71; Tue, 14 May 2024 17:39:08 +0200 (CEST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mails.dpdk.org (Postfix) with ESMTP id 6E8B340697 for ; Tue, 14 May 2024 17:39:04 +0200 (CEST) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1e4c4fb6af3so33421725ad.0 for ; Tue, 14 May 2024 08:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715701143; x=1716305943; 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=wGg8IomBDaNQ5iFbJ3jmQQIogfeBHuwvhrEiwy8VWak=; b=aTGblli9sNEd6EKwFsOxWQ9ZmJzh9Zsgf45fNdjACjz/KKrHpQIL+g5hMw/++k7pv6 of/IRgv8ZKje/KZ4FYiv0x0SpJJ1utkxP6zrknOFcpG9e1B+6hs4idXvOQvOJJWf8cDN qPwi9B7Zxhg6YpReahglIG/sgdAajU3nAbG91mQ633slCpmmEv/uJFQyQj+m3HM60LFO 1RTprFRPNB2jikEKPL+pmh9n1orShvnDx3HYy+ZsC0DhGIS4XHMOEsvPZOGVckKYU38K WI0PRNt+OUWTuVuP46swcd4k3sbRAA7b1Pbqii6pI4+z+4M7j3/jc35CJhugE9eHx6tC sK+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715701143; x=1716305943; 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=wGg8IomBDaNQ5iFbJ3jmQQIogfeBHuwvhrEiwy8VWak=; b=f/vL3NnH6EYblWv6dRfg+ZZDMkox60cWujMysVu22YEx749IyEInYuGFctKvffa2q+ PJYBHKeeOKR//YYWFQmQfRCKxYflYbINsgM8ERQcWjF+/RPEhhz6ysac1vNOk4shNfUz LJUqGeMk25NWbq/EkF6nb9JQ463eEXaGZRuFkL/vufpS8Nqukg8rPsKkCIf+j4eoj+IF CgWD6U7RHvhOSFE3u+nuKDOp6pfcH1CTkWzHEaYmyvVH22r8m9l1G5+++BkF/h3ItZYf mAUGIhB1xIx8Kg6boOdpoCY7SVYouf2+gv1EaFsFarKG3rMndNd9gA3Xhfgags9EllUB ClPQ== X-Gm-Message-State: AOJu0YweFuy3q1IEGqjwc3ZH0RHFZdN+/SYhuEBK5V8ARJwf7pm4HYWb Shj5QjzbaE0C1WL1Tn/FEGc/0NaigiFCgciWCXjK+0iJHVyHedvMTFoySwCGhZguhVRGB4j2wwN 9rsA= X-Google-Smtp-Source: AGHT+IEW44FwLdKicazPQwIsWX35akiY0ckgriNlU8w2rGv4EPi/XbyPp4WSGeaxsbK7EbYdBd2miA== X-Received: by 2002:a17:902:f54c:b0:1e2:58b7:2dd6 with SMTP id d9443c01a7336-1eefa574153mr254274405ad.21.1715701143669; Tue, 14 May 2024 08:39:03 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0c137f14sm99256415ad.259.2024.05.14.08.39.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 May 2024 08:39:02 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson Subject: [PATCH v3 6/7] net/ring: use generic SW stats Date: Tue, 14 May 2024 08:35:09 -0700 Message-ID: <20240514153845.42489-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240514153845.42489-1-stephen@networkplumber.org> References: <20240510050507.14381-1-stephen@networkplumber.org> <20240514153845.42489-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 | 71 +++++++++++++-------------------- 1 file changed, 28 insertions(+), 43 deletions(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index 48953dd7a0..85f14dd679 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; - uint64_t rx_pkts; - uint64_t tx_pkts; + + struct rte_eth_counters stats; }; struct pmd_internals { @@ -77,12 +78,13 @@ 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 - __atomic_fetch_add(&r->rx_pkts, nb_rx, __ATOMIC_RELAXED); + uint16_t i, nb_rx; + + nb_rx = (uint16_t)rte_ring_dequeue_burst(r->rng, ptrs, nb_bufs, NULL); + + for (i = 0; i < nb_rx; i++) + rte_eth_count_mbuf(&r->stats, bufs[i]); + return nb_rx; } @@ -90,13 +92,20 @@ static uint16_t eth_ring_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) { void **ptrs = (void *)&bufs[0]; + uint32_t *sizes; 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 - __atomic_fetch_add(&r->tx_pkts, nb_tx, __ATOMIC_RELAXED); + uint16_t i, nb_tx; + + sizes = alloca(sizeof(uint32_t) * nb_bufs); + + for (i = 0; i < nb_bufs; i++) + sizes[i] = rte_pktmbuf_pkt_len(bufs[i]); + + nb_tx = (uint16_t)rte_ring_enqueue_burst(r->rng, ptrs, nb_bufs, NULL); + + for (i = 0; i < nb_tx; i++) + rte_eth_count_packet(&r->stats, sizes[i]); + return nb_tx; } @@ -193,40 +202,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