Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/140142/?format=api
{ "id": 140142, "url": "http://patchwork.dpdk.org/api/patches/140142/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240516154327.64104-4-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": "<20240516154327.64104-4-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240516154327.64104-4-stephen@networkplumber.org", "date": "2024-05-16T15:40:39", "name": "[v5,3/9] net/af_packet: use generic SW stats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e182ea27dc21db4e7e4c038c89634193c9455b69", "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/20240516154327.64104-4-stephen@networkplumber.org/mbox/", "series": [ { "id": 31939, "url": "http://patchwork.dpdk.org/api/series/31939/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31939", "date": "2024-05-16T15:40:36", "name": "Generic 64 bit counters", "version": 5, "mbox": "http://patchwork.dpdk.org/series/31939/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/140142/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/140142/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 D7AC243F81;\n\tThu, 16 May 2024 17:44:00 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0DFAB40684;\n\tThu, 16 May 2024 17:43:44 +0200 (CEST)", "from mail-pf1-f171.google.com (mail-pf1-f171.google.com\n [209.85.210.171])\n by mails.dpdk.org (Postfix) with ESMTP id 0FAA3402F1\n for <dev@dpdk.org>; Thu, 16 May 2024 17:43:41 +0200 (CEST)", "by mail-pf1-f171.google.com with SMTP id\n d2e1a72fcca58-6f447976de7so346991b3a.1\n for <dev@dpdk.org>; Thu, 16 May 2024 08:43:40 -0700 (PDT)", "from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])\n by smtp.gmail.com with ESMTPSA id\n d2e1a72fcca58-6f67b526b44sm2457430b3a.149.2024.05.16.08.43.39\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 16 May 2024 08:43:39 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715874220;\n x=1716479020; 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=SUE9fO9/yU42C4wqedNCLbGs+mpPzKdD4hF5j4IP+8c=;\n b=qfeRvjDvp/14n/HY7glL4PajYtaM6Ja6drHS6Gsu1c1tCfEyk1U++ZF5EpV3jUQe24\n QFike5GdJCGyZR5NjWTvznhVwT9w+TKWBsUfP2rhJlZZPnJPHtVnHCmXUDAVS1ox/snR\n thnMskMGEB+m8RFm0fFQaphjsPPvTrAvPgQtQC/Va9OZUuCVdMRbhb7+N7Vg8mQ7im3N\n 4kYwQ00Ytg/dy8uQH7ok0ivniNpYDWvYyuOEQ/VWRgypZdoBXAMe3uXZNctfmHl6yZCB\n /vLi1BxVtoR9M85i5r7HoJYa3TBaz3v9j5UT6pZ9iGMvCh30W4eaw3F4kH6GeaTeMoWP\n J8XQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1715874220; x=1716479020;\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=SUE9fO9/yU42C4wqedNCLbGs+mpPzKdD4hF5j4IP+8c=;\n b=xDJbns6jeymEj69eUh82TnfJLxKxlWg/ScM4UK0LtLqok59YuA2SxwrxikpmRtGvG3\n ul7h0Jhp0Tqf8Fw3bqY3yJ8LqBKGp35pgBvNu1MOtVtDzYBbXCtJIon3K58DDbDfxDLh\n rX6ZRpEqEX3myBGlEr3PKoTi89cbow2JIdKYpYQqXpQ5QGJuMphslhNiciPcJzLNi3dE\n zzaDM7J20xnc4wzWdHhnPcmMObRlLfSPNbFaJth/13VzGVtQIbpDE1ATNiLuAeO7urhA\n vec5BxMYq343NPqOKJzIXyJWOLfQUX+Q34yWuTTTpcwo9IaDb0vg0RDZcuZ7va+wh7Od\n WKQQ==", "X-Gm-Message-State": "AOJu0YwIIId7Fmo4xAwJq8XWB+q9LXHTPm2O0s92XGSIT57Xm69xurOu\n 7Bt34GHxW0bR7mprfXS70/hvxMlqeRd64eJmimxIs+FyRujwVCmHUW0Ig6gv6gSLgUe2MUfY0fA\n xuD8=", "X-Google-Smtp-Source": "\n AGHT+IE0hCC6+LRSJefvQ90kx+owV3ehYfhg9zv3CbBhdtW7CcDP+fXzaahwTxc79nZ2pj7pEjj9WA==", "X-Received": "by 2002:a05:6a00:398e:b0:6f4:d079:bb2b with SMTP id\n d2e1a72fcca58-6f4e02adb90mr19032084b3a.9.1715874220190;\n Thu, 16 May 2024 08:43:40 -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": "[PATCH v5 3/9] net/af_packet: use generic SW stats", "Date": "Thu, 16 May 2024 08:40:39 -0700", "Message-ID": "<20240516154327.64104-4-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240516154327.64104-1-stephen@networkplumber.org>", "References": "<20240510050507.14381-1-stephen@networkplumber.org>\n <20240516154327.64104-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 | 82 ++++-------------------\n 1 file changed, 14 insertions(+), 68 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..89b737e7dc 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,17 @@ 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-\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-\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 static int\n", "prefixes": [ "v5", "3/9" ] }