Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/7434/?format=api
{ "id": 7434, "url": "https://patches.dpdk.org/api/patches/7434/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1444067589-29513-8-git-send-email-adrien.mazarguil@6wind.com/", "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": "<1444067589-29513-8-git-send-email-adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1444067589-29513-8-git-send-email-adrien.mazarguil@6wind.com", "date": "2015-10-05T17:53:03", "name": "[dpdk-dev,07/13] mlx5: add software counters and related callbacks", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7e756837a9fdfe589537573b7e9119d65242c40f", "submitter": { "id": 165, "url": "https://patches.dpdk.org/api/people/165/?format=api", "name": "Adrien Mazarguil", "email": "adrien.mazarguil@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1444067589-29513-8-git-send-email-adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/7434/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/7434/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id A9D919267;\n\tMon, 5 Oct 2015 19:53:53 +0200 (CEST)", "from mail-wi0-f171.google.com (mail-wi0-f171.google.com\n\t[209.85.212.171]) by dpdk.org (Postfix) with ESMTP id DC5F09255\n\tfor <dev@dpdk.org>; Mon, 5 Oct 2015 19:53:51 +0200 (CEST)", "by wiclk2 with SMTP id lk2so132413656wic.0\n\tfor <dev@dpdk.org>; Mon, 05 Oct 2015 10:53:51 -0700 (PDT)", "from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.\n\t[82.239.227.177]) by smtp.gmail.com with ESMTPSA id\n\twj4sm28087563wjb.10.2015.10.05.10.53.50\n\t(version=TLSv1.2 cipher=RC4-SHA bits=128/128);\n\tMon, 05 Oct 2015 10:53:51 -0700 (PDT)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=uszataOP7xfhbgEbUWqHe/jXj14RbEiAHMzinWeqhm4=;\n\tb=fRiGnfUCnh6Xn9U59tBsr1Axj1OtP0uSVhzF/fvK6aqTc4ucqsiN2PYvv3ejTgEtPN\n\tzMe7nOCIuL/Ckcp3QJYTrA56NzLQHQG4FF7g1G07yAor8WmyoYKAS4ABRiUkxqpUoZA+\n\tWBsePHNeMzH7Q1MslprFhtQ2P2u22b257DEvG6p1D2rUa+ZDufIdpvzaXeznf3zAb+CC\n\ts4NEET7Nr997f8UF+uKCNHD0JN8lJDjGCGHFsBBVO1YdRFpINg/pSCDMjvEWhirjVtpQ\n\t5QXSW42Rql8Pkt7KFOmVuD0u4udmBSM5sFi6QR1g/q0E3yOnIs0w6DqlVtdK9o0Rje8Q\n\t2Ihw==", "X-Gm-Message-State": "ALoCoQlC8HmaAsIXZuLCCZnfjoAw1RjeqUwirPs0Kh9XtVhq4SgTn3K5mOtjhT+24EK+RfS6pMCi", "X-Received": "by 10.194.209.240 with SMTP id\n\tmp16mr31910939wjc.100.1444067631558; \n\tMon, 05 Oct 2015 10:53:51 -0700 (PDT)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Date": "Mon, 5 Oct 2015 19:53:03 +0200", "Message-Id": "<1444067589-29513-8-git-send-email-adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1444067589-29513-1-git-send-email-adrien.mazarguil@6wind.com>", "References": "<1444067589-29513-1-git-send-email-adrien.mazarguil@6wind.com>", "Subject": "[dpdk-dev] [PATCH 07/13] mlx5: add software counters and related\n\tcallbacks", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Hardware counters are not supported yet.\n\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\nSigned-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>\n---\n drivers/net/mlx5/Makefile | 1 +\n drivers/net/mlx5/mlx5.c | 2 +\n drivers/net/mlx5/mlx5.h | 5 ++\n drivers/net/mlx5/mlx5_defs.h | 8 +++\n drivers/net/mlx5/mlx5_rxq.c | 1 +\n drivers/net/mlx5/mlx5_rxtx.c | 43 +++++++++++++\n drivers/net/mlx5/mlx5_rxtx.h | 21 ++++++\n drivers/net/mlx5/mlx5_stats.c | 144 ++++++++++++++++++++++++++++++++++++++++++\n drivers/net/mlx5/mlx5_txq.c | 1 +\n 9 files changed, 226 insertions(+)\n create mode 100644 drivers/net/mlx5/mlx5_stats.c", "diff": "diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile\nindex 028c22c..88b361c 100644\n--- a/drivers/net/mlx5/Makefile\n+++ b/drivers/net/mlx5/Makefile\n@@ -48,6 +48,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_trigger.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_ethdev.c\n SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mac.c\n+SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_stats.c\n \n # Dependencies.\n DEPDIRS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += lib/librte_ether\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 5bef742..262b458 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -133,6 +133,8 @@ static const struct eth_dev_ops mlx5_dev_ops = {\n \t.dev_start = mlx5_dev_start,\n \t.dev_stop = mlx5_dev_stop,\n \t.dev_close = mlx5_dev_close,\n+\t.stats_get = mlx5_stats_get,\n+\t.stats_reset = mlx5_stats_reset,\n \t.dev_infos_get = mlx5_dev_infos_get,\n \t.rx_queue_setup = mlx5_rx_queue_setup,\n \t.tx_queue_setup = mlx5_tx_queue_setup,\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 14f55ba..261593e 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -184,6 +184,11 @@ int priv_mac_addr_add(struct priv *, unsigned int,\n void mlx5_mac_addr_add(struct rte_eth_dev *, struct ether_addr *, uint32_t,\n \t\t uint32_t);\n \n+/* mlx5_stats.c */\n+\n+void mlx5_stats_get(struct rte_eth_dev *, struct rte_eth_stats *);\n+void mlx5_stats_reset(struct rte_eth_dev *);\n+\n /* mlx5_trigger.c */\n \n int mlx5_dev_start(struct rte_eth_dev *);\ndiff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h\nindex 4f13a4e..79de609 100644\n--- a/drivers/net/mlx5/mlx5_defs.h\n+++ b/drivers/net/mlx5/mlx5_defs.h\n@@ -74,4 +74,12 @@\n #define MLX5_PMD_TX_MP_CACHE 8\n #endif\n \n+/*\n+ * If defined, only use software counters. The PMD will never ask the hardware\n+ * for these, and many of them won't be available.\n+ */\n+#ifndef MLX5_PMD_SOFT_COUNTERS\n+#define MLX5_PMD_SOFT_COUNTERS 1\n+#endif\n+\n #endif /* RTE_PMD_MLX5_DEFS_H_ */\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 401b575..a7d5081 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -996,6 +996,7 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n \tif (ret)\n \t\trte_free(rxq);\n \telse {\n+\t\trxq->stats.idx = idx;\n \t\tDEBUG(\"%p: adding RX queue %p to list\",\n \t\t (void *)dev, (void *)rxq);\n \t\t(*priv->rxqs)[idx] = rxq;\ndiff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c\nindex 5042011..960a3e5 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.c\n+++ b/drivers/net/mlx5/mlx5_rxtx.c\n@@ -367,6 +367,9 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\tstruct txq_elt *elt_next = &(*txq->elts)[elts_head_next];\n \t\tstruct txq_elt *elt = &(*txq->elts)[elts_head];\n \t\tunsigned int segs = NB_SEGS(buf);\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\tunsigned int sent_size = 0;\n+#endif\n \t\tuint32_t send_flags = 0;\n \n \t\t/* Clean up old buffer. */\n@@ -429,6 +432,9 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\t\t\t\t send_flags);\n \t\t\tif (unlikely(err))\n \t\t\t\tgoto stop;\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\t\tsent_size += length;\n+#endif\n \t\t} else {\n #if MLX5_PMD_SGE_WR_N > 1\n \t\t\tstruct ibv_sge sges[MLX5_PMD_SGE_WR_N];\n@@ -447,6 +453,9 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\t\t\t send_flags);\n \t\t\tif (unlikely(err))\n \t\t\t\tgoto stop;\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\t\tsent_size += ret.length;\n+#endif\n #else /* MLX5_PMD_SGE_WR_N > 1 */\n \t\t\tDEBUG(\"%p: TX scattered buffers support not\"\n \t\t\t \" compiled in\", (void *)txq);\n@@ -454,11 +463,19 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)\n #endif /* MLX5_PMD_SGE_WR_N > 1 */\n \t\t}\n \t\telts_head = elts_head_next;\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\t/* Increment sent bytes counter. */\n+\t\ttxq->stats.obytes += sent_size;\n+#endif\n \t}\n stop:\n \t/* Take a shortcut if nothing must be sent. */\n \tif (unlikely(i == 0))\n \t\treturn 0;\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t/* Increment sent packets counter. */\n+\ttxq->stats.opackets += i;\n+#endif\n \t/* Ring QP doorbell. */\n \terr = txq->if_qp->send_flush(txq->qp);\n \tif (unlikely(err)) {\n@@ -549,6 +566,10 @@ mlx5_rx_burst_sp(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\t\t\t \" completion status (%d): %s\",\n \t\t\t\t (void *)rxq, wc.wr_id, wc.status,\n \t\t\t\t ibv_wc_status_str(wc.status));\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\t\t\t/* Increment dropped packets counter. */\n+\t\t\t\t++rxq->stats.idropped;\n+#endif\n \t\t\t\t/* Link completed WRs together for repost. */\n \t\t\t\t*next = wr;\n \t\t\t\tnext = &wr->next;\n@@ -592,6 +613,7 @@ mlx5_rx_burst_sp(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\t\t\t\trte_pktmbuf_free(pkt_buf);\n \t\t\t\t}\n \t\t\t\t/* Increment out of memory counters. */\n+\t\t\t\t++rxq->stats.rx_nombuf;\n \t\t\t\t++rxq->priv->dev->data->rx_mbuf_alloc_failed;\n \t\t\t\tgoto repost;\n \t\t\t}\n@@ -651,6 +673,10 @@ mlx5_rx_burst_sp(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\t/* Return packet. */\n \t\t*(pkts++) = pkt_buf;\n \t\t++pkts_ret;\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\t/* Increment bytes counter. */\n+\t\trxq->stats.ibytes += pkt_buf_len;\n+#endif\n repost:\n \t\tif (++elts_head >= elts_n)\n \t\t\telts_head = 0;\n@@ -673,6 +699,10 @@ repost:\n \t\tabort();\n \t}\n \trxq->elts_head = elts_head;\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t/* Increment packets counter. */\n+\trxq->stats.ipackets += pkts_ret;\n+#endif\n \treturn pkts_ret;\n }\n \n@@ -747,6 +777,10 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\t\t\t \" completion status (%d): %s\",\n \t\t\t\t (void *)rxq, wc.wr_id, wc.status,\n \t\t\t\t ibv_wc_status_str(wc.status));\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\t\t\t/* Increment dropped packets counter. */\n+\t\t\t\t++rxq->stats.idropped;\n+#endif\n \t\t\t\t/* Add SGE to array for repost. */\n \t\t\t\tsges[i] = elt->sge;\n \t\t\t\tgoto repost;\n@@ -771,6 +805,7 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\t\t \" can't allocate a new mbuf\",\n \t\t\t (void *)rxq, WR_ID(wr_id).id);\n \t\t\t/* Increment out of memory counters. */\n+\t\t\t++rxq->stats.rx_nombuf;\n \t\t\t++rxq->priv->dev->data->rx_mbuf_alloc_failed;\n \t\t\tgoto repost;\n \t\t}\n@@ -797,6 +832,10 @@ mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)\n \t\t/* Return packet. */\n \t\t*(pkts++) = seg;\n \t\t++pkts_ret;\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\t/* Increment bytes counter. */\n+\t\trxq->stats.ibytes += len;\n+#endif\n repost:\n \t\tif (++elts_head >= elts_n)\n \t\t\telts_head = 0;\n@@ -817,6 +856,10 @@ repost:\n \t\tabort();\n \t}\n \trxq->elts_head = elts_head;\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t/* Increment packets counter. */\n+\trxq->stats.ipackets += pkts_ret;\n+#endif\n \treturn pkts_ret;\n }\n \ndiff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h\nindex 0a2e650..b37843b 100644\n--- a/drivers/net/mlx5/mlx5_rxtx.h\n+++ b/drivers/net/mlx5/mlx5_rxtx.h\n@@ -60,6 +60,25 @@\n #include \"mlx5.h\"\n #include \"mlx5_defs.h\"\n \n+struct mlx5_rxq_stats {\n+\tunsigned int idx; /**< Mapping index. */\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\tuint64_t ipackets; /**< Total of successfully received packets. */\n+\tuint64_t ibytes; /**< Total of successfully received bytes. */\n+#endif\n+\tuint64_t idropped; /**< Total of packets dropped when RX ring full. */\n+\tuint64_t rx_nombuf; /**< Total of RX mbuf allocation failures. */\n+};\n+\n+struct mlx5_txq_stats {\n+\tunsigned int idx; /**< Mapping index. */\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\tuint64_t opackets; /**< Total of successfully sent packets. */\n+\tuint64_t obytes; /**< Total of successfully sent bytes. */\n+#endif\n+\tuint64_t odropped; /**< Total of packets not sent when TX ring full. */\n+};\n+\n /* RX element (scattered packets). */\n struct rxq_elt_sp {\n \tstruct ibv_recv_wr wr; /* Work Request. */\n@@ -99,6 +118,7 @@ struct rxq {\n \t} elts;\n \tunsigned int sp:1; /* Use scattered RX elements. */\n \tuint32_t mb_len; /* Length of a mp-issued mbuf. */\n+\tstruct mlx5_rxq_stats stats; /* RX queue counters. */\n \tunsigned int socket; /* CPU socket ID for allocations. */\n \tstruct ibv_exp_res_domain *rd; /* Resource Domain. */\n };\n@@ -138,6 +158,7 @@ struct txq {\n \tunsigned int elts_comp; /* Number of completion requests. */\n \tunsigned int elts_comp_cd; /* Countdown for next completion request. */\n \tunsigned int elts_comp_cd_init; /* Initial value for countdown. */\n+\tstruct mlx5_txq_stats stats; /* TX queue counters. */\n \tlinear_t (*elts_linear)[]; /* Linearized buffers. */\n \tstruct ibv_mr *mr_linear; /* Memory Region for linearized buffers. */\n \tunsigned int socket; /* CPU socket ID for allocations. */\ndiff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c\nnew file mode 100644\nindex 0000000..a51e945\n--- /dev/null\n+++ b/drivers/net/mlx5/mlx5_stats.c\n@@ -0,0 +1,144 @@\n+/*-\n+ * BSD LICENSE\n+ *\n+ * Copyright 2015 6WIND S.A.\n+ * Copyright 2015 Mellanox.\n+ *\n+ * Redistribution and use in source and binary forms, with or without\n+ * modification, are permitted provided that the following conditions\n+ * are met:\n+ *\n+ * * Redistributions of source code must retain the above copyright\n+ * notice, this list of conditions and the following disclaimer.\n+ * * Redistributions in binary form must reproduce the above copyright\n+ * notice, this list of conditions and the following disclaimer in\n+ * the documentation and/or other materials provided with the\n+ * distribution.\n+ * * Neither the name of 6WIND S.A. nor the names of its\n+ * contributors may be used to endorse or promote products derived\n+ * from this software without specific prior written permission.\n+ *\n+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+ * \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+ */\n+\n+/* DPDK headers don't like -pedantic. */\n+#ifdef PEDANTIC\n+#pragma GCC diagnostic ignored \"-pedantic\"\n+#endif\n+#include <rte_ethdev.h>\n+#ifdef PEDANTIC\n+#pragma GCC diagnostic error \"-pedantic\"\n+#endif\n+\n+#include \"mlx5.h\"\n+#include \"mlx5_rxtx.h\"\n+#include \"mlx5_defs.h\"\n+\n+/**\n+ * DPDK callback to get device statistics.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device structure.\n+ * @param[out] stats\n+ * Stats structure output buffer.\n+ */\n+void\n+mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tstruct rte_eth_stats tmp = {0};\n+\tunsigned int i;\n+\tunsigned int idx;\n+\n+\tpriv_lock(priv);\n+\t/* Add software counters. */\n+\tfor (i = 0; (i != priv->rxqs_n); ++i) {\n+\t\tstruct rxq *rxq = (*priv->rxqs)[i];\n+\n+\t\tif (rxq == NULL)\n+\t\t\tcontinue;\n+\t\tidx = rxq->stats.idx;\n+\t\tif (idx < RTE_ETHDEV_QUEUE_STAT_CNTRS) {\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\t\ttmp.q_ipackets[idx] += rxq->stats.ipackets;\n+\t\t\ttmp.q_ibytes[idx] += rxq->stats.ibytes;\n+#endif\n+\t\t\ttmp.q_errors[idx] += (rxq->stats.idropped +\n+\t\t\t\t\t rxq->stats.rx_nombuf);\n+\t\t}\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\ttmp.ipackets += rxq->stats.ipackets;\n+\t\ttmp.ibytes += rxq->stats.ibytes;\n+#endif\n+\t\ttmp.ierrors += rxq->stats.idropped;\n+\t\ttmp.rx_nombuf += rxq->stats.rx_nombuf;\n+\t}\n+\tfor (i = 0; (i != priv->txqs_n); ++i) {\n+\t\tstruct txq *txq = (*priv->txqs)[i];\n+\n+\t\tif (txq == NULL)\n+\t\t\tcontinue;\n+\t\tidx = txq->stats.idx;\n+\t\tif (idx < RTE_ETHDEV_QUEUE_STAT_CNTRS) {\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\t\ttmp.q_opackets[idx] += txq->stats.opackets;\n+\t\t\ttmp.q_obytes[idx] += txq->stats.obytes;\n+#endif\n+\t\t\ttmp.q_errors[idx] += txq->stats.odropped;\n+\t\t}\n+#ifdef MLX5_PMD_SOFT_COUNTERS\n+\t\ttmp.opackets += txq->stats.opackets;\n+\t\ttmp.obytes += txq->stats.obytes;\n+#endif\n+\t\ttmp.oerrors += txq->stats.odropped;\n+\t}\n+#ifndef MLX5_PMD_SOFT_COUNTERS\n+\t/* FIXME: retrieve and add hardware counters. */\n+#endif\n+\t*stats = tmp;\n+\tpriv_unlock(priv);\n+}\n+\n+/**\n+ * DPDK callback to clear device statistics.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device structure.\n+ */\n+void\n+mlx5_stats_reset(struct rte_eth_dev *dev)\n+{\n+\tstruct priv *priv = dev->data->dev_private;\n+\tunsigned int i;\n+\tunsigned int idx;\n+\n+\tpriv_lock(priv);\n+\tfor (i = 0; (i != priv->rxqs_n); ++i) {\n+\t\tif ((*priv->rxqs)[i] == NULL)\n+\t\t\tcontinue;\n+\t\tidx = (*priv->rxqs)[i]->stats.idx;\n+\t\t(*priv->rxqs)[i]->stats =\n+\t\t\t(struct mlx5_rxq_stats){ .idx = idx };\n+\t}\n+\tfor (i = 0; (i != priv->txqs_n); ++i) {\n+\t\tif ((*priv->txqs)[i] == NULL)\n+\t\t\tcontinue;\n+\t\tidx = (*priv->rxqs)[i]->stats.idx;\n+\t\t(*priv->txqs)[i]->stats =\n+\t\t\t(struct mlx5_txq_stats){ .idx = idx };\n+\t}\n+#ifndef MLX5_PMD_SOFT_COUNTERS\n+\t/* FIXME: reset hardware counters. */\n+#endif\n+\tpriv_unlock(priv);\n+}\ndiff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c\nindex 2bae61f..a53b128 100644\n--- a/drivers/net/mlx5/mlx5_txq.c\n+++ b/drivers/net/mlx5/mlx5_txq.c\n@@ -472,6 +472,7 @@ mlx5_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,\n \tif (ret)\n \t\trte_free(txq);\n \telse {\n+\t\ttxq->stats.idx = idx;\n \t\tDEBUG(\"%p: adding TX queue %p to list\",\n \t\t (void *)dev, (void *)txq);\n \t\t(*priv->txqs)[idx] = txq;\n", "prefixes": [ "dpdk-dev", "07/13" ] }