Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/140043/?format=api
{ "id": 140043, "url": "http://patchwork.dpdk.org/api/patches/140043/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240513185448.120356-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": "<20240513185448.120356-5-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240513185448.120356-5-stephen@networkplumber.org", "date": "2024-05-13T18:52:14", "name": "[RFC,v2,4/7] net/tap: use generic SW stats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "71ee9d535f9f506c11f13c57692371d52abcca0c", "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/20240513185448.120356-5-stephen@networkplumber.org/mbox/", "series": [ { "id": 31915, "url": "http://patchwork.dpdk.org/api/series/31915/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31915", "date": "2024-05-13T18:52:10", "name": "generic SW counters", "version": 2, "mbox": "http://patchwork.dpdk.org/series/31915/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/140043/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/140043/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 755E54401D;\n\tMon, 13 May 2024 20:55:27 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 733874069D;\n\tMon, 13 May 2024 20:55:05 +0200 (CEST)", "from mail-pg1-f175.google.com (mail-pg1-f175.google.com\n [209.85.215.175])\n by mails.dpdk.org (Postfix) with ESMTP id 8621D40685\n for <dev@dpdk.org>; Mon, 13 May 2024 20:55:02 +0200 (CEST)", "by mail-pg1-f175.google.com with SMTP id\n 41be03b00d2f7-53fbf2c42bfso3525291a12.3\n for <dev@dpdk.org>; Mon, 13 May 2024 11:55:02 -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.01\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 May 2024 11:55:01 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1715626502;\n x=1716231302; 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=sLW788+dv0ewNWwe8e9Bp3XNLvfLTrGeJ2Aby7rQctM=;\n b=mAAiBQVztZ8Dp75XI40LK5gkqHAFsBBZkhCi2jKnR53DjjgzOn0EO5RNhl5avBuYc3\n Ysw5/WpFR3zTSNn6U0tMkR5J8Y86XGJyGPWj9V16UknjoAq6wHqJ3ZoUQsfXVhfApGVK\n MXqv8ZcCQj76ulzjwmoPm035+16H/bOym14pph+zPqMvsTVjRQP8TUCauL45Q9b3wlwH\n 6ZvKDutjrb9DSn8N7FN++DSWlDW1m1kg6fYkqAhO7NyOXHIhQBp4symYE+JQa9hrBy7K\n 1By1KfNrVrdkL+t81ufa1VEg5wzrIiCYLVPr0QYuFAs9P4dVykQ/R1i0UdRz0nVcl+j5\n gFSw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1715626502; x=1716231302;\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=sLW788+dv0ewNWwe8e9Bp3XNLvfLTrGeJ2Aby7rQctM=;\n b=KhScT+6BclMBzvxlhxvviM6srFgVS4FqzFWjFfvaVMYD/f/eZW7IRlEAwhnZ4hOpV3\n MKfhBHJ7XcL5ne8KKRkZXPiD9QTLHXoYhkO9Jaexd+Vf1R/X8ynn0p5WSPquvwRNYfWF\n J0pc66a/U33SG+1ZteXpLYvQkwShbW/XdocwGQiyD/CB+kY8905C8+x/KYWYVd99/fH6\n WHvPONurG08jK88kyCsA3VscyLwu2OuEFJtwOx9LZYmOXSREw8TqN8izndTxQqPfNf+h\n NP/P2Vvik6qvZghYKFCIgqctu3V0FqzO7CdvDyx0mc5mXcMlrc14TlP1CUyrMyWB7uDC\n 6i6w==", "X-Gm-Message-State": "AOJu0YwQFqVJ9Ex70cbvku+T2j0dAZGb42h2h/N7nv0Sudn9TXneob8f\n A/dcAvK4aIiMSGUFtNHPxx2nWX8OUCh1t4J84lFjF6XDM7aFMjcs3xGvWDfKnXjy2yMb3YbRn7N\n vZxmfhg==", "X-Google-Smtp-Source": "\n AGHT+IGEa40IumNEvVFXcJEPK8ryBgCcvijzmw+5Vdk2Hc0Hhcc0SBTv80TN3DJ69WovTLPlADLr/A==", "X-Received": "by 2002:a05:6a20:dc95:b0:1a7:60d8:a6dd with SMTP id\n adf61e73a8af0-1afde1df3b4mr12769015637.53.1715626501721;\n Mon, 13 May 2024 11:55:01 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>", "Subject": "[RFC v2 4/7] net/tap: use generic SW stats", "Date": "Mon, 13 May 2024 11:52:14 -0700", "Message-ID": "<20240513185448.120356-5-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 new common sw statistics.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/tap/rte_eth_tap.c | 102 +++++++++++-----------------------\n drivers/net/tap/rte_eth_tap.h | 15 +----\n 2 files changed, 34 insertions(+), 83 deletions(-)", "diff": "diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex 69d9da695b..ae1000a088 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -432,7 +432,6 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \tstruct rx_queue *rxq = queue;\n \tstruct pmd_process_private *process_private;\n \tuint16_t num_rx;\n-\tunsigned long num_rx_bytes = 0;\n \tuint32_t trigger = tap_trigger;\n \n \tif (trigger == rxq->trigger_seen)\n@@ -455,7 +454,7 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \n \t\t/* Packet couldn't fit in the provided mbuf */\n \t\tif (unlikely(rxq->pi.flags & TUN_PKT_STRIP)) {\n-\t\t\trxq->stats.ierrors++;\n+\t\t\trte_eth_count_error(&rxq->stats);\n \t\t\tcontinue;\n \t\t}\n \n@@ -467,7 +466,9 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\tstruct rte_mbuf *buf = rte_pktmbuf_alloc(rxq->mp);\n \n \t\t\tif (unlikely(!buf)) {\n-\t\t\t\trxq->stats.rx_nombuf++;\n+\t\t\t\tstruct rte_eth_dev *dev = &rte_eth_devices[rxq->in_port];\n+\t\t\t\t++dev->data->rx_mbuf_alloc_failed;\n+\n \t\t\t\t/* No new buf has been allocated: do nothing */\n \t\t\t\tif (!new_tail || !seg)\n \t\t\t\t\tgoto end;\n@@ -509,11 +510,9 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \n \t\t/* account for the receive frame */\n \t\tbufs[num_rx++] = mbuf;\n-\t\tnum_rx_bytes += mbuf->pkt_len;\n+\t\trte_eth_count_mbuf(&rxq->stats, mbuf);\n \t}\n end:\n-\trxq->stats.ipackets += num_rx;\n-\trxq->stats.ibytes += num_rx_bytes;\n \n \tif (trigger && num_rx < nb_pkts)\n \t\trxq->trigger_seen = trigger;\n@@ -523,8 +522,7 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \n static inline int\n tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,\n-\t\t\tstruct rte_mbuf **pmbufs,\n-\t\t\tuint16_t *num_packets, unsigned long *num_tx_bytes)\n+\t\tstruct rte_mbuf **pmbufs)\n {\n \tstruct pmd_process_private *process_private;\n \tint i;\n@@ -647,8 +645,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,\n \t\tif (n <= 0)\n \t\t\treturn -1;\n \n-\t\t(*num_packets)++;\n-\t\t(*num_tx_bytes) += rte_pktmbuf_pkt_len(mbuf);\n+\t\trte_eth_count_mbuf(&txq->stats, mbuf);\n \t}\n \treturn 0;\n }\n@@ -660,8 +657,6 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n {\n \tstruct tx_queue *txq = queue;\n \tuint16_t num_tx = 0;\n-\tuint16_t num_packets = 0;\n-\tunsigned long num_tx_bytes = 0;\n \tuint32_t max_size;\n \tint i;\n \n@@ -693,7 +688,7 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\ttso_segsz = mbuf_in->tso_segsz + hdrs_len;\n \t\t\tif (unlikely(tso_segsz == hdrs_len) ||\n \t\t\t\ttso_segsz > *txq->mtu) {\n-\t\t\t\ttxq->stats.errs++;\n+\t\t\t\trte_eth_count_error(&txq->stats);\n \t\t\t\tbreak;\n \t\t\t}\n \t\t\tgso_ctx->gso_size = tso_segsz;\n@@ -728,10 +723,10 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t\tnum_mbufs = 1;\n \t\t}\n \n-\t\tret = tap_write_mbufs(txq, num_mbufs, mbuf,\n-\t\t\t\t&num_packets, &num_tx_bytes);\n+\t\tret = tap_write_mbufs(txq, num_mbufs, mbuf);\n \t\tif (ret == -1) {\n-\t\t\ttxq->stats.errs++;\n+\t\t\trte_eth_count_error(&txq->stats);\n+\n \t\t\t/* free tso mbufs */\n \t\t\tif (num_tso_mbufs > 0)\n \t\t\t\trte_pktmbuf_free_bulk(mbuf, num_tso_mbufs);\n@@ -749,10 +744,6 @@ pmd_tx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\t}\n \t}\n \n-\ttxq->stats.opackets += num_packets;\n-\ttxq->stats.errs += nb_pkts - num_tx;\n-\ttxq->stats.obytes += num_tx_bytes;\n-\n \treturn num_tx;\n }\n \n@@ -1055,64 +1046,30 @@ tap_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n static int\n tap_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *tap_stats)\n {\n-\tunsigned int 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-\tunsigned long rx_nombuf = 0, ierrors = 0;\n-\tconst struct pmd_internals *pmd = dev->data->dev_private;\n-\n-\t/* rx queue statistics */\n-\timax = (dev->data->nb_rx_queues < RTE_ETHDEV_QUEUE_STAT_CNTRS) ?\n-\t\tdev->data->nb_rx_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS;\n-\tfor (i = 0; i < imax; i++) {\n-\t\ttap_stats->q_ipackets[i] = pmd->rxq[i].stats.ipackets;\n-\t\ttap_stats->q_ibytes[i] = pmd->rxq[i].stats.ibytes;\n-\t\trx_total += tap_stats->q_ipackets[i];\n-\t\trx_bytes_total += tap_stats->q_ibytes[i];\n-\t\trx_nombuf += pmd->rxq[i].stats.rx_nombuf;\n-\t\tierrors += pmd->rxq[i].stats.ierrors;\n-\t}\n-\n-\t/* tx queue statistics */\n-\timax = (dev->data->nb_tx_queues < RTE_ETHDEV_QUEUE_STAT_CNTRS) ?\n-\t\tdev->data->nb_tx_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS;\n-\n-\tfor (i = 0; i < imax; i++) {\n-\t\ttap_stats->q_opackets[i] = pmd->txq[i].stats.opackets;\n-\t\ttap_stats->q_obytes[i] = pmd->txq[i].stats.obytes;\n-\t\ttx_total += tap_stats->q_opackets[i];\n-\t\ttx_err_total += pmd->txq[i].stats.errs;\n-\t\ttx_bytes_total += tap_stats->q_obytes[i];\n-\t}\n-\n-\ttap_stats->ipackets = rx_total;\n-\ttap_stats->ibytes = rx_bytes_total;\n-\ttap_stats->ierrors = ierrors;\n-\ttap_stats->rx_nombuf = rx_nombuf;\n-\ttap_stats->opackets = tx_total;\n-\ttap_stats->oerrors = tx_err_total;\n-\ttap_stats->obytes = tx_bytes_total;\n-\treturn 0;\n+\treturn rte_eth_counters_stats_get(dev, offsetof(struct tx_queue, stats),\n+\t\t\t\t\t offsetof(struct rx_queue, stats), tap_stats);\n }\n \n static int\n tap_stats_reset(struct rte_eth_dev *dev)\n {\n-\tint i;\n-\tstruct pmd_internals *pmd = dev->data->dev_private;\n-\n-\tfor (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {\n-\t\tpmd->rxq[i].stats.ipackets = 0;\n-\t\tpmd->rxq[i].stats.ibytes = 0;\n-\t\tpmd->rxq[i].stats.ierrors = 0;\n-\t\tpmd->rxq[i].stats.rx_nombuf = 0;\n+\treturn rte_eth_counters_reset(dev, offsetof(struct tx_queue, stats),\n+\t\t\t\t offsetof(struct rx_queue, stats));\n+}\n \n-\t\tpmd->txq[i].stats.opackets = 0;\n-\t\tpmd->txq[i].stats.errs = 0;\n-\t\tpmd->txq[i].stats.obytes = 0;\n-\t}\n+static int\n+tap_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+tap_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 tx_queue, stats),\n+\t\t\t\t\t offsetof(struct rx_queue, stats), xstats, n);\n }\n \n static int\n@@ -1919,6 +1876,9 @@ static const struct eth_dev_ops ops = {\n \t.set_mc_addr_list = tap_set_mc_addr_list,\n \t.stats_get = tap_stats_get,\n \t.stats_reset = tap_stats_reset,\n+\t.xstats_get_names = tap_xstats_get_names,\n+\t.xstats_get = tap_xstats_get,\n+\t.xstats_reset = tap_stats_reset,\n \t.dev_supported_ptypes_get = tap_dev_supported_ptypes_get,\n \t.rss_hash_update = tap_rss_hash_update,\n \t.flow_ops_get = tap_dev_flow_ops_get,\ndiff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h\nindex 5ac93f93e9..8cba9ea410 100644\n--- a/drivers/net/tap/rte_eth_tap.h\n+++ b/drivers/net/tap/rte_eth_tap.h\n@@ -14,6 +14,7 @@\n #include <linux/if_tun.h>\n \n #include <ethdev_driver.h>\n+#include <ethdev_swstats.h>\n #include <rte_ether.h>\n #include <rte_gso.h>\n #include \"tap_log.h\"\n@@ -32,23 +33,13 @@ enum rte_tuntap_type {\n \tETH_TUNTAP_TYPE_MAX,\n };\n \n-struct pkt_stats {\n-\tuint64_t opackets; /* Number of output packets */\n-\tuint64_t ipackets; /* Number of input packets */\n-\tuint64_t obytes; /* Number of bytes on output */\n-\tuint64_t ibytes; /* Number of bytes on input */\n-\tuint64_t errs; /* Number of TX error packets */\n-\tuint64_t ierrors; /* Number of RX error packets */\n-\tuint64_t rx_nombuf; /* Nb of RX mbuf alloc failures */\n-};\n-\n struct rx_queue {\n \tstruct rte_mempool *mp; /* Mempool for RX packets */\n \tuint32_t trigger_seen; /* Last seen Rx trigger value */\n \tuint16_t in_port; /* Port ID */\n \tuint16_t queue_id;\t\t/* queue ID*/\n-\tstruct pkt_stats stats; /* Stats for this RX queue */\n \tuint16_t nb_rx_desc; /* max number of mbufs available */\n+\tstruct rte_eth_counters stats; /* Stats for this RX queue */\n \tstruct rte_eth_rxmode *rxmode; /* RX features */\n \tstruct rte_mbuf *pool; /* mbufs pool for this queue */\n \tstruct iovec (*iovecs)[]; /* descriptors for this queue */\n@@ -59,7 +50,7 @@ struct tx_queue {\n \tint type; /* Type field - TUN|TAP */\n \tuint16_t *mtu; /* Pointer to MTU from dev_data */\n \tuint16_t csum:1; /* Enable checksum offloading */\n-\tstruct pkt_stats stats; /* Stats for this TX queue */\n+\tstruct rte_eth_counters stats;\t/* Stats for this TX queue */\n \tstruct rte_gso_ctx gso_ctx; /* GSO context */\n \tuint16_t out_port; /* Port ID */\n \tuint16_t queue_id;\t\t/* queue ID*/\n", "prefixes": [ "RFC", "v2", "4/7" ] }