From patchwork Fri Jan 19 17:09:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rushil Gupta X-Patchwork-Id: 135992 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 E73EB43901; Fri, 19 Jan 2024 18:09:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8062A402AE; Fri, 19 Jan 2024 18:09:49 +0100 (CET) Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by mails.dpdk.org (Postfix) with ESMTP id 6EEAD4027A for ; Fri, 19 Jan 2024 18:09:48 +0100 (CET) Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc21df30950so1959844276.3 for ; Fri, 19 Jan 2024 09:09:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1705684187; x=1706288987; darn=dpdk.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=pVtl2xXPB8H+4Nqi9TDuBd2GsPVI9nHNGNX2q+yBheM=; b=LXM5RL4ubOK3ec4vnDlYGqNeAuEcxdw5efpDu2A8Sf7TZOYmpjHxbgCMOD8M32/xKG oDFAz1mgtcDGvEfnNUJtxASfPq1Qtr5jUWzE6prQk1vQcgqAk68YafLzeZ5hhahdC0Mv hpxPXb74TRs6bd5S0eZMzuO6TmbK9iFEvZ716n3bKE9L5rtLBGkfVddH6jvmZdb4Lug8 yhMAS0vFTmkWHf73zPBV7RQB6khIQm9JkWXR3hbHY3c7nBm/zoAwnyZgQ9Q4JU4RDe+p uAL+fmPJP+gAmgLNRGHgxaNIcLI3ARgxfDpJB5yDbn/RwpDVii6SoiVbl0b5DAJ3g5FA Empg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705684187; x=1706288987; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pVtl2xXPB8H+4Nqi9TDuBd2GsPVI9nHNGNX2q+yBheM=; b=fKGAugD8p2SFiSMMoGpxnJYT54da0/KYsKzw2X+K4ctacBQvzvZ5sBAd1sFP8PEPWr UgpGgsCd14AOANsVlTsPTCCZKQmUAn3sYspUlkPV/+7IdHNYllZ4gjbBZYNSC8tFDcvE BiN7k1LrrScUEWImaIqiN7Kk3Vg8w8pAQW/laS0vghiuv1j4lnO9LFQWO3Zmu3V0TP69 LXWRKxXYEptUA8F+z0PbxLWl6rNsgTGgl/osjTemOSatxZwf4hyWjI4a5Zc+Rvunw0hC XmVY19yals60rx0SdCBps6sEx7EjkTu5Sqxtv7BgtqC7tsXRI8teDX6mSWfQOdeG4xa2 wj+Q== X-Gm-Message-State: AOJu0YxAL1jbjvbUqK1Xk5uDyq19sOQpcMYljT7ZBpSuYdnxDYcWCiio ZgBR4bOKg0C0ploGmEOMmQvURG288VNwwRezS8LQkru7RmN/pqKyODZxaac6fS09WyKdbiCM7V+ rVHYfHA== X-Google-Smtp-Source: AGHT+IFznzKfcx8J4qbgzwZKDjpoJyn0VAYjojwNiEZuGq8PbYRXtN5/Kxn3CdUzT4nMfNHELcDZUIoCmVcV X-Received: from wrushilg.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:2168]) (user=rushilg job=sendgmr) by 2002:a05:6902:a8c:b0:dc2:65e9:6a35 with SMTP id cd12-20020a0569020a8c00b00dc265e96a35mr96046ybb.4.1705684187654; Fri, 19 Jan 2024 09:09:47 -0800 (PST) Date: Fri, 19 Jan 2024 17:09:39 +0000 In-Reply-To: <20231222153953.1266615-1-rushilg@google.com> Mime-Version: 1.0 References: <20231222153953.1266615-1-rushilg@google.com> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240119170939.3520918-1-rushilg@google.com> Subject: [v4] net/gve: enable imissed stats for GQ format From: Rushil Gupta To: junfeng.guo@intel.com, jeroendb@google.com, joshwash@google.com, ferruh.yigit@amd.com Cc: dev@dpdk.org, Rushil Gupta 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 Read from shared region to retrieve imissed statistics for GQ from device. Signed-off-by: Rushil Gupta Reviewed-by: Joshua Washington Acked-by: Ferruh Yigit --- drivers/net/gve/base/gve_adminq.h | 11 ++++ drivers/net/gve/gve_ethdev.c | 104 ++++++++++++++++++++++++++++++ drivers/net/gve/gve_ethdev.h | 6 ++ 3 files changed, 121 insertions(+) diff --git a/drivers/net/gve/base/gve_adminq.h b/drivers/net/gve/base/gve_adminq.h index e30b184913..f05362f85f 100644 --- a/drivers/net/gve/base/gve_adminq.h +++ b/drivers/net/gve/base/gve_adminq.h @@ -314,6 +314,17 @@ struct gve_stats_report { GVE_CHECK_STRUCT_LEN(8, gve_stats_report); +/* Numbers of gve tx/rx stats in stats report. */ +#define GVE_TX_STATS_REPORT_NUM 6 +#define GVE_RX_STATS_REPORT_NUM 2 + +/* Interval to schedule a stats report update, 20000ms. */ +#define GVE_STATS_REPORT_TIMER_PERIOD 20000 + +/* Numbers of NIC tx/rx stats in stats report. */ +#define NIC_TX_STATS_REPORT_NUM 0 +#define NIC_RX_STATS_REPORT_NUM 4 + enum gve_stat_names { /* stats from gve */ TX_WAKE_CNT = 1, diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c index ecd37ff37f..d162fd3864 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -125,6 +125,79 @@ gve_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete) return rte_eth_linkstatus_set(dev, &link); } +static int +gve_alloc_stats_report(struct gve_priv *priv, + uint16_t nb_tx_queues, uint16_t nb_rx_queues) +{ + char z_name[RTE_MEMZONE_NAMESIZE]; + int tx_stats_cnt; + int rx_stats_cnt; + + tx_stats_cnt = (GVE_TX_STATS_REPORT_NUM + NIC_TX_STATS_REPORT_NUM) * + nb_tx_queues; + rx_stats_cnt = (GVE_RX_STATS_REPORT_NUM + NIC_RX_STATS_REPORT_NUM) * + nb_rx_queues; + priv->stats_report_len = sizeof(struct gve_stats_report) + + sizeof(struct stats) * (tx_stats_cnt + rx_stats_cnt); + + snprintf(z_name, sizeof(z_name), "gve_stats_report_%s", + priv->pci_dev->device.name); + priv->stats_report_mem = rte_memzone_reserve_aligned(z_name, + priv->stats_report_len, + rte_socket_id(), + RTE_MEMZONE_IOVA_CONTIG, PAGE_SIZE); + + if (!priv->stats_report_mem) + return -ENOMEM; + + /* offset by skipping stats written by gve. */ + priv->stats_start_idx = (GVE_TX_STATS_REPORT_NUM * nb_tx_queues) + + (GVE_RX_STATS_REPORT_NUM * nb_rx_queues); + priv->stats_end_idx = priv->stats_start_idx + + (NIC_TX_STATS_REPORT_NUM * nb_tx_queues) + + (NIC_RX_STATS_REPORT_NUM * nb_rx_queues) - 1; + + return 0; +} + +static void +gve_free_stats_report(struct rte_eth_dev *dev) +{ + struct gve_priv *priv = dev->data->dev_private; + rte_memzone_free(priv->stats_report_mem); + priv->stats_report_mem = NULL; +} + +/* Read Rx NIC stats from shared region */ +static void +gve_get_imissed_from_nic(struct rte_eth_dev *dev) +{ + struct gve_stats_report *stats_report; + struct gve_rx_queue *rxq; + struct gve_priv *priv; + struct stats stat; + int queue_id; + int stat_id; + int i; + + priv = dev->data->dev_private; + if (!priv->stats_report_mem) + return; + stats_report = (struct gve_stats_report *) + priv->stats_report_mem->addr; + for (i = priv->stats_start_idx; i <= priv->stats_end_idx; i++) { + stat = stats_report->stats[i]; + queue_id = cpu_to_be32(stat.queue_id); + rxq = dev->data->rx_queues[queue_id]; + if (rxq == NULL) + continue; + stat_id = cpu_to_be32(stat.stat_name); + /* Update imissed. */ + if (stat_id == RX_NO_BUFFERS_POSTED) + rxq->stats.imissed = cpu_to_be64(stat.value); + } +} + static int gve_start_queues(struct rte_eth_dev *dev) { @@ -176,6 +249,7 @@ gve_start_queues(struct rte_eth_dev *dev) static int gve_dev_start(struct rte_eth_dev *dev) { + struct gve_priv *priv; int ret; ret = gve_start_queues(dev); @@ -187,6 +261,26 @@ gve_dev_start(struct rte_eth_dev *dev) dev->data->dev_started = 1; gve_link_update(dev, 0); + priv = dev->data->dev_private; + /* No stats available yet for Dqo. */ + if (gve_is_gqi(priv)) { + ret = gve_alloc_stats_report(priv, + dev->data->nb_tx_queues, + dev->data->nb_rx_queues); + if (ret != 0) { + PMD_DRV_LOG(ERR, + "Failed to allocate region for stats reporting."); + return ret; + } + ret = gve_adminq_report_stats(priv, priv->stats_report_len, + priv->stats_report_mem->iova, + GVE_STATS_REPORT_TIMER_PERIOD); + if (ret != 0) { + PMD_DRV_LOG(ERR, "gve_adminq_report_stats command failed."); + return ret; + } + } + return 0; } @@ -200,6 +294,9 @@ gve_dev_stop(struct rte_eth_dev *dev) dev->data->dev_started = 0; + if (gve_is_gqi(dev->data->dev_private)) + gve_free_stats_report(dev); + return 0; } @@ -352,6 +449,8 @@ static int gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) { uint16_t i; + if (gve_is_gqi(dev->data->dev_private)) + gve_get_imissed_from_nic(dev); for (i = 0; i < dev->data->nb_tx_queues; i++) { struct gve_tx_queue *txq = dev->data->tx_queues[i]; @@ -372,6 +471,7 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) stats->ibytes += rxq->stats.bytes; stats->ierrors += rxq->stats.errors; stats->rx_nombuf += rxq->stats.no_mbufs; + stats->imissed += rxq->stats.imissed; } return 0; @@ -443,6 +543,7 @@ static const struct gve_xstats_name_offset rx_xstats_name_offset[] = { { "errors", RX_QUEUE_STATS_OFFSET(errors) }, { "mbuf_alloc_errors", RX_QUEUE_STATS_OFFSET(no_mbufs) }, { "mbuf_alloc_errors_bulk", RX_QUEUE_STATS_OFFSET(no_mbufs_bulk) }, + { "imissed", RX_QUEUE_STATS_OFFSET(imissed) }, }; static int @@ -471,6 +572,9 @@ gve_xstats_get(struct rte_eth_dev *dev, uint16_t i, j, count = gve_xstats_count(dev); const char *stats; + if (gve_is_gqi(dev->data->dev_private)) + gve_get_imissed_from_nic(dev); + if (xstats == NULL || size < count) return count; diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h index 58d8943e71..9893fcfee6 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -85,6 +85,7 @@ struct gve_rx_stats { uint64_t errors; uint64_t no_mbufs; uint64_t no_mbufs_bulk; + uint64_t imissed; }; struct gve_xstats_name_offset { @@ -272,6 +273,11 @@ struct gve_priv { struct gve_tx_queue **txqs; struct gve_rx_queue **rxqs; + + uint32_t stats_report_len; + const struct rte_memzone *stats_report_mem; + uint16_t stats_start_idx; /* start index of array of stats written by NIC */ + uint16_t stats_end_idx; /* end index of array of stats written by NIC */ }; static inline bool