Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99914/?format=api
{ "id": 99914, "url": "http://patchwork.dpdk.org/api/patches/99914/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20210928112912.785412-11-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-11-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210928112912.785412-11-andrew.rybchenko@oktetlabs.ru", "date": "2021-09-28T11:29:11", "name": "[10/11] net/sfc: collect per queue stats in EF100 Rx datapath", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "56397e8872e00c7b3657f3030ef04f9d615f12de", "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-11-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/99914/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/99914/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 C39ECA0032;\n\tTue, 28 Sep 2021 13:30:41 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D78954114B;\n\tTue, 28 Sep 2021 13:29:54 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id 644824113E\n for <dev@dpdk.org>; Tue, 28 Sep 2021 13:29:51 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id 368417F6D8; 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 4115E7F50B;\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 4115E7F50B", "Authentication-Results": "shelob.oktetlabs.ru/4115E7F50B; 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:11 +0300", "Message-Id": "<20210928112912.785412-11-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 10/11] net/sfc: collect per queue stats in EF100\n Rx 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 Rx datapath collects per queue statistics, use these stats\nto provide ipackets and ibytes 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 | 3 +\n drivers/net/sfc/sfc_dp.h | 2 +\n drivers/net/sfc/sfc_dp_rx.h | 1 +\n drivers/net/sfc/sfc_ef100_rx.c | 10 ++-\n drivers/net/sfc/sfc_ethdev.c | 72 ++++++++++++++++-----\n drivers/net/sfc/sfc_sw_stats.c | 115 ++++++++++++++++++++++++++++++++-\n 6 files changed, 182 insertions(+), 21 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex 30679014e3..30bd109e8b 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -236,6 +236,9 @@ struct sfc_sw_stats {\n \tunsigned int\t\t\tcache_count;\n \n \tuint64_t\t\t\t*reset_vals;\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 \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.h b/drivers/net/sfc/sfc_dp.h\nindex 7fd8f34b0f..2edde61a68 100644\n--- a/drivers/net/sfc/sfc_dp.h\n+++ b/drivers/net/sfc/sfc_dp.h\n@@ -16,6 +16,7 @@\n #include <rte_pci.h>\n \n #include \"sfc_log.h\"\n+#include \"sfc_stats.h\"\n \n #ifdef __cplusplus\n extern \"C\" {\n@@ -49,6 +50,7 @@ struct sfc_dp_queue {\n \t * put stats at top of the structure to be closer to fields\n \t * used on datapath or reap to have more chances to be cache-hot.\n \t */\n+\tunion sfc_pkts_bytes\t\tstats;\n \tuint32_t\t\t\trx_dbells;\n \tuint32_t\t\t\ttx_dbells;\n \ndiff --git a/drivers/net/sfc/sfc_dp_rx.h b/drivers/net/sfc/sfc_dp_rx.h\nindex b6c44085ce..d037acaa56 100644\n--- a/drivers/net/sfc/sfc_dp_rx.h\n+++ b/drivers/net/sfc/sfc_dp_rx.h\n@@ -216,6 +216,7 @@ struct sfc_dp_rx {\n #define SFC_DP_RX_FEAT_FLOW_FLAG\t\t0x2\n #define SFC_DP_RX_FEAT_FLOW_MARK\t\t0x4\n #define SFC_DP_RX_FEAT_INTR\t\t\t0x8\n+#define SFC_DP_RX_FEAT_STATS\t\t\t0x10\n \t/**\n \t * Rx 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_rx.c b/drivers/net/sfc/sfc_ef100_rx.c\nindex 1bf04f565a..391c52487d 100644\n--- a/drivers/net/sfc/sfc_ef100_rx.c\n+++ b/drivers/net/sfc/sfc_ef100_rx.c\n@@ -525,10 +525,13 @@ sfc_ef100_rx_process_ready_pkts(struct sfc_ef100_rxq *rxq,\n \t\t\tlastseg = seg;\n \t\t}\n \n-\t\tif (likely(deliver))\n+\t\tif (likely(deliver)) {\n \t\t\t*rx_pkts++ = pkt;\n-\t\telse\n+\t\t\tsfc_pkts_bytes_add(&rxq->dp.dpq.stats, 1,\n+\t\t\t\t\t rte_pktmbuf_pkt_len(pkt));\n+\t\t} else {\n \t\t\trte_pktmbuf_free(pkt);\n+\t\t}\n \t}\n \n \treturn rx_pkts;\n@@ -914,7 +917,8 @@ struct sfc_dp_rx sfc_ef100_rx = {\n \t\t.hw_fw_caps\t= SFC_DP_HW_FW_CAP_EF100,\n \t},\n \t.features\t\t= SFC_DP_RX_FEAT_MULTI_PROCESS |\n-\t\t\t\t SFC_DP_RX_FEAT_INTR,\n+\t\t\t\t SFC_DP_RX_FEAT_INTR |\n+\t\t\t\t SFC_DP_RX_FEAT_STATS,\n \t.dev_offload_capa\t= 0,\n \t.queue_offload_capa\t= DEV_RX_OFFLOAD_CHECKSUM |\n \t\t\t\t DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 2db0d000c3..20d808d15c 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -586,6 +586,33 @@ sfc_tx_queue_release(void *queue)\n \tsfc_adapter_unlock(sa);\n }\n \n+static void\n+sfc_stats_get_dp_rx(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_rxq_count; ++i) {\n+\t\tstruct sfc_rxq_info *rxq_info;\n+\n+\t\trxq_info = sfc_rxq_info_by_ethdev_qid(sas, i);\n+\t\tif (rxq_info->state & SFC_RXQ_INITIALIZED) {\n+\t\t\tunion sfc_pkts_bytes qstats;\n+\n+\t\t\tsfc_pkts_bytes_get(&rxq_info->dp->dpq.stats, &qstats);\n+\t\t\tpkts_sum += qstats.pkts -\n+\t\t\t\t\tsa->sw_stats.reset_rx_pkts[i];\n+\t\t\tbytes_sum += qstats.bytes -\n+\t\t\t\t\tsa->sw_stats.reset_rx_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@@ -612,6 +639,8 @@ sfc_update_diff_stat(uint64_t *stat, uint64_t newval)\n static int\n 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 \tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n \tstruct sfc_port *port = &sa->port;\n \tuint64_t *mac_stats;\n@@ -619,6 +648,9 @@ sfc_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \n \tsfc_adapter_lock(sa);\n \n+\tif (have_dp_rx_stats)\n+\t\tsfc_stats_get_dp_rx(sa, &stats->ipackets, &stats->ibytes);\n+\n \tret = sfc_port_update_mac_stats(sa, B_FALSE);\n \tif (ret != 0)\n \t\tgoto unlock;\n@@ -627,18 +659,23 @@ sfc_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \n \tif (EFX_MAC_STAT_SUPPORTED(port->mac_stats_mask,\n \t\t\t\t EFX_MAC_VADAPTER_RX_UNICAST_PACKETS)) {\n-\t\tstats->ipackets =\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_UNICAST_PACKETS] +\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_MULTICAST_PACKETS] +\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_BROADCAST_PACKETS];\n+\t\tif (!have_dp_rx_stats) {\n+\t\t\tstats->ipackets =\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_UNICAST_PACKETS] +\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_MULTICAST_PACKETS] +\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_BROADCAST_PACKETS];\n+\t\t\tstats->ibytes =\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_UNICAST_BYTES] +\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_MULTICAST_BYTES] +\n+\t\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_BROADCAST_BYTES];\n+\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->ibytes =\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_UNICAST_BYTES] +\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_MULTICAST_BYTES] +\n-\t\t\tmac_stats[EFX_MAC_VADAPTER_RX_BROADCAST_BYTES];\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@@ -647,15 +684,12 @@ sfc_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\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->ibytes -= stats->ipackets * RTE_ETHER_CRC_LEN;\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->ibytes = mac_stats[EFX_MAC_RX_OCTETS];\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->ibytes -= mac_stats[EFX_MAC_RX_PKTS] * RTE_ETHER_CRC_LEN;\n \t\tstats->obytes -= mac_stats[EFX_MAC_TX_PKTS] * RTE_ETHER_CRC_LEN;\n \n \t\t/*\n@@ -681,12 +715,16 @@ sfc_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n \t\t\tmac_stats[EFX_MAC_RX_JABBER_PKTS];\n \t\t/* no oerrors counters supported on EF10 */\n \n-\t\t/* Exclude missed, errors and pauses from Rx packets */\n-\t\tsfc_update_diff_stat(&port->ipackets,\n-\t\t\tmac_stats[EFX_MAC_RX_PKTS] -\n-\t\t\tmac_stats[EFX_MAC_RX_PAUSE_PKTS] -\n-\t\t\tstats->imissed - stats->ierrors);\n-\t\tstats->ipackets = port->ipackets;\n+\t\tif (!have_dp_rx_stats) {\n+\t\t\t/* Exclude missed, errors and pauses from Rx packets */\n+\t\t\tsfc_update_diff_stat(&port->ipackets,\n+\t\t\t\tmac_stats[EFX_MAC_RX_PKTS] -\n+\t\t\t\tmac_stats[EFX_MAC_RX_PAUSE_PKTS] -\n+\t\t\t\tstats->imissed - stats->ierrors);\n+\t\t\tstats->ipackets = port->ipackets;\n+\t\t\tstats->ibytes = mac_stats[EFX_MAC_RX_OCTETS] -\n+\t\t\t\tmac_stats[EFX_MAC_RX_PKTS] * RTE_ETHER_CRC_LEN;\n+\t\t}\n \t}\n \n unlock:\ndiff --git a/drivers/net/sfc/sfc_sw_stats.c b/drivers/net/sfc/sfc_sw_stats.c\nindex 81bd531a17..8ffa923215 100644\n--- a/drivers/net/sfc/sfc_sw_stats.c\n+++ b/drivers/net/sfc/sfc_sw_stats.c\n@@ -12,13 +12,21 @@\n \n #define SFC_SW_STAT_INVALID\t\tUINT64_MAX\n \n-#define SFC_SW_STATS_GROUP_SIZE_MAX\t1U\n+#define SFC_SW_STATS_GROUP_SIZE_MAX\t2U\n+#define SFC_SW_STAT_GOOD_PACKETS\t\"packets\"\n+#define SFC_SW_STAT_GOOD_BYTES\t\t\"bytes\"\n \n enum sfc_sw_stats_type {\n \tSFC_SW_STATS_RX,\n \tSFC_SW_STATS_TX,\n };\n \n+enum sfc_sw_stats_group_basic {\n+\tSFC_SW_STATS_GROUP_BASIC_PKTS = 0,\n+\tSFC_SW_STATS_GROUP_BASIC_BYTES,\n+\tSFX_SW_STATS_GROUP_BASIC_MAX\n+};\n+\n typedef void sfc_get_sw_stat_val_t(struct sfc_adapter *sa, uint16_t qid,\n \t\t\t\t uint64_t *values, unsigned int values_count);\n \n@@ -29,6 +37,29 @@ struct sfc_sw_stat_descr {\n \tbool provide_total;\n };\n \n+static sfc_get_sw_stat_val_t sfc_sw_stat_get_rx_good_pkts_bytes;\n+static void\n+sfc_sw_stat_get_rx_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_rxq_info *rxq_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+\trxq_info = sfc_rxq_info_by_ethdev_qid(sas, qid);\n+\tif (rxq_info->state & SFC_RXQ_INITIALIZED) {\n+\t\tsfc_pkts_bytes_get(&rxq_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@@ -66,6 +97,20 @@ sfc_get_sw_stat_val_tx_dbells(struct sfc_adapter *sa, uint16_t qid,\n * The start of the group is denoted by stat implementing get value callback.\n */\n const struct sfc_sw_stat_descr sfc_sw_stats_descr[] = {\n+\t/* Group of Rx packets/bytes stats */\n+\t{\n+\t\t.name = SFC_SW_STAT_GOOD_PACKETS,\n+\t\t.type = SFC_SW_STATS_RX,\n+\t\t.get_val = sfc_sw_stat_get_rx_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_RX,\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 \t\t.type = SFC_SW_STATS_RX,\n@@ -584,6 +629,66 @@ sfc_sw_xstats_reset(struct sfc_adapter *sa)\n \t}\n }\n \n+static bool\n+sfc_sw_stats_is_packets_or_bytes(const char *xstat_name)\n+{\n+\treturn strcmp(xstat_name, SFC_SW_STAT_GOOD_PACKETS) == 0 ||\n+\t strcmp(xstat_name, SFC_SW_STAT_GOOD_BYTES) == 0;\n+}\n+\n+static void\n+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+\tstruct sfc_sw_stats *sw_stats = &sa->sw_stats;\n+\tconst struct sfc_sw_stat_descr *sw_stat_descr;\n+\tunsigned int i;\n+\n+\tsw_stats->supp_count = 0;\n+\tfor (i = 0; i < RTE_DIM(sfc_sw_stats_descr); i++) {\n+\t\tsw_stat_descr = &sfc_sw_stats_descr[i];\n+\t\tif (!have_dp_rx_stats &&\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\tsw_stats->supp[sw_stats->supp_count].descr = sw_stat_descr;\n+\t\tsw_stats->supp_count++;\n+\t}\n+}\n+\n+static int\n+sfc_sw_stats_set_reset_basic_stats(struct sfc_adapter *sa)\n+{\n+\tuint64_t *reset_vals = sa->sw_stats.reset_vals;\n+\tstruct sfc_sw_stats *sw_stats = &sa->sw_stats;\n+\tconst struct sfc_sw_stat_descr *sw_stat;\n+\tunsigned int i;\n+\n+\tfor (i = 0; i < sw_stats->supp_count; i++) {\n+\t\tsw_stat = sw_stats->supp[i].descr;\n+\n+\t\tswitch (sw_stat->type) {\n+\t\tcase SFC_SW_STATS_RX:\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_rx_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_rx_bytes = reset_vals;\n+\t\t\tbreak;\n+\t\tcase SFC_SW_STATS_TX:\n+\t\tdefault:\n+\t\t\tSFC_GENERIC_LOG(ERR, \"Unknown SW stat type\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\treset_vals += sfc_sw_xstat_get_nb_supported(sa, sw_stat);\n+\t}\n+\n+\treturn 0;\n+}\n+\n int\n sfc_sw_xstats_configure(struct sfc_adapter *sa)\n {\n@@ -605,6 +710,7 @@ sfc_sw_xstats_configure(struct sfc_adapter *sa)\n \t}\n \tfor (i = 0; i < sw_stats->supp_count; i++)\n \t\tsw_stats->supp[i].descr = &sfc_sw_stats_descr[i];\n+\tsfc_sw_stats_fill_available_descr(sa);\n \n \tfor (i = 0; i < sw_stats->supp_count; i++) {\n \t\tnb_supported += sfc_sw_xstat_get_nb_supported(sa,\n@@ -630,6 +736,9 @@ sfc_sw_xstats_configure(struct sfc_adapter *sa)\n \t}\n \tsa->sw_stats.cache_count = cache_count;\n \tstat_cache = *cache;\n+\trc = sfc_sw_stats_set_reset_basic_stats(sa);\n+\tif (rc != 0)\n+\t\tgoto fail_reset_basic_stats;\n \n \tfor (i = 0; i < sw_stats->supp_count; i++) {\n \t\tsw_stats->supp[i].cache = stat_cache;\n@@ -639,6 +748,10 @@ sfc_sw_xstats_configure(struct sfc_adapter *sa)\n \n \treturn 0;\n \n+fail_reset_basic_stats:\n+\trte_free(*cache);\n+\t*cache = NULL;\n+\tsa->sw_stats.cache_count = 0;\n fail_cache:\n \trte_free(*reset_vals);\n \t*reset_vals = NULL;\n", "prefixes": [ "10/11" ] }