Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/140042/?format=api
{ "id": 140042, "url": "https://patches.dpdk.org/api/patches/140042/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20240513185448.120356-4-stephen@networkplumber.org/", "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": "<20240513185448.120356-4-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240513185448.120356-4-stephen@networkplumber.org", "date": "2024-05-13T18:52:13", "name": "[RFC,v2,3/7] net/af_packet: use SW stats helper", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7b914bf466223751b8dcc69e6f761454b2a9ee12", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20240513185448.120356-4-stephen@networkplumber.org/mbox/", "series": [ { "id": 31915, "url": "https://patches.dpdk.org/api/series/31915/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=31915", "date": "2024-05-13T18:52:10", "name": "generic SW counters", "version": 2, "mbox": "https://patches.dpdk.org/series/31915/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/140042/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/140042/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 E68144401D;\n\tMon, 13 May 2024 20:55:19 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3969340696;\n\tMon, 13 May 2024 20:55:04 +0200 (CEST)", "from mail-pf1-f179.google.com (mail-pf1-f179.google.com\n [209.85.210.179])\n by mails.dpdk.org (Postfix) with ESMTP id C764B4064A\n for <dev@dpdk.org>; Mon, 13 May 2024 20:55:01 +0200 (CEST)", "by mail-pf1-f179.google.com with SMTP id\n d2e1a72fcca58-6f447976de7so4076503b3a.1\n for <dev@dpdk.org>; Mon, 13 May 2024 11:55:01 -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.00\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 May 2024 11:55:00 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715626501;\n x=1716231301; 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=2QCTpYwAu179GL+rVw8N4xXklohXO+UbPs7wdo43KG0=;\n b=t4zzWKHuAk+wE99SdhbHgJpjLhoSEmy8uzXNuCnqFst07yUYm3vGwSVihWeKAkm/J4\n HERLRacFeBA+g60qlAc3T9diltVE54lch/z3nLBAI+c2+5bv9EpeR6IwxXqvzssMeBCS\n K09Tr+ojuyftXgW3hVXPWbj1Q6rI+PpfqvEIqH+2VNrQxPi9EDVYYca+Gfbnp5g7V3oD\n jAFD7geceBfFTbGhzcUtgzsRoLY2x0YwlFySheCSAE/Ic/Uh3dA6JkVOilCX2v2pYdLW\n wM+IH9bb7bNbcujVtUtoBrYroN/GDkd1SvuaVpZe4eGELSQC/bvzOIW4x9ALG5SR4+4j\n 360g==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1715626501; x=1716231301;\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=2QCTpYwAu179GL+rVw8N4xXklohXO+UbPs7wdo43KG0=;\n b=dDpWHGFRLwKVVpkegM3UfCDI5t69vHA+6S2eTlFzeE++6yeq0DIsbK9IJVtKFJFjL9\n CP/p8KjJR2EpruXj08KaosOd9+460vHGBz98KwJY4qUy7A5P74ijbwSpWhTVl+ZTLabg\n cwXWTjwzSqCyrK/OSaBMAhrFDYj58hw4PqqydE9+Isy3j25Z3ij7Bh9JdNNla5yIwk29\n owK0wb8FTyPt6/mxCDyFiWAls+FcY4nl/7Hw0vDEjG0dzvXxptyVv/R7wSt8yW8uNJLj\n 1iKiEpHvpj4BpR+JEzzBwRk6N9iWG3IiPTW2kilfL/Wj6KO3nFkwJLLw+eBynOIHBSLy\n xfAw==", "X-Gm-Message-State": "AOJu0YyL2WvJG5ReqkCjKfo8JU6vx8AuPdfh0R61HqsWGayOBC3VWDMY\n ERAa/idknrEpI8VQ/TTT0OOXgCjzeY+usgnF4mu/wUR2nyhthzYtYsj34SLwc7ach11wdt4rKPo\n syp74BQ==", "X-Google-Smtp-Source": "\n AGHT+IHN7HzJTa2VvG2B7s77HoOGhO4TL2u3udcQH0m0qRr8ep4XmHpFSRb+nh44MiRpbxiBXZKR5w==", "X-Received": "by 2002:aa7:8881:0:b0:6f3:ecdc:220e with SMTP id\n d2e1a72fcca58-6f4e03590ddmr11238283b3a.24.1715626500978;\n Mon, 13 May 2024 11:55:00 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n \"John W. Linville\" <linville@tuxdriver.com>", "Subject": "[RFC v2 3/7] net/af_packet: use SW stats helper", "Date": "Mon, 13 May 2024 11:52:13 -0700", "Message-ID": "<20240513185448.120356-4-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 the new generic SW stats.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/af_packet/rte_eth_af_packet.c | 95 +++++++----------------\n 1 file changed, 29 insertions(+), 66 deletions(-)", "diff": "diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c\nindex 397a32db58..2d42f3e723 100644\n--- a/drivers/net/af_packet/rte_eth_af_packet.c\n+++ b/drivers/net/af_packet/rte_eth_af_packet.c\n@@ -10,6 +10,7 @@\n #include <rte_mbuf.h>\n #include <ethdev_driver.h>\n #include <ethdev_vdev.h>\n+#include <ethdev_swstats.h>\n #include <rte_malloc.h>\n #include <rte_kvargs.h>\n #include <bus_vdev_driver.h>\n@@ -29,6 +30,7 @@\n #include <unistd.h>\n #include <poll.h>\n \n+\n #define ETH_AF_PACKET_IFACE_ARG\t\t\"iface\"\n #define ETH_AF_PACKET_NUM_Q_ARG\t\t\"qpairs\"\n #define ETH_AF_PACKET_BLOCKSIZE_ARG\t\"blocksz\"\n@@ -51,8 +53,7 @@ struct pkt_rx_queue {\n \tuint16_t in_port;\n \tuint8_t vlan_strip;\n \n-\tvolatile unsigned long rx_pkts;\n-\tvolatile unsigned long rx_bytes;\n+\tstruct rte_eth_counters stats;\n };\n \n struct pkt_tx_queue {\n@@ -64,11 +65,10 @@ struct pkt_tx_queue {\n \tunsigned int framecount;\n \tunsigned int framenum;\n \n-\tvolatile unsigned long tx_pkts;\n-\tvolatile unsigned long err_pkts;\n-\tvolatile unsigned long tx_bytes;\n+\tstruct rte_eth_counters stats;\n };\n \n+\n struct pmd_internals {\n \tunsigned nb_queues;\n \n@@ -118,8 +118,6 @@ eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tstruct rte_mbuf *mbuf;\n \tuint8_t *pbuf;\n \tstruct pkt_rx_queue *pkt_q = queue;\n-\tuint16_t num_rx = 0;\n-\tunsigned long num_rx_bytes = 0;\n \tunsigned int framecount, framenum;\n \n \tif (unlikely(nb_pkts == 0))\n@@ -164,13 +162,11 @@ eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \n \t\t/* account for the receive frame */\n \t\tbufs[i] = mbuf;\n-\t\tnum_rx++;\n-\t\tnum_rx_bytes += mbuf->pkt_len;\n+\t\trte_eth_count_mbuf(&pkt_q->stats, mbuf);\n \t}\n \tpkt_q->framenum = framenum;\n-\tpkt_q->rx_pkts += num_rx;\n-\tpkt_q->rx_bytes += num_rx_bytes;\n-\treturn num_rx;\n+\n+\treturn i;\n }\n \n /*\n@@ -205,8 +201,6 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tunsigned int framecount, framenum;\n \tstruct pollfd pfd;\n \tstruct pkt_tx_queue *pkt_q = queue;\n-\tuint16_t num_tx = 0;\n-\tunsigned long num_tx_bytes = 0;\n \tint i;\n \n \tif (unlikely(nb_pkts == 0))\n@@ -285,8 +279,7 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\tframenum = 0;\n \t\tppd = (struct tpacket2_hdr *) pkt_q->rd[framenum].iov_base;\n \n-\t\tnum_tx++;\n-\t\tnum_tx_bytes += mbuf->pkt_len;\n+\t\trte_eth_count_mbuf(&pkt_q->stats, mbuf);\n \t\trte_pktmbuf_free(mbuf);\n \t}\n \n@@ -298,15 +291,9 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t * packets will be considered successful even though only some\n \t\t * are sent.\n \t\t */\n-\n-\t\tnum_tx = 0;\n-\t\tnum_tx_bytes = 0;\n \t}\n \n \tpkt_q->framenum = framenum;\n-\tpkt_q->tx_pkts += num_tx;\n-\tpkt_q->err_pkts += i - num_tx;\n-\tpkt_q->tx_bytes += num_tx_bytes;\n \treturn i;\n }\n \n@@ -386,58 +373,31 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n }\n \n static int\n-eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)\n+eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n {\n-\tunsigned i, imax;\n-\tunsigned long rx_total = 0, tx_total = 0, tx_err_total = 0;\n-\tunsigned long rx_bytes_total = 0, tx_bytes_total = 0;\n-\tconst struct pmd_internals *internal = dev->data->dev_private;\n-\n-\timax = (internal->nb_queues < RTE_ETHDEV_QUEUE_STAT_CNTRS ?\n-\t internal->nb_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS);\n-\tfor (i = 0; i < imax; i++) {\n-\t\tigb_stats->q_ipackets[i] = internal->rx_queue[i].rx_pkts;\n-\t\tigb_stats->q_ibytes[i] = internal->rx_queue[i].rx_bytes;\n-\t\trx_total += igb_stats->q_ipackets[i];\n-\t\trx_bytes_total += igb_stats->q_ibytes[i];\n-\t}\n-\n-\timax = (internal->nb_queues < RTE_ETHDEV_QUEUE_STAT_CNTRS ?\n-\t internal->nb_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS);\n-\tfor (i = 0; i < imax; i++) {\n-\t\tigb_stats->q_opackets[i] = internal->tx_queue[i].tx_pkts;\n-\t\tigb_stats->q_obytes[i] = internal->tx_queue[i].tx_bytes;\n-\t\ttx_total += igb_stats->q_opackets[i];\n-\t\ttx_err_total += internal->tx_queue[i].err_pkts;\n-\t\ttx_bytes_total += igb_stats->q_obytes[i];\n-\t}\n-\n-\tigb_stats->ipackets = rx_total;\n-\tigb_stats->ibytes = rx_bytes_total;\n-\tigb_stats->opackets = tx_total;\n-\tigb_stats->oerrors = tx_err_total;\n-\tigb_stats->obytes = tx_bytes_total;\n-\treturn 0;\n+\treturn rte_eth_counters_stats_get(dev, offsetof(struct pkt_tx_queue, stats),\n+\t\t\t\t\t offsetof(struct pkt_rx_queue, stats), stats);\n }\n \n static int\n eth_stats_reset(struct rte_eth_dev *dev)\n {\n-\tunsigned i;\n-\tstruct pmd_internals *internal = dev->data->dev_private;\n-\n-\tfor (i = 0; i < internal->nb_queues; i++) {\n-\t\tinternal->rx_queue[i].rx_pkts = 0;\n-\t\tinternal->rx_queue[i].rx_bytes = 0;\n-\t}\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 < internal->nb_queues; i++) {\n-\t\tinternal->tx_queue[i].tx_pkts = 0;\n-\t\tinternal->tx_queue[i].err_pkts = 0;\n-\t\tinternal->tx_queue[i].tx_bytes = 0;\n-\t}\n+static int eth_xstats_get_names(struct rte_eth_dev *dev,\n+\t\t\t\tstruct rte_eth_xstat_name *names,\n+\t\t\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, 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), xstats, n);\n }\n \n static int\n@@ -636,6 +596,9 @@ static const struct eth_dev_ops ops = {\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 = eth_xstats_get,\n+\t.xstats_get_names = eth_xstats_get_names,\n+\t.xstats_reset = eth_stats_reset,\n };\n \n /*\n", "prefixes": [ "RFC", "v2", "3/7" ] }