Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/124295/?format=api
{ "id": 124295, "url": "https://patches.dpdk.org/api/patches/124295/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230221141350.12335-1-levendsayar@gmail.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230221141350.12335-1-levendsayar@gmail.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230221141350.12335-1-levendsayar@gmail.com", "date": "2023-02-21T14:13:50", "name": "[v4] net/gve: add Rx/Tx queue stats as extended stats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2223085a18ac39cc7d601bbca43ec394318e2f4c", "submitter": { "id": 1813, "url": "https://patches.dpdk.org/api/people/1813/?format=api", "name": "Levend Sayar", "email": "levendsayar@gmail.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230221141350.12335-1-levendsayar@gmail.com/mbox/", "series": [ { "id": 27118, "url": "https://patches.dpdk.org/api/series/27118/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=27118", "date": "2023-02-21T14:13:50", "name": "[v4] net/gve: add Rx/Tx queue stats as extended stats", "version": 4, "mbox": "https://patches.dpdk.org/series/27118/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/124295/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/124295/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 43ABD400C9;\n\tTue, 21 Feb 2023 15:13:58 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E670C431D8;\n\tTue, 21 Feb 2023 15:13:57 +0100 (CET)", "from mail-ed1-f48.google.com (mail-ed1-f48.google.com\n [209.85.208.48]) by mails.dpdk.org (Postfix) with ESMTP id B4B7040E0F\n for <dev@dpdk.org>; Tue, 21 Feb 2023 15:13:56 +0100 (CET)", "by mail-ed1-f48.google.com with SMTP id cq23so17479302edb.1\n for <dev@dpdk.org>; Tue, 21 Feb 2023 06:13:56 -0800 (PST)", "from localhost.localdomain ([176.41.28.141])\n by smtp.gmail.com with ESMTPSA id\n s16-20020a50ab10000000b004acb6d659eesm1936998edc.52.2023.02.21.06.13.54\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Tue, 21 Feb 2023 06:13:55 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=sNaGzlYVDSrbCQ6l3aIX1nxhwaKcS2+zuYVdwPb2m68=;\n b=q6AtC4mu5T5yg2ktFloYwOIS45zfIvU+nvAokrtqgwIR+NsUXppLj+nxchtcQpCtCj\n OyaLSQ/MHCQVyQBHGBXN/VmdTbj0rDF++14boFNjl7jLcbiRuYRdPXpwFUQyfwzaJwpa\n 0ZN9Xe+a5qYpX6drxDRGlQod0hz6JFOO0QWZFpsuHxTAIRxMIkeyh1ZEIHFkVCCHjdt6\n orIp+NMoHctHWwqnZrcqgpnFnVMg2PAwm2VfzDUg/UrreMAL/0qkXFDq8tjMg6ytRnA7\n tkY0vqP2uiRtZlMf55N2Qah7P6gY/1e4JjcXHRJ8fsXJvBTt9ejo+WvmH6cqDG4zBtFb\n 877g==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=sNaGzlYVDSrbCQ6l3aIX1nxhwaKcS2+zuYVdwPb2m68=;\n b=ZweloTGKUGppT+19EOmqtX127X0h5vpLC9ckApx0mpjGe/FlBo7PLQfgp8yRYoA56d\n SzXRl+YgAg4orMZHIEtM4OZJ9hZOWHObWEwD6gdtPoNmdrKsKhESOslJkEwEh1jVa7SQ\n Lo+GNGEx//+cA2J2h0UR/nKDirQQBYYsW0PnDuWbULWsMyi4YrbA8NwmZ+yC3xkGYOBu\n i2bvg/+hXYezr0yKeM8lhVpWWexsLSPNmMvr2bdEvVL5vFD7v8A9ULk8n2lK7uYUdvbT\n /sSnHo/wCL4ijWgJK0nbn1U9j+uMFkHKfIY3lIvdDhCxYwIpRYWg08PcX4c3sGQaUMg7\n Ekdw==", "X-Gm-Message-State": "AO0yUKVUB7I74oYqyDi5gMCC+eqrmvpe8a+6sb33O21MUNx9rnm5XiRp\n VHv2OEXCXK5D4mxWZArmXkzM+91oLv8=", "X-Google-Smtp-Source": "\n AK7set9tmghbinFy5FJ7+5nGB8dMy8OPbF1UmIpfQSFF9M8v5dB0jGhwe8TqEz0CtxID9QDrV8uKLw==", "X-Received": "by 2002:aa7:cc01:0:b0:4ac:bf55:7d69 with SMTP id\n q1-20020aa7cc01000000b004acbf557d69mr3546095edt.42.1676988836243;\n Tue, 21 Feb 2023 06:13:56 -0800 (PST)", "From": "Levend Sayar <levendsayar@gmail.com>", "To": "junfeng.guo@intel.com", "Cc": "dev@dpdk.org,\n\tLevend Sayar <levendsayar@gmail.com>", "Subject": "[PATCH v4] net/gve: add Rx/Tx queue stats as extended stats", "Date": "Tue, 21 Feb 2023 17:13:50 +0300", "Message-Id": "<20230221141350.12335-1-levendsayar@gmail.com>", "X-Mailer": "git-send-email 2.37.1 (Apple Git-137.1)", "In-Reply-To": "<20230220211103.8282-2-levendsayar@gmail.com>", "References": "<20230220211103.8282-2-levendsayar@gmail.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Google Virtual NIC rx/tx queue stats are added as extended stats.\n\nSigned-off-by: Levend Sayar <levendsayar@gmail.com>\n---\n drivers/net/gve/gve_ethdev.c | 137 +++++++++++++++++++++++++++++++----\n drivers/net/gve/gve_ethdev.h | 28 +++++--\n drivers/net/gve/gve_rx.c | 12 +--\n drivers/net/gve/gve_tx.c | 11 +--\n 4 files changed, 157 insertions(+), 31 deletions(-)", "diff": "diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c\nindex fef2458a16..a95bb041ea 100644\n--- a/drivers/net/gve/gve_ethdev.c\n+++ b/drivers/net/gve/gve_ethdev.c\n@@ -6,9 +6,26 @@\n #include \"base/gve_adminq.h\"\n #include \"base/gve_register.h\"\n \n+#define TX_QUEUE_STATS_OFFSET(x) offsetof(struct gve_tx_stats, x)\n+#define RX_QUEUE_STATS_OFFSET(x) offsetof(struct gve_rx_stats, x)\n+\n const char gve_version_str[] = GVE_VERSION;\n static const char gve_version_prefix[] = GVE_VERSION_PREFIX;\n \n+static const struct gve_xstats_name_offset tx_xstats_name_offset[] = {\n+\t{ \"packets\", TX_QUEUE_STATS_OFFSET(packets) },\n+\t{ \"bytes\", TX_QUEUE_STATS_OFFSET(bytes) },\n+\t{ \"errors\", TX_QUEUE_STATS_OFFSET(errors) },\n+};\n+\n+static const struct gve_xstats_name_offset rx_xstats_name_offset[] = {\n+\t{ \"packets\", RX_QUEUE_STATS_OFFSET(packets) },\n+\t{ \"bytes\", RX_QUEUE_STATS_OFFSET(bytes) },\n+\t{ \"errors\", RX_QUEUE_STATS_OFFSET(errors) },\n+\t{ \"mbuf_alloc_errors\", RX_QUEUE_STATS_OFFSET(no_mbufs) },\n+\t{ \"mbuf_alloc_errors_bulk\", RX_QUEUE_STATS_OFFSET(no_mbufs_bulk) },\n+};\n+\n static void\n gve_write_version(uint8_t *driver_version_register)\n {\n@@ -328,9 +345,9 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \t\tif (txq == NULL)\n \t\t\tcontinue;\n \n-\t\tstats->opackets += txq->packets;\n-\t\tstats->obytes += txq->bytes;\n-\t\tstats->oerrors += txq->errors;\n+\t\tstats->opackets += txq->stats.packets;\n+\t\tstats->obytes += txq->stats.bytes;\n+\t\tstats->oerrors += txq->stats.errors;\n \t}\n \n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n@@ -338,10 +355,10 @@ gve_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \t\tif (rxq == NULL)\n \t\t\tcontinue;\n \n-\t\tstats->ipackets += rxq->packets;\n-\t\tstats->ibytes += rxq->bytes;\n-\t\tstats->ierrors += rxq->errors;\n-\t\tstats->rx_nombuf += rxq->no_mbufs;\n+\t\tstats->ipackets += rxq->stats.packets;\n+\t\tstats->ibytes += rxq->stats.bytes;\n+\t\tstats->ierrors += rxq->stats.errors;\n+\t\tstats->rx_nombuf += rxq->stats.no_mbufs;\n \t}\n \n \treturn 0;\n@@ -357,9 +374,7 @@ gve_dev_stats_reset(struct rte_eth_dev *dev)\n \t\tif (txq == NULL)\n \t\t\tcontinue;\n \n-\t\ttxq->packets = 0;\n-\t\ttxq->bytes = 0;\n-\t\ttxq->errors = 0;\n+\t\tmemset(&txq->stats, 0, sizeof(txq->stats));\n \t}\n \n \tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n@@ -367,10 +382,7 @@ gve_dev_stats_reset(struct rte_eth_dev *dev)\n \t\tif (rxq == NULL)\n \t\t\tcontinue;\n \n-\t\trxq->packets = 0;\n-\t\trxq->bytes = 0;\n-\t\trxq->errors = 0;\n-\t\trxq->no_mbufs = 0;\n+\t\tmemset(&rxq->stats, 0, sizeof(rxq->stats));\n \t}\n \n \treturn 0;\n@@ -403,6 +415,101 @@ gve_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)\n \treturn 0;\n }\n \n+static int\n+gve_xstats_count(struct rte_eth_dev *dev)\n+{\n+\tuint16_t i, count = 0;\n+\n+\tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n+\t\tif (dev->data->tx_queues[i])\n+\t\t\tcount += RTE_DIM(tx_xstats_name_offset);\n+\t}\n+\n+\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n+\t\tif (dev->data->rx_queues[i])\n+\t\t\tcount += RTE_DIM(rx_xstats_name_offset);\n+\t}\n+\n+\treturn count;\n+}\n+\n+static int\n+gve_xstats_get(struct rte_eth_dev *dev,\n+\t\t\tstruct rte_eth_xstat *xstats,\n+\t\t\tunsigned int size)\n+{\n+\tuint16_t i, j, count = gve_xstats_count(dev);\n+\tconst char *stats;\n+\n+\tif ((xstats == NULL) || (size < count))\n+\t\treturn count;\n+\n+\tcount = 0;\n+\n+\tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n+\t\tconst struct gve_tx_queue *txq = dev->data->tx_queues[i];\n+\t\tif (txq == NULL)\n+\t\t\tcontinue;\n+\n+\t\tstats = (const char *)&txq->stats;\n+\t\tfor (j = 0; j < RTE_DIM(tx_xstats_name_offset); j++, count++) {\n+\t\t\txstats[count].id = count;\n+\t\t\txstats[count].value = *(const uint64_t *)\n+\t\t\t\t(stats + tx_xstats_name_offset[j].offset);\n+\t\t}\n+\t}\n+\n+\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n+\t\tconst struct gve_rx_queue *rxq = dev->data->rx_queues[i];\n+\t\tif (rxq == NULL)\n+\t\t\tcontinue;\n+\n+\t\tstats = (const char *)&rxq->stats;\n+\t\tfor (j = 0; j < RTE_DIM(rx_xstats_name_offset); j++, count++) {\n+\t\t\txstats[count].id = count;\n+\t\t\txstats[count].value = *(const uint64_t *)\n+\t\t\t\t(stats + rx_xstats_name_offset[j].offset);\n+\t\t}\n+\t}\n+\n+\treturn count;\n+}\n+\n+static int\n+gve_xstats_get_names(struct rte_eth_dev *dev,\n+\t\t\tstruct rte_eth_xstat_name *xstats_names,\n+\t\t\tunsigned int size)\n+{\n+\tuint16_t i, j, count = gve_xstats_count(dev);\n+\n+\tif ((xstats_names == NULL) || (size < count))\n+\t\treturn count;\n+\n+\tcount = 0;\n+\n+\tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n+\t\tif (dev->data->tx_queues[i] == NULL)\n+\t\t\tcontinue;\n+\n+\t\tfor (j = 0; j < RTE_DIM(tx_xstats_name_offset); j++)\n+\t\t\tsnprintf(xstats_names[count++].name,\n+\t\t\t\t RTE_ETH_XSTATS_NAME_SIZE,\n+\t\t\t\t \"tx_q%u_%s\", i, tx_xstats_name_offset[j].name);\n+\t}\n+\n+\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n+\t\tif (dev->data->rx_queues[i] == NULL)\n+\t\t\tcontinue;\n+\n+\t\tfor (j = 0; j < RTE_DIM(rx_xstats_name_offset); j++)\n+\t\t\tsnprintf(xstats_names[count++].name,\n+\t\t\t\t RTE_ETH_XSTATS_NAME_SIZE,\n+\t\t\t\t \"rx_q%u_%s\", i, rx_xstats_name_offset[j].name);\n+\t}\n+\n+\treturn count;\n+}\n+\n static const struct eth_dev_ops gve_eth_dev_ops = {\n \t.dev_configure = gve_dev_configure,\n \t.dev_start = gve_dev_start,\n@@ -417,6 +524,8 @@ static const struct eth_dev_ops gve_eth_dev_ops = {\n \t.stats_get = gve_dev_stats_get,\n \t.stats_reset = gve_dev_stats_reset,\n \t.mtu_set = gve_dev_mtu_set,\n+\t.xstats_get = gve_xstats_get,\n+\t.xstats_get_names = gve_xstats_get_names,\n };\n \n static void\ndiff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h\nindex 64e571bcae..42a02cf5d4 100644\n--- a/drivers/net/gve/gve_ethdev.h\n+++ b/drivers/net/gve/gve_ethdev.h\n@@ -67,6 +67,25 @@ struct gve_tx_iovec {\n \tuint32_t iov_len;\n };\n \n+struct gve_tx_stats {\n+\tuint64_t packets;\n+\tuint64_t bytes;\n+\tuint64_t errors;\n+};\n+\n+struct gve_rx_stats {\n+\tuint64_t packets;\n+\tuint64_t bytes;\n+\tuint64_t errors;\n+\tuint64_t no_mbufs;\n+\tuint64_t no_mbufs_bulk;\n+};\n+\n+struct gve_xstats_name_offset {\n+\tchar name[RTE_ETH_XSTATS_NAME_SIZE];\n+\tunsigned int offset;\n+};\n+\n struct gve_tx_queue {\n \tvolatile union gve_tx_desc *tx_desc_ring;\n \tconst struct rte_memzone *mz;\n@@ -93,9 +112,7 @@ struct gve_tx_queue {\n \tstruct gve_tx_iovec *iov_ring;\n \n \t/* stats items */\n-\tuint64_t packets;\n-\tuint64_t bytes;\n-\tuint64_t errors;\n+\tstruct gve_tx_stats stats;\n \n \tuint16_t port_id;\n \tuint16_t queue_id;\n@@ -136,10 +153,7 @@ struct gve_rx_queue {\n \tstruct gve_queue_page_list *qpl;\n \n \t/* stats items */\n-\tuint64_t packets;\n-\tuint64_t bytes;\n-\tuint64_t errors;\n-\tuint64_t no_mbufs;\n+\tstruct gve_rx_stats stats;\n \n \tstruct gve_priv *hw;\n \tconst struct rte_memzone *qres_mz;\ndiff --git a/drivers/net/gve/gve_rx.c b/drivers/net/gve/gve_rx.c\nindex d346efa57c..8d8f94efff 100644\n--- a/drivers/net/gve/gve_rx.c\n+++ b/drivers/net/gve/gve_rx.c\n@@ -20,6 +20,7 @@ gve_rx_refill(struct gve_rx_queue *rxq)\n \tif (nb_alloc <= rxq->nb_avail) {\n \t\tdiag = rte_pktmbuf_alloc_bulk(rxq->mpool, &rxq->sw_ring[idx], nb_alloc);\n \t\tif (diag < 0) {\n+\t\t\trxq->stats.no_mbufs_bulk++;\n \t\t\tfor (i = 0; i < nb_alloc; i++) {\n \t\t\t\tnmb = rte_pktmbuf_alloc(rxq->mpool);\n \t\t\t\tif (!nmb)\n@@ -27,7 +28,7 @@ gve_rx_refill(struct gve_rx_queue *rxq)\n \t\t\t\trxq->sw_ring[idx + i] = nmb;\n \t\t\t}\n \t\t\tif (i != nb_alloc) {\n-\t\t\t\trxq->no_mbufs += nb_alloc - i;\n+\t\t\t\trxq->stats.no_mbufs += nb_alloc - i;\n \t\t\t\tnb_alloc = i;\n \t\t\t}\n \t\t}\n@@ -55,6 +56,7 @@ gve_rx_refill(struct gve_rx_queue *rxq)\n \t\t\tnb_alloc = rxq->nb_rx_desc - idx;\n \t\tdiag = rte_pktmbuf_alloc_bulk(rxq->mpool, &rxq->sw_ring[idx], nb_alloc);\n \t\tif (diag < 0) {\n+\t\t\trxq->stats.no_mbufs_bulk++;\n \t\t\tfor (i = 0; i < nb_alloc; i++) {\n \t\t\t\tnmb = rte_pktmbuf_alloc(rxq->mpool);\n \t\t\t\tif (!nmb)\n@@ -62,7 +64,7 @@ gve_rx_refill(struct gve_rx_queue *rxq)\n \t\t\t\trxq->sw_ring[idx + i] = nmb;\n \t\t\t}\n \t\t\tif (i != nb_alloc) {\n-\t\t\t\trxq->no_mbufs += nb_alloc - i;\n+\t\t\t\trxq->stats.no_mbufs += nb_alloc - i;\n \t\t\t\tnb_alloc = i;\n \t\t\t}\n \t\t}\n@@ -106,7 +108,7 @@ gve_rx_burst(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\t\tbreak;\n \n \t\tif (rxd->flags_seq & GVE_RXF_ERR) {\n-\t\t\trxq->errors++;\n+\t\t\trxq->stats.errors++;\n \t\t\tcontinue;\n \t\t}\n \n@@ -154,8 +156,8 @@ gve_rx_burst(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\tgve_rx_refill(rxq);\n \n \tif (nb_rx) {\n-\t\trxq->packets += nb_rx;\n-\t\trxq->bytes += bytes;\n+\t\trxq->stats.packets += nb_rx;\n+\t\trxq->stats.bytes += bytes;\n \t}\n \n \treturn nb_rx;\ndiff --git a/drivers/net/gve/gve_tx.c b/drivers/net/gve/gve_tx.c\nindex 9b41c59358..fee3b939c7 100644\n--- a/drivers/net/gve/gve_tx.c\n+++ b/drivers/net/gve/gve_tx.c\n@@ -366,9 +366,9 @@ gve_tx_burst_qpl(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\ttxq->tx_tail = tx_tail;\n \t\ttxq->sw_tail = sw_id;\n \n-\t\ttxq->packets += nb_tx;\n-\t\ttxq->bytes += bytes;\n-\t\ttxq->errors += nb_pkts - nb_tx;\n+\t\ttxq->stats.packets += nb_tx;\n+\t\ttxq->stats.bytes += bytes;\n+\t\ttxq->stats.errors += nb_pkts - nb_tx;\n \t}\n \n \treturn nb_tx;\n@@ -455,8 +455,9 @@ gve_tx_burst_ra(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\trte_write32(rte_cpu_to_be_32(tx_tail), txq->qtx_tail);\n \t\ttxq->tx_tail = tx_tail;\n \n-\t\ttxq->packets += nb_tx;\n-\t\ttxq->bytes += bytes;\n+\t\ttxq->stats.packets += nb_tx;\n+\t\ttxq->stats.bytes += bytes;\n+\t\ttxq->stats.errors += nb_pkts - nb_tx;\n \t}\n \n \treturn nb_tx;\n", "prefixes": [ "v4" ] }