Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99915/?format=api
{ "id": 99915, "url": "http://patchwork.dpdk.org/api/patches/99915/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20210928112912.785412-12-andrew.rybchenko@oktetlabs.ru/", "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": "<20210928112912.785412-12-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210928112912.785412-12-andrew.rybchenko@oktetlabs.ru", "date": "2021-09-28T11:29:12", "name": "[11/11] net/sfc: collect per queue stats in EF100 Tx datapath", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "36c3f7230c68771f96d3eb9c6252e449eb96c20a", "submitter": { "id": 2013, "url": "http://patchwork.dpdk.org/api/people/2013/?format=api", "name": "Andrew Rybchenko", "email": "Andrew.Rybchenko@oktetlabs.ru" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20210928112912.785412-12-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 19227, "url": "http://patchwork.dpdk.org/api/series/19227/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=19227", "date": "2021-09-28T11:29:01", "name": "net/sfc: support per-queue stats on EF100", "version": 1, "mbox": "http://patchwork.dpdk.org/series/19227/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/99915/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/99915/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 E8278A0032;\n\tTue, 28 Sep 2021 13:30:47 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E52CE41145;\n\tTue, 28 Sep 2021 13:29:55 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id B96924113E\n for <dev@dpdk.org>; Tue, 28 Sep 2021 13:29:51 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id 817F77F6D7; Tue, 28 Sep 2021 14:29:51 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id 622ED7F6DD;\n Tue, 28 Sep 2021 14:29:32 +0300 (MSK)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.8 required=5.0 tests=ALL_TRUSTED,\n DKIM_ADSP_DISCARD,\n URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2", "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 622ED7F6DD", "Authentication-Results": "shelob.oktetlabs.ru/622ED7F6DD; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>", "Date": "Tue, 28 Sep 2021 14:29:12 +0300", "Message-Id": "<20210928112912.785412-12-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210928112912.785412-1-andrew.rybchenko@oktetlabs.ru>", "References": "<20210928112912.785412-1-andrew.rybchenko@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 11/11] net/sfc: collect per queue stats in EF100\n Tx datapath", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>\n\nIf Tx datapath collects per queue statistics, use these stats\nto provide opackets and obytes in basic ethdev stats.\n\nSigned-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\nSigned-off-by: Ivan Ilchenko <ivan.ilchenko@oktetlabs.ru>\n---\n drivers/net/sfc/sfc.h | 2 ++\n drivers/net/sfc/sfc_dp_tx.h | 1 +\n drivers/net/sfc/sfc_ef100_tx.c | 6 +++-\n drivers/net/sfc/sfc_ethdev.c | 64 +++++++++++++++++++++++++---------\n drivers/net/sfc/sfc_sw_stats.c | 48 +++++++++++++++++++++++++\n 5 files changed, 104 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex 30bd109e8b..ace66d435c 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -239,6 +239,8 @@ struct sfc_sw_stats {\n \t/* Location of per-queue reset values for packets/bytes in reset_vals */\n \tuint64_t\t\t\t*reset_rx_pkts;\n \tuint64_t\t\t\t*reset_rx_bytes;\n+\tuint64_t\t\t\t*reset_tx_pkts;\n+\tuint64_t\t\t\t*reset_tx_bytes;\n \n \trte_spinlock_t\t\t\tqueues_bitmap_lock;\n \tvoid\t\t\t\t*queues_bitmap_mem;\ndiff --git a/drivers/net/sfc/sfc_dp_tx.h b/drivers/net/sfc/sfc_dp_tx.h\nindex 777807985b..184711b887 100644\n--- a/drivers/net/sfc/sfc_dp_tx.h\n+++ b/drivers/net/sfc/sfc_dp_tx.h\n@@ -168,6 +168,7 @@ struct sfc_dp_tx {\n \n \tunsigned int\t\t\tfeatures;\n #define SFC_DP_TX_FEAT_MULTI_PROCESS\t0x1\n+#define SFC_DP_TX_FEAT_STATS\t\t0x2\n \t/**\n \t * Tx offload capabilities supported by the datapath on device\n \t * level only if HW/FW supports it.\ndiff --git a/drivers/net/sfc/sfc_ef100_tx.c b/drivers/net/sfc/sfc_ef100_tx.c\nindex 522e9a0d34..fce82795cc 100644\n--- a/drivers/net/sfc/sfc_ef100_tx.c\n+++ b/drivers/net/sfc/sfc_ef100_tx.c\n@@ -710,6 +710,9 @@ sfc_ef100_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \t\t}\n \n \t\tdma_desc_space -= (added - pkt_start);\n+\n+\t\tsfc_pkts_bytes_add(&txq->dp.dpq.stats, 1,\n+\t\t\t\t rte_pktmbuf_pkt_len(*pktp));\n \t}\n \n \tif (likely(added != txq->added)) {\n@@ -940,7 +943,8 @@ struct sfc_dp_tx sfc_ef100_tx = {\n \t\t.type\t\t= SFC_DP_TX,\n \t\t.hw_fw_caps\t= SFC_DP_HW_FW_CAP_EF100,\n \t},\n-\t.features\t\t= SFC_DP_TX_FEAT_MULTI_PROCESS,\n+\t.features\t\t= SFC_DP_TX_FEAT_MULTI_PROCESS |\n+\t\t\t\t SFC_DP_TX_FEAT_STATS,\n \t.dev_offload_capa\t= 0,\n \t.queue_offload_capa\t= DEV_TX_OFFLOAD_VLAN_INSERT |\n \t\t\t\t DEV_TX_OFFLOAD_IPV4_CKSUM |\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 20d808d15c..fac9b27974 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -613,6 +613,33 @@ sfc_stats_get_dp_rx(struct sfc_adapter *sa, uint64_t *pkts, uint64_t *bytes)\n \t*bytes = bytes_sum;\n }\n \n+static void\n+sfc_stats_get_dp_tx(struct sfc_adapter *sa, uint64_t *pkts, uint64_t *bytes)\n+{\n+\tstruct sfc_adapter_shared *sas = sfc_sa2shared(sa);\n+\tuint64_t pkts_sum = 0;\n+\tuint64_t bytes_sum = 0;\n+\tunsigned int i;\n+\n+\tfor (i = 0; i < sas->ethdev_txq_count; ++i) {\n+\t\tstruct sfc_txq_info *txq_info;\n+\n+\t\ttxq_info = sfc_txq_info_by_ethdev_qid(sas, i);\n+\t\tif (txq_info->state & SFC_TXQ_INITIALIZED) {\n+\t\t\tunion sfc_pkts_bytes qstats;\n+\n+\t\t\tsfc_pkts_bytes_get(&txq_info->dp->dpq.stats, &qstats);\n+\t\t\tpkts_sum += qstats.pkts -\n+\t\t\t\t\tsa->sw_stats.reset_tx_pkts[i];\n+\t\t\tbytes_sum += qstats.bytes -\n+\t\t\t\t\tsa->sw_stats.reset_tx_bytes[i];\n+\t\t}\n+\t}\n+\n+\t*pkts = pkts_sum;\n+\t*bytes = bytes_sum;\n+}\n+\n /*\n * Some statistics are computed as A - B where A and B each increase\n * monotonically with some hardware counter(s) and the counters are read\n@@ -641,6 +668,7 @@ sfc_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n {\n \tconst struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(dev);\n \tbool have_dp_rx_stats = sap->dp_rx->features & SFC_DP_RX_FEAT_STATS;\n+\tbool have_dp_tx_stats = sap->dp_tx->features & SFC_DP_TX_FEAT_STATS;\n \tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n \tstruct sfc_port *port = &sa->port;\n \tuint64_t *mac_stats;\n@@ -650,6 +678,8 @@ sfc_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \n \tif (have_dp_rx_stats)\n \t\tsfc_stats_get_dp_rx(sa, &stats->ipackets, &stats->ibytes);\n+\tif (have_dp_tx_stats)\n+\t\tsfc_stats_get_dp_tx(sa, &stats->opackets, &stats->obytes);\n \n \tret = sfc_port_update_mac_stats(sa, B_FALSE);\n \tif (ret != 0)\n@@ -672,25 +702,27 @@ sfc_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \t\t\t/* CRC is included in these stats, but shouldn't be */\n \t\t\tstats->ibytes -= stats->ipackets * RTE_ETHER_CRC_LEN;\n \t\t}\n-\t\tstats->opackets =\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_UNICAST_PACKETS] +\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_MULTICAST_PACKETS] +\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_BROADCAST_PACKETS];\n-\t\tstats->obytes =\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_UNICAST_BYTES] +\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_MULTICAST_BYTES] +\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_BROADCAST_BYTES];\n+\t\tif (!have_dp_tx_stats) {\n+\t\t\tstats->opackets =\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_UNICAST_PACKETS] +\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_MULTICAST_PACKETS] +\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_BROADCAST_PACKETS];\n+\t\t\tstats->obytes =\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_UNICAST_BYTES] +\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_MULTICAST_BYTES] +\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_TX_BROADCAST_BYTES];\n+\n+\t\t\t/* CRC is included in these stats, but shouldn't be */\n+\t\t\tstats->obytes -= stats->opackets * RTE_ETHER_CRC_LEN;\n+\t\t}\n \t\tstats->imissed = mac_stats[EFX_MAC_VADAPTER_RX_BAD_PACKETS];\n \t\tstats->oerrors = mac_stats[EFX_MAC_VADAPTER_TX_BAD_PACKETS];\n-\n-\t\t/* CRC is included in these stats, but shouldn't be */\n-\t\tstats->obytes -= stats->opackets * RTE_ETHER_CRC_LEN;\n \t} else {\n-\t\tstats->opackets = mac_stats[EFX_MAC_TX_PKTS];\n-\t\tstats->obytes = mac_stats[EFX_MAC_TX_OCTETS];\n-\n-\t\t/* CRC is included in these stats, but shouldn't be */\n-\t\tstats->obytes -= mac_stats[EFX_MAC_TX_PKTS] * RTE_ETHER_CRC_LEN;\n+\t\tif (!have_dp_tx_stats) {\n+\t\t\tstats->opackets = mac_stats[EFX_MAC_TX_PKTS];\n+\t\t\tstats->obytes = mac_stats[EFX_MAC_TX_OCTETS] -\n+\t\t\t\tmac_stats[EFX_MAC_TX_PKTS] * RTE_ETHER_CRC_LEN;\n+\t\t}\n \n \t\t/*\n \t\t * Take into account stats which are whenever supported\ndiff --git a/drivers/net/sfc/sfc_sw_stats.c b/drivers/net/sfc/sfc_sw_stats.c\nindex 8ffa923215..6b3a01b3c6 100644\n--- a/drivers/net/sfc/sfc_sw_stats.c\n+++ b/drivers/net/sfc/sfc_sw_stats.c\n@@ -60,6 +60,29 @@ sfc_sw_stat_get_rx_good_pkts_bytes(struct sfc_adapter *sa, uint16_t qid,\n \t}\n }\n \n+static sfc_get_sw_stat_val_t sfc_sw_stat_get_tx_good_pkts_bytes;\n+static void\n+sfc_sw_stat_get_tx_good_pkts_bytes(struct sfc_adapter *sa, uint16_t qid,\n+\t\t\t\t uint64_t *values,\n+\t\t\t\t unsigned int values_count)\n+{\n+\tstruct sfc_adapter_shared *sas = sfc_sa2shared(sa);\n+\tstruct sfc_txq_info *txq_info;\n+\tunion sfc_pkts_bytes qstats;\n+\n+\tRTE_SET_USED(values_count);\n+\tSFC_ASSERT(values_count == SFX_SW_STATS_GROUP_BASIC_MAX);\n+\ttxq_info = sfc_txq_info_by_ethdev_qid(sas, qid);\n+\tif (txq_info->state & SFC_TXQ_INITIALIZED) {\n+\t\tsfc_pkts_bytes_get(&txq_info->dp->dpq.stats, &qstats);\n+\t\tvalues[SFC_SW_STATS_GROUP_BASIC_PKTS] = qstats.pkts;\n+\t\tvalues[SFC_SW_STATS_GROUP_BASIC_BYTES] = qstats.bytes;\n+\t} else {\n+\t\tvalues[SFC_SW_STATS_GROUP_BASIC_PKTS] = 0;\n+\t\tvalues[SFC_SW_STATS_GROUP_BASIC_BYTES] = 0;\n+\t}\n+}\n+\n static sfc_get_sw_stat_val_t sfc_get_sw_stat_val_rx_dbells;\n static void\n sfc_get_sw_stat_val_rx_dbells(struct sfc_adapter *sa, uint16_t qid,\n@@ -110,6 +133,19 @@ const struct sfc_sw_stat_descr sfc_sw_stats_descr[] = {\n \t\t.get_val = NULL,\n \t\t.provide_total = false,\n \t},\n+\t/* Group of Tx packets/bytes stats */\n+\t{\n+\t\t.name = SFC_SW_STAT_GOOD_PACKETS,\n+\t\t.type = SFC_SW_STATS_TX,\n+\t\t.get_val = sfc_sw_stat_get_tx_good_pkts_bytes,\n+\t\t.provide_total = false,\n+\t},\n+\t{\n+\t\t.name = SFC_SW_STAT_GOOD_BYTES,\n+\t\t.type = SFC_SW_STATS_TX,\n+\t\t.get_val = NULL,\n+\t\t.provide_total = false,\n+\t},\n \t/* End of basic stats */\n \t{\n \t\t.name = \"dbells\",\n@@ -641,6 +677,7 @@ sfc_sw_stats_fill_available_descr(struct sfc_adapter *sa)\n {\n \tconst struct sfc_adapter_priv *sap = &sa->priv;\n \tbool have_dp_rx_stats = sap->dp_rx->features & SFC_DP_RX_FEAT_STATS;\n+\tbool have_dp_tx_stats = sap->dp_tx->features & SFC_DP_TX_FEAT_STATS;\n \tstruct sfc_sw_stats *sw_stats = &sa->sw_stats;\n \tconst struct sfc_sw_stat_descr *sw_stat_descr;\n \tunsigned int i;\n@@ -652,6 +689,10 @@ sfc_sw_stats_fill_available_descr(struct sfc_adapter *sa)\n \t\t sw_stat_descr->type == SFC_SW_STATS_RX &&\n \t\t sfc_sw_stats_is_packets_or_bytes(sw_stat_descr->name))\n \t\t\tcontinue;\n+\t\tif (!have_dp_tx_stats &&\n+\t\t sw_stat_descr->type == SFC_SW_STATS_TX &&\n+\t\t sfc_sw_stats_is_packets_or_bytes(sw_stat_descr->name))\n+\t\t\tcontinue;\n \t\tsw_stats->supp[sw_stats->supp_count].descr = sw_stat_descr;\n \t\tsw_stats->supp_count++;\n \t}\n@@ -678,6 +719,13 @@ sfc_sw_stats_set_reset_basic_stats(struct sfc_adapter *sa)\n \t\t\t\tsa->sw_stats.reset_rx_bytes = reset_vals;\n \t\t\tbreak;\n \t\tcase SFC_SW_STATS_TX:\n+\t\t\tif (strcmp(sw_stat->name,\n+\t\t\t\t SFC_SW_STAT_GOOD_PACKETS) == 0)\n+\t\t\t\tsa->sw_stats.reset_tx_pkts = reset_vals;\n+\t\t\telse if (strcmp(sw_stat->name,\n+\t\t\t\t\tSFC_SW_STAT_GOOD_BYTES) == 0)\n+\t\t\t\tsa->sw_stats.reset_tx_bytes = reset_vals;\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tSFC_GENERIC_LOG(ERR, \"Unknown SW stat type\");\n \t\t\treturn -EINVAL;\n", "prefixes": [ "11/11" ] }