From patchwork Wed May 22 16:12:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 140273 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 7F42D44099; Wed, 22 May 2024 18:14:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CCB744067D; Wed, 22 May 2024 18:14:42 +0200 (CEST) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mails.dpdk.org (Postfix) with ESMTP id CB6BA402F0 for ; Wed, 22 May 2024 18:14:39 +0200 (CEST) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1eb0e08bfd2so117284555ad.1 for ; Wed, 22 May 2024 09:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1716394479; x=1716999279; 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=Hh2GgCFnjmWS/JKm3016dHJykAAeX+Xf3AD2vvEYbf8=; b=Vifs2xWVhGnhqU40lK2Mrc+nfiDFmNYCiD25aqJQ5PvwGERv3GyCbxjESe8OOwYbtk V2pM7le7Zr5FyrTGds5jadPd0pS6H5glC2Evt44/7CEvbFhLCAXZcnyTJFtz8JLf2vVd Wk3sUMd39wJf/f3mHtt5xxG3y0UGO4dhjqXYQPXP4E8a4bHeP24H+AmQjbkp0QRmgK4x YFtWUrVf0veXcXYiVYE4yZ8ry2I2VfEf9BhPXrqi063GQP9LrtbulNYs8PZHfMXQIs3m JUEtE+8dL/ehgBqOy0vbRZrqDzSXPA0+JdMZWuixzJOm0UdmCfdBsR2kXq3ZPyjZfa6w TXoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716394479; x=1716999279; 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=Hh2GgCFnjmWS/JKm3016dHJykAAeX+Xf3AD2vvEYbf8=; b=apaBVHEW3nvZ+/XClOe9thmEaSzxDy3bwknOtN2eUGAbXVbqqcx4vUjUNBmNDavRvu kGarrTF6Y/36XpoRdxd76RFlRgnJto+9URlBwEKUfVAw+uvduyspxHVhcjC4WfMO3TJ1 ZAQoA6wrFqAlR7kPji/dpdKhQzhDxyzDt+W+KXZJ22xFGmsQGDQITyyuqUBaeFBGgLKe 58mgTkYDrbMLS3MJaLf8217MqsrBQt+3M8zAfnTrMaK58dnOTkm9MmwHVhzQS+ZP8/nD SGPOQ9HCYuM11TyS79n5w7Yf/3N2Vzb1Ky9kaqR1l2ML9t5BEBYzb0BxwRzDSBgPBfse 8gdQ== X-Gm-Message-State: AOJu0Yyr/LOZSXxKnPXwZUQpwr5fCIppHDoUEP6o63CfOgm8zBkGt3R/ vrzCuXzH1eioPP166JJUISXlvHnUVtKZlmUmayjRLqSrj9jupBxEfrvexHAF30e0getXZeCOy0P 17Uo= X-Google-Smtp-Source: AGHT+IFw5Cvev70dkDKFgDoGmuSEHxiOIO1TfFmzRKuCkxSi3jC3dtosEqdJi66fH5s3TfTJkc6aHg== X-Received: by 2002:a17:902:f0cd:b0:1f3:121e:e3cd with SMTP id d9443c01a7336-1f31c97a591mr20697345ad.15.1716394478977; Wed, 22 May 2024 09:14:38 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 09:14:38 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko Subject: [PATCH v10 2/8] ethdev: add common counters for statistics Date: Wed, 22 May 2024 09:12:26 -0700 Message-ID: <20240522161427.64568-3-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 Introduce common helper routines for keeping track of per-queue statistics in SW PMD's. The code in several drivers had copy/pasted the same code for this, but had common issues with 64 bit counters on 32 bit platforms. Signed-off-by: Stephen Hemminger --- lib/ethdev/ethdev_swstats.c | 102 +++++++++++++++++++++++++++++++ lib/ethdev/ethdev_swstats.h | 117 ++++++++++++++++++++++++++++++++++++ lib/ethdev/meson.build | 2 + lib/ethdev/version.map | 3 + 4 files changed, 224 insertions(+) create mode 100644 lib/ethdev/ethdev_swstats.c create mode 100644 lib/ethdev/ethdev_swstats.h diff --git a/lib/ethdev/ethdev_swstats.c b/lib/ethdev/ethdev_swstats.c new file mode 100644 index 0000000000..e5560d2310 --- /dev/null +++ b/lib/ethdev/ethdev_swstats.c @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) Stephen Hemminger + */ + +#include +#include + +#include +#include +#include + +#include "ethdev_driver.h" +#include "ethdev_swstats.h" + +int +rte_eth_counters_stats_get(const struct rte_eth_dev *dev, + size_t tx_offset, size_t rx_offset, + struct rte_eth_stats *stats) +{ + uint64_t packets, bytes, errors; + unsigned int i; + + for (i = 0; i < dev->data->nb_tx_queues; i++) { + const void *txq = dev->data->tx_queues[i]; + const struct rte_eth_counters *counters; + + if (txq == NULL) + continue; + + counters = (const struct rte_eth_counters *)((const char *)txq + tx_offset); + packets = rte_counter64_read(&counters->packets); + bytes = rte_counter64_read(&counters->bytes); + errors = rte_counter64_read(&counters->errors); + + stats->opackets += packets; + stats->obytes += bytes; + stats->oerrors += errors; + + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) { + stats->q_opackets[i] = packets; + stats->q_obytes[i] = bytes; + } + } + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + const void *rxq = dev->data->rx_queues[i]; + const struct rte_eth_counters *counters; + + if (rxq == NULL) + continue; + + counters = (const struct rte_eth_counters *)((const char *)rxq + rx_offset); + packets = rte_counter64_read(&counters->packets); + bytes = rte_counter64_read(&counters->bytes); + errors = rte_counter64_read(&counters->errors); + + stats->ipackets += packets; + stats->ibytes += bytes; + stats->ierrors += errors; + + if (i < RTE_ETHDEV_QUEUE_STAT_CNTRS) { + stats->q_ipackets[i] = packets; + stats->q_ibytes[i] = bytes; + } + } + + stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed; + return 0; +} + +int +rte_eth_counters_reset(struct rte_eth_dev *dev, size_t tx_offset, size_t rx_offset) +{ + struct rte_eth_counters *counters; + unsigned int i; + + for (i = 0; i < dev->data->nb_tx_queues; i++) { + void *txq = dev->data->tx_queues[i]; + + if (txq == NULL) + continue; + + counters = (struct rte_eth_counters *)((char *)txq + tx_offset); + rte_counter64_reset(&counters->packets); + rte_counter64_reset(&counters->bytes); + rte_counter64_reset(&counters->errors); + } + + for (i = 0; i < dev->data->nb_rx_queues; i++) { + void *rxq = dev->data->rx_queues[i]; + + if (rxq == NULL) + continue; + + counters = (struct rte_eth_counters *)((char *)rxq + rx_offset); + rte_counter64_reset(&counters->packets); + rte_counter64_reset(&counters->bytes); + rte_counter64_reset(&counters->errors); + } + + return 0; +} diff --git a/lib/ethdev/ethdev_swstats.h b/lib/ethdev/ethdev_swstats.h new file mode 100644 index 0000000000..c149b7697e --- /dev/null +++ b/lib/ethdev/ethdev_swstats.h @@ -0,0 +1,117 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) Stephen Hemminger + */ + +#ifndef _RTE_ETHDEV_SWSTATS_H_ +#define _RTE_ETHDEV_SWSTATS_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @file + * + * Internal statistics counters for software based devices. + * Hardware PMD's should use the hardware counters instead. + * + * This provides a library for PMD's to keep track of packets and bytes. + * It is assumed that this will be used per queue and queues are not + * shared by lcores. + */ +#include +#include + +#include +#include + +struct rte_eth_dev; +struct rte_eth_stats; + +/** + * A structure to be embedded in the device driver per-queue data. + */ +struct rte_eth_counters { + rte_counter64_t packets; /**< Total number of packets. */ + rte_counter64_t bytes; /**< Total number of bytes. */ + rte_counter64_t errors; /**< Total number of packets with errors. */ +}; + +/** + * @internal + * Increment counters for a single packet. + * + * @param counters + * Pointer to queue structure containing counters. + * @param packets + * Number of packets to count + * @param bytes + * Total size of all packet in bytes. + */ +__rte_internal +static inline void +rte_eth_count_packets(struct rte_eth_counters *counters, + uint16_t packets, uint32_t bytes) +{ + rte_counter64_add(&counters->packets, packets); + rte_counter64_add(&counters->bytes, bytes); +} + +/** + * @internal + * Increment error counter. + * + * @param counters + * Pointer to queue structure containing counters. + */ +__rte_internal +static inline void +rte_eth_count_error(struct rte_eth_counters *counters) +{ + rte_counter64_add(&counters->errors, 1); +} + +/** + * @internal + * Retrieve the general statistics for all queues. + * @see rte_eth_stats_get. + * + * @param dev + * Pointer to the Ethernet device structure. + * @param tx_offset + * Offset from the tx_queue structure where stats are located. + * @param rx_offset + * Offset from the rx_queue structure where stats are located. + * @param stats + * A pointer to a structure of type *rte_eth_stats* to be filled + * @return + * Zero if successful. Non-zero otherwise. + */ +__rte_internal +int rte_eth_counters_stats_get(const struct rte_eth_dev *dev, + size_t tx_offset, size_t rx_offset, + struct rte_eth_stats *stats); + +/** + * @internal + * Reset the statistics for all queues. + * @see rte_eth_stats_reset. + * + * @param dev + * Pointer to the Ethernet device structure. + * @param tx_offset + * Offset from the tx_queue structure where stats are located. + * @param rx_offset + * Offset from the rx_queue structure where stats are located. + * @return + * Zero if successful. Non-zero otherwise. + */ +__rte_internal +int rte_eth_counters_reset(struct rte_eth_dev *dev, + size_t tx_offset, size_t rx_offset); + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_ETHDEV_SWSTATS_H_ */ diff --git a/lib/ethdev/meson.build b/lib/ethdev/meson.build index f1d2586591..7ce29a46d4 100644 --- a/lib/ethdev/meson.build +++ b/lib/ethdev/meson.build @@ -3,6 +3,7 @@ sources = files( 'ethdev_driver.c', + 'ethdev_swstats.c', 'ethdev_private.c', 'ethdev_profile.c', 'ethdev_trace_points.c', @@ -42,6 +43,7 @@ driver_sdk_headers += files( 'ethdev_driver.h', 'ethdev_pci.h', 'ethdev_vdev.h', + 'ethdev_swstats.h', ) if is_linux diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index 79f6f5293b..fc595be278 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -358,4 +358,7 @@ INTERNAL { rte_eth_switch_domain_alloc; rte_eth_switch_domain_free; rte_flow_fp_default_ops; + + rte_eth_counters_reset; + rte_eth_counters_stats_get; };