Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/140203/?format=api
{ "id": 140203, "url": "http://patchwork.dpdk.org/api/patches/140203/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240521170453.119036-6-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": "<20240521170453.119036-6-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240521170453.119036-6-stephen@networkplumber.org", "date": "2024-05-21T17:00:52", "name": "[v8,5/8] net/pcap: use generic SW stats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "4ea6904635c5ffac5edbec9477c75d9e6e94d2df", "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/20240521170453.119036-6-stephen@networkplumber.org/mbox/", "series": [ { "id": 31953, "url": "http://patchwork.dpdk.org/api/series/31953/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31953", "date": "2024-05-21T17:00:47", "name": "Common statistics routines for SW based PMD's", "version": 8, "mbox": "http://patchwork.dpdk.org/series/31953/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/140203/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/140203/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 0F6D54408C;\n\tTue, 21 May 2024 19:05:49 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2DAB7406FF;\n\tTue, 21 May 2024 19:05:13 +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 21A7B4067D\n for <dev@dpdk.org>; Tue, 21 May 2024 19:05:08 +0200 (CEST)", "by mail-pg1-f169.google.com with SMTP id\n 41be03b00d2f7-53fa455cd94so1554582a12.2\n for <dev@dpdk.org>; Tue, 21 May 2024 10:05:08 -0700 (PDT)", "from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])\n by smtp.gmail.com with ESMTPSA id\n 98e67ed59e1d1-2bd7a0867fcsm4297018a91.29.2024.05.21.10.05.06\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 21 May 2024 10:05:06 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1716311107;\n x=1716915907; 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=+EszQcYtvxNgZfYaRAS4ls3d9SF5yFMlXdQa2iCOZGQ=;\n b=cotGbalq4Jg0mYB07JLogw3bKjXSe1tYM2mbaCA99wg1L8d6LTn70dhrLa8kDEkA8H\n pcJzI3ga5Q+NUdVXyDogkvNYEi1Q6ACNyRH8r9ifV5rHfZ2X9NuYaIV4mkwd6eEtbaCH\n ORhtWONshpjThUvbZasGhLNtbzgnghgjbw/ZuV17nBtZ+Y8U+DGrdfdqXjTcMMke6Hza\n IFwe5XmilAeNcv1L+W71KYNJqRCKIOyPfguEs06t3uTYKi8VdzIZq2loXhXxnq4GwylI\n kBWPcjAm0EOnOzplphkEmyeMJyz36cBIPQ3yAhudSA2sjFQWI4w34/SyzNsZm1RT1BJP\n eOiA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1716311107; x=1716915907;\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=+EszQcYtvxNgZfYaRAS4ls3d9SF5yFMlXdQa2iCOZGQ=;\n b=kJLARHJ27ADA0zKr0zfdQ0p24/NsFLrJpfKrXtpHi1GMIkHpe2WsTJlIKwMIceUng+\n ziGS0g1MRnXgRBoGr2PZJRKmJgDHvjIHVg8Wv1RGIvMAHPUnSWqgBgFlGmohOEmk08aY\n WF1AS6N6AL3/0zDoMXWYbyuQJ803emgzaGb55qa3bZEi6NxcBOvMlvKTTuSJRFQsFWwC\n WR0rFqBlrWTkCxxIf+KyfhKbRD4K8V6ejeVUQ8RY29BuikrHCroqBBp/s5zRMIQyXVj9\n j3VXuSJin+RgEz55UtRJznvhCHbPT9t/WGxQ+aUEiAkdx005ioIc6MAkmqPSmW20Friy\n 7qvQ==", "X-Gm-Message-State": "AOJu0YyK6Scc+R+oZCFHBW6suPcsu+1fEHdAadja4yN5HHFC7jQ4qEOP\n CiOm3X19D8+Ax3sKJQkFCsLgIIyLeZKXdwVtrhKIjv7tx7o6oHhd22Jc6U+poTIn+goSrYge3A4\n u", "X-Google-Smtp-Source": "\n AGHT+IH8E2G4eUSw0D2RqsDI5H53XuOask06DTMdGiwitfwnUPfbsPf2aeJDlKZ3v1YLRNPGU3m7Vw==", "X-Received": "by 2002:a17:90b:1086:b0:2b4:3a1e:2400 with SMTP id\n 98e67ed59e1d1-2b6cc7584c3mr27219715a91.18.1716311107224;\n Tue, 21 May 2024 10:05:07 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>", "Subject": "[PATCH v8 5/8] net/pcap: use generic SW stats", "Date": "Tue, 21 May 2024 10:00:52 -0700", "Message-ID": "<20240521170453.119036-6-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240521170453.119036-1-stephen@networkplumber.org>", "References": "<20240510050507.14381-1-stephen@networkplumber.org>\n <20240521170453.119036-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 statistics for SW drivers.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/pcap/pcap_ethdev.c | 100 ++++++++-------------------------\n 1 file changed, 22 insertions(+), 78 deletions(-)", "diff": "diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c\nindex bfec085045..4689359527 100644\n--- a/drivers/net/pcap/pcap_ethdev.c\n+++ b/drivers/net/pcap/pcap_ethdev.c\n@@ -11,6 +11,7 @@\n \n #include <rte_cycles.h>\n #include <ethdev_driver.h>\n+#include <ethdev_swstats.h>\n #include <ethdev_vdev.h>\n #include <rte_kvargs.h>\n #include <rte_malloc.h>\n@@ -48,13 +49,6 @@ static uint8_t iface_idx;\n static uint64_t timestamp_rx_dynflag;\n static int timestamp_dynfield_offset = -1;\n \n-struct queue_stat {\n-\tvolatile unsigned long pkts;\n-\tvolatile unsigned long bytes;\n-\tvolatile unsigned long err_pkts;\n-\tvolatile unsigned long rx_nombuf;\n-};\n-\n struct queue_missed_stat {\n \t/* last value retrieved from pcap */\n \tunsigned int pcap;\n@@ -68,7 +62,7 @@ struct pcap_rx_queue {\n \tuint16_t port_id;\n \tuint16_t queue_id;\n \tstruct rte_mempool *mb_pool;\n-\tstruct queue_stat rx_stat;\n+\tstruct rte_eth_counters rx_stat;\n \tstruct queue_missed_stat missed_stat;\n \tchar name[PATH_MAX];\n \tchar type[ETH_PCAP_ARG_MAXLEN];\n@@ -80,7 +74,7 @@ struct pcap_rx_queue {\n struct pcap_tx_queue {\n \tuint16_t port_id;\n \tuint16_t queue_id;\n-\tstruct queue_stat tx_stat;\n+\tstruct rte_eth_counters tx_stat;\n \tchar name[PATH_MAX];\n \tchar type[ETH_PCAP_ARG_MAXLEN];\n };\n@@ -258,14 +252,13 @@ eth_pcap_rx_infinite(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\tbufs[i]->data_len = pcap_buf->data_len;\n \t\tbufs[i]->pkt_len = pcap_buf->pkt_len;\n \t\tbufs[i]->port = pcap_q->port_id;\n-\t\trx_bytes += pcap_buf->data_len;\n+\t\trx_bytes += pcap_buf->pkt_len;\n \n \t\t/* Enqueue packet back on ring to allow infinite rx. */\n \t\trte_ring_enqueue(pcap_q->pkts, pcap_buf);\n \t}\n \n-\tpcap_q->rx_stat.pkts += i;\n-\tpcap_q->rx_stat.bytes += rx_bytes;\n+\trte_eth_count_packets(&pcap_q->rx_stat, i, rx_bytes);\n \n \treturn i;\n }\n@@ -300,7 +293,9 @@ eth_pcap_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \n \t\tmbuf = rte_pktmbuf_alloc(pcap_q->mb_pool);\n \t\tif (unlikely(mbuf == NULL)) {\n-\t\t\tpcap_q->rx_stat.rx_nombuf++;\n+\t\t\tstruct rte_eth_dev *dev = &rte_eth_devices[pcap_q->port_id];\n+\n+\t\t\t++dev->data->rx_mbuf_alloc_failed;\n \t\t\tbreak;\n \t\t}\n \n@@ -315,7 +310,7 @@ eth_pcap_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\t\t\t\t mbuf,\n \t\t\t\t\t\t packet,\n \t\t\t\t\t\t header.caplen) == -1)) {\n-\t\t\t\tpcap_q->rx_stat.err_pkts++;\n+\t\t\t\trte_eth_count_error(&pcap_q->rx_stat);\n \t\t\t\trte_pktmbuf_free(mbuf);\n \t\t\t\tbreak;\n \t\t\t}\n@@ -332,9 +327,8 @@ eth_pcap_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\tnum_rx++;\n \t\trx_bytes += header.caplen;\n \t}\n-\tpcap_q->rx_stat.pkts += num_rx;\n-\tpcap_q->rx_stat.bytes += rx_bytes;\n \n+\trte_eth_count_packets(&pcap_q->rx_stat, num_rx, rx_bytes);\n \treturn num_rx;\n }\n \n@@ -423,9 +417,8 @@ eth_pcap_tx_dumper(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t * we flush the pcap dumper within each burst.\n \t */\n \tpcap_dump_flush(dumper);\n-\tdumper_q->tx_stat.pkts += num_tx;\n-\tdumper_q->tx_stat.bytes += tx_bytes;\n-\tdumper_q->tx_stat.err_pkts += nb_pkts - num_tx;\n+\n+\trte_eth_count_packets(&dumper_q->tx_stat, num_tx, tx_bytes);\n \n \treturn nb_pkts;\n }\n@@ -448,9 +441,7 @@ eth_tx_drop(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\trte_pktmbuf_free(bufs[i]);\n \t}\n \n-\ttx_queue->tx_stat.pkts += nb_pkts;\n-\ttx_queue->tx_stat.bytes += tx_bytes;\n-\n+\trte_eth_count_packets(&tx_queue->tx_stat, nb_pkts, tx_bytes);\n \treturn i;\n }\n \n@@ -502,9 +493,7 @@ eth_pcap_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\trte_pktmbuf_free(mbuf);\n \t}\n \n-\ttx_queue->tx_stat.pkts += num_tx;\n-\ttx_queue->tx_stat.bytes += tx_bytes;\n-\ttx_queue->tx_stat.err_pkts += i - num_tx;\n+\trte_eth_count_packets(&tx_queue->tx_stat, num_tx, tx_bytes);\n \n \treturn i;\n }\n@@ -746,41 +735,12 @@ static int\n eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n {\n \tunsigned int i;\n-\tunsigned long rx_packets_total = 0, rx_bytes_total = 0;\n-\tunsigned long rx_missed_total = 0;\n-\tunsigned long rx_nombuf_total = 0, rx_err_total = 0;\n-\tunsigned long tx_packets_total = 0, tx_bytes_total = 0;\n-\tunsigned long tx_packets_err_total = 0;\n-\tconst struct pmd_internals *internal = dev->data->dev_private;\n-\n-\tfor (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&\n-\t\t\ti < dev->data->nb_rx_queues; i++) {\n-\t\tstats->q_ipackets[i] = internal->rx_queue[i].rx_stat.pkts;\n-\t\tstats->q_ibytes[i] = internal->rx_queue[i].rx_stat.bytes;\n-\t\trx_nombuf_total += internal->rx_queue[i].rx_stat.rx_nombuf;\n-\t\trx_err_total += internal->rx_queue[i].rx_stat.err_pkts;\n-\t\trx_packets_total += stats->q_ipackets[i];\n-\t\trx_bytes_total += stats->q_ibytes[i];\n-\t\trx_missed_total += queue_missed_stat_get(dev, i);\n-\t}\n \n-\tfor (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS &&\n-\t\t\ti < dev->data->nb_tx_queues; i++) {\n-\t\tstats->q_opackets[i] = internal->tx_queue[i].tx_stat.pkts;\n-\t\tstats->q_obytes[i] = internal->tx_queue[i].tx_stat.bytes;\n-\t\ttx_packets_total += stats->q_opackets[i];\n-\t\ttx_bytes_total += stats->q_obytes[i];\n-\t\ttx_packets_err_total += internal->tx_queue[i].tx_stat.err_pkts;\n-\t}\n+\trte_eth_counters_stats_get(dev, offsetof(struct pcap_tx_queue, tx_stat),\n+\t\t\t\t offsetof(struct pcap_rx_queue, rx_stat), stats);\n \n-\tstats->ipackets = rx_packets_total;\n-\tstats->ibytes = rx_bytes_total;\n-\tstats->imissed = rx_missed_total;\n-\tstats->ierrors = rx_err_total;\n-\tstats->rx_nombuf = rx_nombuf_total;\n-\tstats->opackets = tx_packets_total;\n-\tstats->obytes = tx_bytes_total;\n-\tstats->oerrors = tx_packets_err_total;\n+\tfor (i = 0; i < dev->data->nb_rx_queues; i++)\n+\t\tstats->imissed += queue_missed_stat_get(dev, i);\n \n \treturn 0;\n }\n@@ -789,21 +749,12 @@ static int\n eth_stats_reset(struct rte_eth_dev *dev)\n {\n \tunsigned int i;\n-\tstruct pmd_internals *internal = dev->data->dev_private;\n \n-\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n-\t\tinternal->rx_queue[i].rx_stat.pkts = 0;\n-\t\tinternal->rx_queue[i].rx_stat.bytes = 0;\n-\t\tinternal->rx_queue[i].rx_stat.err_pkts = 0;\n-\t\tinternal->rx_queue[i].rx_stat.rx_nombuf = 0;\n-\t\tqueue_missed_stat_reset(dev, i);\n-\t}\n+\trte_eth_counters_reset(dev, offsetof(struct pcap_tx_queue, tx_stat),\n+\t\t\t offsetof(struct pcap_rx_queue, rx_stat));\n \n-\tfor (i = 0; i < dev->data->nb_tx_queues; i++) {\n-\t\tinternal->tx_queue[i].tx_stat.pkts = 0;\n-\t\tinternal->tx_queue[i].tx_stat.bytes = 0;\n-\t\tinternal->tx_queue[i].tx_stat.err_pkts = 0;\n-\t}\n+\tfor (i = 0; i < dev->data->nb_rx_queues; i++)\n+\t\tqueue_missed_stat_reset(dev, i);\n \n \treturn 0;\n }\n@@ -929,13 +880,6 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\tpcap_pkt_count);\n \t\t\treturn -EINVAL;\n \t\t}\n-\n-\t\t/*\n-\t\t * Reset the stats for this queue since eth_pcap_rx calls above\n-\t\t * didn't result in the application receiving packets.\n-\t\t */\n-\t\tpcap_q->rx_stat.pkts = 0;\n-\t\tpcap_q->rx_stat.bytes = 0;\n \t}\n \n \treturn 0;\n", "prefixes": [ "v8", "5/8" ] }