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 671E643760; Fri, 22 Dec 2023 16:39:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3E329402B9; Fri, 22 Dec 2023 16:39:59 +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 EE097402A6 for ; Fri, 22 Dec 2023 16:39:57 +0100 (CET) Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dbdb759e73bso1687132276.2 for ; Fri, 22 Dec 2023 07:39:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1703259597; x=1703864397; darn=dpdk.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=G4ThLV0IFVkgN3WSwotx9qxqJdP8opag2Lr3tb0FUl4=; b=MrVkgqQojmuVlaIp7eLrhPzcu4xUk3oyUR2lSCbiP8GOdjlDIrq1cWGwD/6LeMkOOK s5q0wg2z004xb8XwdsY4q43c3OURC/7pX74A6Vj1qbzQDglqpbXz0O9tkZXyBFKXhmA/ M/mk049iS2o5SoUuTXpd6uhVKEPdFTlbLB41BMcBRm8/lT+EU+zye4QBEmZvj+Dp63A3 uweRuBKGdi5iCCIHuASgkzhFexnUG+KMr79hgg47o/XSgjF07pSX+Pr8SOwU4eEGk8/6 L8T4hji1/UbJFMDuduZ/1xLVrU8wKmm7fq95cWWu/tYp5akMrDW247xeqpQx9vrdwyk3 Q14w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703259597; x=1703864397; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=G4ThLV0IFVkgN3WSwotx9qxqJdP8opag2Lr3tb0FUl4=; b=AT8uo00MygRkHnKnZVj1tEyKsmBUX4Zr1dBqJQ88qFKbqfbfqOO6eF5pMicC1OAeky tkTjMAvgsL+zMKEquG8KPoula31exx61zX4rH/ytWzriyQvj+aUjJiuEIfP/4/L3QUC8 bBFpF3N5RA6hZpJEQaaovOB2L2e5/uyfMbZFcoOUfC0nPfslPonnywUdFCUODR8iier+ reXGlS9fVqT2SRfk1yrbske6Fj3UV0e5rPuCXCA4bfoS84wDiFSdFLtyVGA40Q8jTP0N evY1dtQaw8Nel5q1xJDnsCoG8/Yk1JVRC5vI18IpZ6xN0TGEuiv5OW7U9W7x6D3QglwD l4hA== X-Gm-Message-State: AOJu0YzoGPiGV7eD90S8zHmc0SpF8CoEhMfRyN26dgRrKIoqQYfONUgT DBRBCgyT7DEMAsFCtjDiKtsL0xs9utVpJV5yJeo= X-Google-Smtp-Source: AGHT+IHA/Doldbw3WDZRn4Gz6TgGbElAOBfGzddfK8TolvzDsOSzyMzGxr4fxD4qNZIGCVNES9S0wIBJlDfx X-Received: from wrushilg.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:2168]) (user=rushilg job=sendgmr) by 2002:a25:a2cb:0:b0:dbc:d4c9:bbcc with SMTP id c11-20020a25a2cb000000b00dbcd4c9bbccmr24556ybn.8.1703259597299; Fri, 22 Dec 2023 07:39:57 -0800 (PST) Date: Fri, 22 Dec 2023 15:39:53 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog Message-ID: <20231222153953.1266615-1-rushilg@google.com> Subject: [PATCH] net/gve: Enable stats reporting 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 Content-Type: text/plain; charset="UTF-8" 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. Tested using `show port xstats ` in interactive mode. This metric can be triggered by using queues > cores. Signed-off-by: Rushil Gupta Reviewed-by: Joshua Washington --- drivers/net/gve/base/gve_adminq.h | 11 ++++ drivers/net/gve/gve_ethdev.c | 95 +++++++++++++++++++++++++++++++ drivers/net/gve/gve_ethdev.h | 6 ++ 3 files changed, 112 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..836136d993 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -125,6 +125,73 @@ 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), "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); +} + +/* 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; + 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 +243,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 +255,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 +288,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 +443,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 +465,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 +537,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 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 -- 2.43.0.472.g3155946c3a-goog