Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/140232/?format=api
{ "id": 140232, "url": "http://patchwork.dpdk.org/api/patches/140232/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240521201801.126886-5-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": "<20240521201801.126886-5-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240521201801.126886-5-stephen@networkplumber.org", "date": "2024-05-21T20:16:37", "name": "[v9,4/8] net/af_xdp: use generic SW stats", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "44d15aeea61a8a65a90d4f47a8d52ecedf40f240", "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/20240521201801.126886-5-stephen@networkplumber.org/mbox/", "series": [ { "id": 31956, "url": "http://patchwork.dpdk.org/api/series/31956/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31956", "date": "2024-05-21T20:16:33", "name": "Common statistics for SW PMD's", "version": 9, "mbox": "http://patchwork.dpdk.org/series/31956/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/140232/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/140232/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 A95D24408D;\n\tTue, 21 May 2024 22:18:44 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 6005A40A77;\n\tTue, 21 May 2024 22:18:28 +0200 (CEST)", "from mail-pg1-f169.google.com (mail-pg1-f169.google.com\n [209.85.215.169])\n by mails.dpdk.org (Postfix) with ESMTP id 99F80400D7\n for <dev@dpdk.org>; Tue, 21 May 2024 22:18:07 +0200 (CEST)", "by mail-pg1-f169.google.com with SMTP id\n 41be03b00d2f7-5e8470c1cb7so1586167a12.2\n for <dev@dpdk.org>; Tue, 21 May 2024 13:18:07 -0700 (PDT)", "from hermes.lan (204-195-96-226.wavecable.com. [204.195.96.226])\n by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-1f30fb5303csm16119075ad.166.2024.05.21.13.18.06\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 21 May 2024 13:18:06 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1716322687;\n x=1716927487; 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=mBzpjYE8DoSG3Siz752I1pLevMRX7Gd2+d2mJF6DBuM=;\n b=tUCiQR+sT8VMpsLcv1Ch8p4y9xx4yRnbn8rIx7NQkK4Pw3zxtjoQ/4OSns/esDRtTj\n HsNdulDQgrcJ10E0NGG9V3Ld+PXocryNP9XkyAAH+Noky62nrMlumxlq5fR6z6T45KZl\n jTw02NDRUvq58PL5tEBG4mtlnXrdZXRddO8gJVIWzvmxbkwoeLzmhg/7x3A+0f1E1ETv\n xdKol9/jtOoaVfovPbA9ugEYjlSZxtuMzq8gB7U2bDznhTI5xWb73EBJuD0BKGIxmMCL\n XpwDN5Ib/yHBCwlSksp4gNmwFCtAkBhudylh/rAgpR8gwKdI9FXHz0yRT7YJjWelDdsE\n qLOg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1716322687; x=1716927487;\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=mBzpjYE8DoSG3Siz752I1pLevMRX7Gd2+d2mJF6DBuM=;\n b=PsXfQaEA2dFYEml39lDOfbacDgyQoIfd1I0Kk4ti6ZCIxqI94ysSasrNU/y0L15VAG\n QSUrvyFQex6up7LMTHAIgrDJeLMtWN5aswv8nf7GASgJWqv7l6sJ1MH88p6fsPd8EgoV\n ovTnDX0kRZxlr+y4DAGxT0IKYGAyqusQCRGbo8/1p1oFdw7I0v6srUHsABlLCxBGYe38\n 7p3FlVIWMeisDiZnoLDf9SfD78INBYCM4Axxu/bEdLfEfcGRjgksniAfIEtZhWGNgssU\n su568Y2dneEPN267w0QHYBObSogZMJW1+Biyj/1Yfkm7/5hzEllrdY1Ds1HTu3nG++Am\n x6Cw==", "X-Gm-Message-State": "AOJu0Yz80k7V10AGIXBvN1c8NsnK6MAm0XfQBGNlMldJnuboVF03y+hT\n fOQ6rwY/g1OvKlpSD4fuirZW5chgCapdoBgBSJW0BCh4CGFteCibl5ezduCHQGSJp9cpYXKa72g\n M", "X-Google-Smtp-Source": "\n AGHT+IHi2BRps6THIztGwcPTG7pRuS992Cd9MHkF9h9HLx5fYs6PLBHPrAX5cwjBrtQvYx9Ap/rodw==", "X-Received": "by 2002:a17:903:94b:b0:1f2:fbda:8671 with SMTP id\n d9443c01a7336-1f31c95c500mr382375ad.6.1716322686818;\n Tue, 21 May 2024 13:18:06 -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": "[PATCH v9 4/8] net/af_xdp: use generic SW stats", "Date": "Tue, 21 May 2024 13:16:37 -0700", "Message-ID": "<20240521201801.126886-5-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240521201801.126886-1-stephen@networkplumber.org>", "References": "<20240510050507.14381-1-stephen@networkplumber.org>\n <20240521201801.126886-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 | 85 ++++++++---------------------\n 1 file changed, 22 insertions(+), 63 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 6ba455bb9b..c563621798 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@@ -369,9 +358,7 @@ af_xdp_rx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\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+\trte_eth_count_packets(&rxq->stats, nb_pkts, rx_bytes);\n \n \treturn nb_pkts;\n }\n@@ -429,10 +416,7 @@ af_xdp_rx_cp(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\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+\trte_eth_count_packets(&rxq->stats, nb_pkts, rx_bytes);\n \n \treturn nb_pkts;\n }\n@@ -558,6 +542,7 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\t\tumem->mb_pool->header_size;\n \t\t\toffset = offset << XSK_UNALIGNED_BUF_OFFSET_SHIFT;\n \t\t\tdesc->addr = addr | offset;\n+\t\t\ttx_bytes += mbuf->pkt_len;\n \t\t\tcount++;\n \t\t} else {\n \t\t\tstruct rte_mbuf *local_mbuf =\n@@ -585,20 +570,17 @@ af_xdp_tx_zc(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\tdesc->addr = addr | offset;\n \t\t\trte_memcpy(pkt, rte_pktmbuf_mtod(mbuf, void *),\n \t\t\t\t\tdesc->len);\n+\t\t\ttx_bytes += mbuf->pkt_len;\n \t\t\trte_pktmbuf_free(mbuf);\n \t\t\tcount++;\n \t\t}\n-\n-\t\ttx_bytes += mbuf->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+\trte_eth_count_packets(&txq->stats, count, tx_bytes);\n \n \treturn count;\n }\n@@ -648,8 +630,7 @@ 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+\trte_eth_count_packets(&txq->stats, nb_pkts, tx_bytes);\n \n \treturn nb_pkts;\n }\n@@ -847,39 +828,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,17 +856,8 @@ 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-\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-\n-\treturn 0;\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 #ifdef RTE_NET_AF_XDP_LIBBPF_XDP_ATTACH\n", "prefixes": [ "v9", "4/8" ] }