Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/140045/?format=api
{ "id": 140045, "url": "http://patchwork.dpdk.org/api/patches/140045/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240513185448.120356-7-stephen@networkplumber.org/", "project": { "id": 1, "url": "http://patchwork.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": "<20240513185448.120356-7-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240513185448.120356-7-stephen@networkplumber.org", "date": "2024-05-13T18:52:16", "name": "[RFC,v2,6/7] net/af_xdp: use generic SW stats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "15b30d131cc46ac0d49190b230f9c862c42a3227", "submitter": { "id": 27, "url": "http://patchwork.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20240513185448.120356-7-stephen@networkplumber.org/mbox/", "series": [ { "id": 31915, "url": "http://patchwork.dpdk.org/api/series/31915/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31915", "date": "2024-05-13T18:52:10", "name": "generic SW counters", "version": 2, "mbox": "http://patchwork.dpdk.org/series/31915/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/140045/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/140045/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 5723A4401D;\n\tMon, 13 May 2024 20:55:42 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7990540A70;\n\tMon, 13 May 2024 20:55:08 +0200 (CEST)", "from mail-oo1-f48.google.com (mail-oo1-f48.google.com\n [209.85.161.48]) by mails.dpdk.org (Postfix) with ESMTP id 25C36402F1\n for <dev@dpdk.org>; Mon, 13 May 2024 20:55:04 +0200 (CEST)", "by mail-oo1-f48.google.com with SMTP id\n 006d021491bc7-5b27c5603ddso2226094eaf.1\n for <dev@dpdk.org>; Mon, 13 May 2024 11:55:04 -0700 (PDT)", "from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])\n by smtp.gmail.com with ESMTPSA id\n 41be03b00d2f7-634103f7237sm8154680a12.71.2024.05.13.11.55.02\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 May 2024 11:55:03 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715626503;\n x=1716231303; darn=dpdk.org;\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=LU+R+s5lrkS/n7Y7WnI42Hrf1kiafOz4s5fGKJUBiq0=;\n b=smDOVn2gs6MBy/+dC6S+pogDAhQt+/2qiF1w8V4ssvQH4sqFvwE0qNakuMp1Xn8R3Q\n 70Zm0TS8Hb89smx8q+8zfKJS0o5gb5kQ1da9thXsOOpbESwMwG7zPyK7rLuR6RTomiU1\n spNlKsyq9f3lbMC5MtyaItoNX7HrQGon70nC9GA/AcArIzsee6svZ10KRFFXvupoi9Xw\n zcHFL6CwjxSzgjVcotCx/TPtr2a9OagxamMiWq3/NT9270SGTD8ItI2T0vlrFKEaf6FD\n 5TIYQEbld5wtG0lcwTpQ1lyz8mFUx+BNUvKsgu/Gytjt2+HBf72N4j1JgGwNm3da8V/r\n NE6Q==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1715626503; x=1716231303;\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=LU+R+s5lrkS/n7Y7WnI42Hrf1kiafOz4s5fGKJUBiq0=;\n b=e/v2dxxem1g5RdBF5TEOHzm4OxqJZ8IZkxS5Y/hSk6U05vkEeNNXO6HkFUJHG8fdAO\n 3gzbSqbpHtIhBHUlXIdaQrUDQ+sfumIi4RubpzHWAwp81QmMGSsFk8auQ2jOQU8ZpRAX\n /jhrgLZlxwLVRqR80ITstI+/ELNyaGgVTvQ57PSAd3mfEp9x2vSMkdGNydYkDnqqq34y\n A00X9WZEesahRBrYxaElCVEWQBIYWLNiQDBhW2AbiUGkpr79mLBgx7dxuMG3iG+8I/1Q\n ovAdWKG85gos20kBqu/BirBzN8vPd+bwR0XtHnaojwVc/rJgICkSZxi1KYvC3ky2t/5M\n wdTA==", "X-Gm-Message-State": "AOJu0YxmcGwuefqN4lN5GNZ7qOItR69ELEXmgmKPT05DsRmX7ONAMuty\n T+5qcY/UNHDzwQbGxnrxSbsJbbq6yWUFFizmDBZj74kpwH8o83+mGm7dlMokdVmPz8oCtFXy5Rt\n WHKdA7A==", "X-Google-Smtp-Source": "\n AGHT+IF4xUgV2Tk1FK+wG/N68uCXFWS4Pey03sD1t6IMGFPbSezMJO1lCPhSs7teAcbQKvbaNY6k+Q==", "X-Received": "by 2002:a05:6358:9386:b0:186:119d:8c16 with SMTP id\n e5c5f4694b2df-193bcfe3671mr1165636355d.23.1715626503459;\n Mon, 13 May 2024 11:55:03 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Ciara Loftus <ciara.loftus@intel.com>", "Subject": "[RFC v2 6/7] net/af_xdp: use generic SW stats", "Date": "Mon, 13 May 2024 11:52:16 -0700", "Message-ID": "<20240513185448.120356-7-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240513185448.120356-1-stephen@networkplumber.org>", "References": "<20240510050507.14381-1-stephen@networkplumber.org>\n <20240513185448.120356-1-stephen@networkplumber.org>", "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": "Use common code for all SW stats.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/af_xdp/rte_eth_af_xdp.c | 115 +++++++++++-----------------\n 1 file changed, 44 insertions(+), 71 deletions(-)", "diff": "diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c\nindex 268a130c49..9420420aa4 100644\n--- a/drivers/net/af_xdp/rte_eth_af_xdp.c\n+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c\n@@ -20,6 +20,7 @@\n #include <rte_ethdev.h>\n #include <ethdev_driver.h>\n #include <ethdev_vdev.h>\n+#include <ethdev_swstats.h>\n #include <rte_kvargs.h>\n #include <bus_vdev_driver.h>\n #include <rte_string_fns.h>\n@@ -120,19 +121,13 @@ struct xsk_umem_info {\n \tuint32_t max_xsks;\n };\n \n-struct rx_stats {\n-\tuint64_t rx_pkts;\n-\tuint64_t rx_bytes;\n-\tuint64_t rx_dropped;\n-};\n-\n struct pkt_rx_queue {\n \tstruct xsk_ring_cons rx;\n \tstruct xsk_umem_info *umem;\n \tstruct xsk_socket *xsk;\n \tstruct rte_mempool *mb_pool;\n \n-\tstruct rx_stats stats;\n+\tstruct rte_eth_counters stats;\n \n \tstruct xsk_ring_prod fq;\n \tstruct xsk_ring_cons cq;\n@@ -143,17 +138,11 @@ struct pkt_rx_queue {\n \tint busy_budget;\n };\n \n-struct tx_stats {\n-\tuint64_t tx_pkts;\n-\tuint64_t tx_bytes;\n-\tuint64_t tx_dropped;\n-};\n-\n struct pkt_tx_queue {\n \tstruct xsk_ring_prod tx;\n \tstruct xsk_umem_info *umem;\n \n-\tstruct tx_stats stats;\n+\tstruct rte_eth_counters stats;\n \n \tstruct pkt_rx_queue *pair;\n \tint xsk_queue_idx;\n@@ -308,7 +297,6 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tstruct xsk_ring_prod *fq = &rxq->fq;\n \tstruct xsk_umem_info *umem = rxq->umem;\n \tuint32_t idx_rx = 0;\n-\tunsigned long rx_bytes = 0;\n \tint i;\n \tstruct rte_mbuf *fq_bufs[ETH_AF_XDP_RX_BATCH_SIZE];\n \n@@ -363,16 +351,13 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \n \t\trte_pktmbuf_pkt_len(bufs[i]) = len;\n \t\trte_pktmbuf_data_len(bufs[i]) = len;\n-\t\trx_bytes += len;\n+\n+\t\trte_eth_count_mbuf(&rxq->stats, bufs[i]);\n \t}\n \n \txsk_ring_cons__release(rx, nb_pkts);\n \t(void)reserve_fill_queue(umem, nb_pkts, fq_bufs, fq);\n \n-\t/* statistics */\n-\trxq->stats.rx_pkts += nb_pkts;\n-\trxq->stats.rx_bytes += rx_bytes;\n-\n \treturn nb_pkts;\n }\n #else\n@@ -384,7 +369,6 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tstruct xsk_umem_info *umem = rxq->umem;\n \tstruct xsk_ring_prod *fq = &rxq->fq;\n \tuint32_t idx_rx = 0;\n-\tunsigned long rx_bytes = 0;\n \tint i;\n \tuint32_t free_thresh = fq->size >> 1;\n \tstruct rte_mbuf *mbufs[ETH_AF_XDP_RX_BATCH_SIZE];\n@@ -424,16 +408,13 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\trte_ring_enqueue(umem->buf_ring, (void *)addr);\n \t\trte_pktmbuf_pkt_len(mbufs[i]) = len;\n \t\trte_pktmbuf_data_len(mbufs[i]) = len;\n-\t\trx_bytes += len;\n+\t\trte_eth_count_mbuf(&rxq->stats, mbufs[i]);\n+\n \t\tbufs[i] = mbufs[i];\n \t}\n \n \txsk_ring_cons__release(rx, nb_pkts);\n \n-\t/* statistics */\n-\trxq->stats.rx_pkts += nb_pkts;\n-\trxq->stats.rx_bytes += rx_bytes;\n-\n \treturn nb_pkts;\n }\n #endif\n@@ -527,9 +508,8 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tstruct pkt_tx_queue *txq = queue;\n \tstruct xsk_umem_info *umem = txq->umem;\n \tstruct rte_mbuf *mbuf;\n-\tunsigned long tx_bytes = 0;\n \tint i;\n-\tuint32_t idx_tx;\n+\tuint32_t idx_tx, pkt_len;\n \tuint16_t count = 0;\n \tstruct xdp_desc *desc;\n \tuint64_t addr, offset;\n@@ -541,6 +521,7 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \n \tfor (i = 0; i < nb_pkts; i++) {\n \t\tmbuf = bufs[i];\n+\t\tpkt_len = rte_pktmbuf_pkt_len(mbuf);\n \n \t\tif (mbuf->pool == umem->mb_pool) {\n \t\t\tif (!xsk_ring_prod__reserve(&txq->tx, 1, &idx_tx)) {\n@@ -589,17 +570,13 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\tcount++;\n \t\t}\n \n-\t\ttx_bytes += mbuf->pkt_len;\n+\t\trte_eth_count_packet(&txq->stats, pkt_len);\n \t}\n \n out:\n \txsk_ring_prod__submit(&txq->tx, count);\n \tkick_tx(txq, cq);\n \n-\ttxq->stats.tx_pkts += count;\n-\ttxq->stats.tx_bytes += tx_bytes;\n-\ttxq->stats.tx_dropped += nb_pkts - count;\n-\n \treturn count;\n }\n #else\n@@ -610,7 +587,6 @@ af_xdp_tx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tstruct xsk_umem_info *umem = txq->umem;\n \tstruct rte_mbuf *mbuf;\n \tvoid *addrs[ETH_AF_XDP_TX_BATCH_SIZE];\n-\tunsigned long tx_bytes = 0;\n \tint i;\n \tuint32_t idx_tx;\n \tstruct xsk_ring_cons *cq = &txq->pair->cq;\n@@ -640,7 +616,8 @@ af_xdp_tx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\tpkt = xsk_umem__get_data(umem->mz->addr,\n \t\t\t\t\t desc->addr);\n \t\trte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *), desc->len);\n-\t\ttx_bytes += mbuf->pkt_len;\n+\t\trte_eth_qsw_update(&txq->stats, mbuf);\n+\n \t\trte_pktmbuf_free(mbuf);\n \t}\n \n@@ -648,9 +625,6 @@ af_xdp_tx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \n \tkick_tx(txq, cq);\n \n-\ttxq->stats.tx_pkts += nb_pkts;\n-\ttxq->stats.tx_bytes += tx_bytes;\n-\n \treturn nb_pkts;\n }\n \n@@ -847,39 +821,26 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n static int\n eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n {\n-\tstruct pmd_internals *internals = dev->data->dev_private;\n \tstruct pmd_process_private *process_private = dev->process_private;\n-\tstruct xdp_statistics xdp_stats;\n-\tstruct pkt_rx_queue *rxq;\n-\tstruct pkt_tx_queue *txq;\n-\tsocklen_t optlen;\n-\tint i, ret, fd;\n+\tunsigned int i;\n \n-\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n-\t\toptlen = sizeof(struct xdp_statistics);\n-\t\trxq = &internals->rx_queues[i];\n-\t\ttxq = rxq->pair;\n-\t\tstats->q_ipackets[i] = rxq->stats.rx_pkts;\n-\t\tstats->q_ibytes[i] = rxq->stats.rx_bytes;\n+\trte_eth_counters_stats_get(dev, offsetof(struct pkt_tx_queue, stats),\n+\t\t\t\t offsetof(struct pkt_rx_queue, stats), stats);\n \n-\t\tstats->q_opackets[i] = txq->stats.tx_pkts;\n-\t\tstats->q_obytes[i] = txq->stats.tx_bytes;\n+\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n+\t\tstruct xdp_statistics xdp_stats;\n+\t\tsocklen_t optlen = sizeof(xdp_stats);\n+\t\tint fd;\n \n-\t\tstats->ipackets += stats->q_ipackets[i];\n-\t\tstats->ibytes += stats->q_ibytes[i];\n-\t\tstats->imissed += rxq->stats.rx_dropped;\n-\t\tstats->oerrors += txq->stats.tx_dropped;\n \t\tfd = process_private->rxq_xsk_fds[i];\n-\t\tret = fd >= 0 ? getsockopt(fd, SOL_XDP, XDP_STATISTICS,\n-\t\t\t\t\t &xdp_stats, &optlen) : -1;\n-\t\tif (ret != 0) {\n+\t\tif (fd < 0)\n+\t\t\tcontinue;\n+\t\tif (getsockopt(fd, SOL_XDP, XDP_STATISTICS,\n+\t\t\t &xdp_stats, &optlen) < 0) {\n \t\t\tAF_XDP_LOG(ERR, \"getsockopt() failed for XDP_STATISTICS.\\n\");\n \t\t\treturn -1;\n \t\t}\n \t\tstats->imissed += xdp_stats.rx_dropped;\n-\n-\t\tstats->opackets += stats->q_opackets[i];\n-\t\tstats->obytes += stats->q_obytes[i];\n \t}\n \n \treturn 0;\n@@ -888,19 +849,28 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n static int\n eth_stats_reset(struct rte_eth_dev *dev)\n {\n-\tstruct pmd_internals *internals = dev->data->dev_private;\n-\tint i;\n+\treturn rte_eth_counters_reset(dev, offsetof(struct pkt_tx_queue, stats),\n+\t\t\t\t offsetof(struct pkt_rx_queue, stats));\n+}\n \n-\tfor (i = 0; i < internals->queue_cnt; i++) {\n-\t\tmemset(&internals->rx_queues[i].stats, 0,\n-\t\t\t\t\tsizeof(struct rx_stats));\n-\t\tmemset(&internals->tx_queues[i].stats, 0,\n-\t\t\t\t\tsizeof(struct tx_stats));\n-\t}\n+static int\n+eth_xstats_get_names(struct rte_eth_dev *dev,\n+\t\t struct rte_eth_xstat_name *names,\n+\t\t __rte_unused unsigned int limit)\n+{\n+\treturn rte_eth_counters_xstats_get_names(dev, names);\n+}\n \n-\treturn 0;\n+static int\n+eth_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n+\t unsigned int n)\n+{\n+\treturn rte_eth_counters_xstats_get(dev, offsetof(struct pkt_tx_queue, stats),\n+\t\t\t\t\t offsetof(struct pkt_rx_queue, stats),\n+\t\t\t\t\t xstats, n);\n }\n \n+\n #ifdef RTE_NET_AF_XDP_LIBBPF_XDP_ATTACH\n \n static int link_xdp_prog_with_dev(int ifindex, int fd, __u32 flags)\n@@ -1899,6 +1869,9 @@ static const struct eth_dev_ops ops_cni = {\n \t.link_update = eth_link_update,\n \t.stats_get = eth_stats_get,\n \t.stats_reset = eth_stats_reset,\n+\t.xstats_get_names = eth_xstats_get_names,\n+\t.xstats_get = eth_xstats_get,\n+\t.xstats_reset = eth_stats_reset,\n \t.get_monitor_addr = eth_get_monitor_addr,\n };\n \n", "prefixes": [ "RFC", "v2", "6/7" ] }