Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/140014/?format=api
{ "id": 140014, "url": "https://patches.dpdk.org/api/patches/140014/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20240510050507.14381-3-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": "<20240510050507.14381-3-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240510050507.14381-3-stephen@networkplumber.org", "date": "2024-05-10T05:01:22", "name": "[RFC,2/3] net/af_packet: use SW stats helper", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "f2061f54361d66b73a70925172340d4caf3855d2", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20240510050507.14381-3-stephen@networkplumber.org/mbox/", "series": [ { "id": 31900, "url": "https://patches.dpdk.org/api/series/31900/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=31900", "date": "2024-05-10T05:01:20", "name": "generic sw counters", "version": 1, "mbox": "https://patches.dpdk.org/series/31900/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/140014/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/140014/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 5009243FEC;\n\tFri, 10 May 2024 07:05:26 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2CE8D402ED;\n\tFri, 10 May 2024 07:05:16 +0200 (CEST)", "from mail-pl1-f169.google.com (mail-pl1-f169.google.com\n [209.85.214.169])\n by mails.dpdk.org (Postfix) with ESMTP id 9C493402DD\n for <dev@dpdk.org>; Fri, 10 May 2024 07:05:13 +0200 (CEST)", "by mail-pl1-f169.google.com with SMTP id\n d9443c01a7336-1ecc23e6c9dso11224745ad.2\n for <dev@dpdk.org>; Thu, 09 May 2024 22:05:13 -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-1ef0c25566asm23007385ad.283.2024.05.09.22.05.11\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 09 May 2024 22:05:12 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715317513;\n x=1715922313; 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=j57IIvqJXPSUEUdVEK4npGeF72BYO1ygFDwmfO4HNSs=;\n b=Uwhqui4zpB7+gx8WhF0P1gd/aScIkm5hvyptVtm4QD/ErvxkEWgfyRizI3GqioZkUH\n IQ4SUMNBEkIgtIIS6w5rZ6hRwwAb8N5S4SzVdwEOike/KxIqO8jdlay784tHCuaWhUP4\n 7qHPbthmMZ2DUrAhZyKx7DGLBEZVe8vX10zCQlD49uYPawGmYKfqXwfFt1YQ8mWFWamc\n +9dr0nMcaO9eLLF0GXwXkMzhu6DAvJyDPx17BvyMNALSoy86/usCOtHU4qYhIKq4Mp4i\n AI+qinUgtn8dlMQE6si9D+H0MMfRmM04IExGlOJpnvEWZUvntveJOeV4TxWaSW0O3joH\n 7Myw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1715317513; x=1715922313;\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=j57IIvqJXPSUEUdVEK4npGeF72BYO1ygFDwmfO4HNSs=;\n b=FDOAavz47JlGk9l5VaaNH0zQPLL7LfaTdsj9IuKwGMh50PlQICnPQ/rWvyectqmrgV\n utwnPHg5Yzyfigz+cphYnul9FdPc4EUY1/r0x4TrJxnfDQ7DTCBEHeA5yPLo2QKGc/Fn\n t6eUu5D2DsvsG49+1tTMYQjldhIgfAztP8S2Jn27Iu5umqitF66Kk8H3ywYdz3DIq4XT\n VrfbDzEGu3R2t0YBZZuIwnCNEjuYtC5l2Hr6vmGoVrd4KKLBZzwM3vdnmf8Shq7w7TwP\n 7hM/+5npUIdX5kWxYe5PLgkLC7rHIL6Eeh6grM4LAPPsEY6go/JgGgdzreYMYyVX0XRO\n mQZQ==", "X-Gm-Message-State": "AOJu0Yw1Iiy71+6FT8v/GXq6hZiOlm9FbnSszaijdHTbL0af/fANBDvi\n L8aQsZMWEgbhKHr7Us9PmkqrXSNgndrMlV27CV582AGMFNzrQ0SbdhN/9t0JEit0hyMZ+TWEUJm\n RtBs=", "X-Google-Smtp-Source": "\n AGHT+IHLyL2+r7j8zAD+q0y1vbvzEesabFKdwOT/ujp44mwEJb6ytn18pUf1ioc2HtIjlhiGFinNlA==", "X-Received": "by 2002:a17:902:d3d5:b0:1eb:86c:ed70 with SMTP id\n d9443c01a7336-1ef44060dfemr15991385ad.59.1715317512701;\n Thu, 09 May 2024 22:05:12 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>", "Subject": "[RFC 2/3] net/af_packet: use SW stats helper", "Date": "Thu, 9 May 2024 22:01:22 -0700", "Message-ID": "<20240510050507.14381-3-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240510050507.14381-1-stephen@networkplumber.org>", "References": "<20240425174617.2126159-1-ferruh.yigit@amd.com>\n <20240510050507.14381-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 | 97 ++++-------------------\n 1 file changed, 16 insertions(+), 81 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..8fac37a1b1 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@@ -40,6 +42,8 @@\n #define DFLT_FRAME_COUNT\t(1 << 9)\n \n struct pkt_rx_queue {\n+\tstruct rte_eth_qsw_stats stats;\t/* must be first */\n+\n \tint sockfd;\n \n \tstruct iovec *rd;\n@@ -50,12 +54,11 @@ struct pkt_rx_queue {\n \tstruct rte_mempool *mb_pool;\n \tuint16_t in_port;\n \tuint8_t vlan_strip;\n-\n-\tvolatile unsigned long rx_pkts;\n-\tvolatile unsigned long rx_bytes;\n };\n \n struct pkt_tx_queue {\n+\tstruct rte_eth_qsw_stats stats;\t/* must be first */\n+\n \tint sockfd;\n \tunsigned int frame_data_size;\n \n@@ -63,10 +66,6 @@ struct pkt_tx_queue {\n \tuint8_t *map;\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 };\n \n struct pmd_internals {\n@@ -118,8 +117,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 +161,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_qsw_update(&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 +200,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 +278,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_qsw_update(&pkt_q->stats, mbuf);\n \t\trte_pktmbuf_free(mbuf);\n \t}\n \n@@ -298,15 +290,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@@ -385,61 +371,6 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \treturn 0;\n }\n \n-static int\n-eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_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-}\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-}\n-\n static int\n eth_dev_close(struct rte_eth_dev *dev)\n {\n@@ -634,8 +565,12 @@ static const struct eth_dev_ops ops = {\n \t.rx_queue_setup = eth_rx_queue_setup,\n \t.tx_queue_setup = eth_tx_queue_setup,\n \t.link_update = eth_link_update,\n-\t.stats_get = eth_stats_get,\n-\t.stats_reset = eth_stats_reset,\n+\n+\t.stats_get = rte_eth_qsw_stats_get,\n+\t.stats_reset = rte_eth_qsw_stats_reset,\n+\t.xstats_get = rte_eth_qsw_xstats_get,\n+\t.xstats_get_names = rte_eth_qsw_xstats_get_names,\n+\t.xstats_reset = rte_eth_qsw_stats_reset,\n };\n \n /*\n", "prefixes": [ "RFC", "2/3" ] }