Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/86873/?format=api
{ "id": 86873, "url": "https://patches.dpdk.org/api/patches/86873/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1611041295-12797-9-git-send-email-xuemingl@nvidia.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": "<1611041295-12797-9-git-send-email-xuemingl@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1611041295-12797-9-git-send-email-xuemingl@nvidia.com", "date": "2021-01-19T07:28:14", "name": "[v4,8/8] net/mlx5: improve bonding xstats", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0c5087fe04411b581ededa7d30a5d5f704da284d", "submitter": { "id": 1904, "url": "https://patches.dpdk.org/api/people/1904/?format=api", "name": "Xueming Li", "email": "xuemingl@nvidia.com" }, "delegate": { "id": 3268, "url": "https://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1611041295-12797-9-git-send-email-xuemingl@nvidia.com/mbox/", "series": [ { "id": 14836, "url": "https://patches.dpdk.org/api/series/14836/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14836", "date": "2021-01-19T07:28:08", "name": "net/mlx5: support SubFunction representor", "version": 4, "mbox": "https://patches.dpdk.org/series/14836/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/86873/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/86873/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 A8FBAA0A03;\n\tTue, 19 Jan 2021 08:31:07 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 19106140DDB;\n\tTue, 19 Jan 2021 08:30:07 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by mails.dpdk.org (Postfix) with ESMTP id B7991140D5D\n for <dev@dpdk.org>; Tue, 19 Jan 2021 08:29:58 +0100 (CET)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n xuemingl@nvidia.com) with SMTP; 19 Jan 2021 09:29:53 +0200", "from nvidia.com (pegasus05.mtr.labs.mlnx [10.210.16.100])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 10J7Tpqr014531;\n Tue, 19 Jan 2021 09:29:53 +0200" ], "From": "Xueming Li <xuemingl@nvidia.com>", "To": "Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "Cc": "dev@dpdk.org, xuemingl@nvidia.com, Asaf Penso <asafp@nvidia.com>", "Date": "Tue, 19 Jan 2021 07:28:14 +0000", "Message-Id": "<1611041295-12797-9-git-send-email-xuemingl@nvidia.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": [ "<1611041295-12797-1-git-send-email-xuemingl@nvidia.com>", "<1608304614-13908-2-git-send-email-xuemingl@nvidia.com>" ], "References": [ "<1611041295-12797-1-git-send-email-xuemingl@nvidia.com>", "<1608304614-13908-2-git-send-email-xuemingl@nvidia.com>" ], "Subject": "[dpdk-dev] [PATCH v4 8/8] net/mlx5: improve bonding xstats", "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": "In case of kernel bonding device, counter was read from first bonding PF\nmember.\n\nThis patch reads all member PFs and sums to get bond xstats.\n\nSigned-off-by: Xueming Li <xuemingl@nvidia.com>\nAcked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>\n---\n drivers/net/mlx5/linux/mlx5_ethdev_os.c | 127 +++++++++++++++++++-----\n 1 file changed, 102 insertions(+), 25 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c\nindex 84610a7bc0..27afb74aff 100644\n--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c\n@@ -169,10 +169,10 @@ mlx5_get_ifname(const struct rte_eth_dev *dev, char (*ifname)[MLX5_NAMESIZE])\n }\n \n /**\n- * Perform ifreq ioctl() on associated Ethernet device.\n+ * Perform ifreq ioctl() on associated netdev ifname.\n *\n- * @param[in] dev\n- * Pointer to Ethernet device.\n+ * @param[in] ifname\n+ * Pointer to netdev name.\n * @param req\n * Request number to pass to ioctl().\n * @param[out] ifr\n@@ -182,7 +182,7 @@ mlx5_get_ifname(const struct rte_eth_dev *dev, char (*ifname)[MLX5_NAMESIZE])\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n static int\n-mlx5_ifreq(const struct rte_eth_dev *dev, int req, struct ifreq *ifr)\n+mlx5_ifreq_by_ifname(const char *ifname, int req, struct ifreq *ifr)\n {\n \tint sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);\n \tint ret = 0;\n@@ -191,9 +191,7 @@ mlx5_ifreq(const struct rte_eth_dev *dev, int req, struct ifreq *ifr)\n \t\trte_errno = errno;\n \t\treturn -rte_errno;\n \t}\n-\tret = mlx5_get_ifname(dev, &ifr->ifr_name);\n-\tif (ret)\n-\t\tgoto error;\n+\trte_strscpy(ifr->ifr_name, ifname, sizeof(ifr->ifr_name));\n \tret = ioctl(sock, req, ifr);\n \tif (ret == -1) {\n \t\trte_errno = errno;\n@@ -206,6 +204,31 @@ mlx5_ifreq(const struct rte_eth_dev *dev, int req, struct ifreq *ifr)\n \treturn -rte_errno;\n }\n \n+/**\n+ * Perform ifreq ioctl() on associated Ethernet device.\n+ *\n+ * @param[in] dev\n+ * Pointer to Ethernet device.\n+ * @param req\n+ * Request number to pass to ioctl().\n+ * @param[out] ifr\n+ * Interface request structure output buffer.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+static int\n+mlx5_ifreq(const struct rte_eth_dev *dev, int req, struct ifreq *ifr)\n+{\n+\tchar ifname[sizeof(ifr->ifr_name)];\n+\tint ret;\n+\n+\tret = mlx5_get_ifname(dev, &ifname);\n+\tif (ret)\n+\t\treturn -rte_errno;\n+\treturn mlx5_ifreq_by_ifname(ifname, req, ifr);\n+}\n+\n /**\n * Get device MTU.\n *\n@@ -1243,6 +1266,8 @@ int mlx5_get_module_eeprom(struct rte_eth_dev *dev,\n *\n * @param dev\n * Pointer to Ethernet device.\n+ * @param[in] pf\n+ * PF index in case of bonding device, -1 otherwise\n * @param[out] stats\n * Counters table output buffer.\n *\n@@ -1250,8 +1275,8 @@ int mlx5_get_module_eeprom(struct rte_eth_dev *dev,\n * 0 on success and stats is filled, negative errno value otherwise and\n * rte_errno is set.\n */\n-int\n-mlx5_os_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)\n+static int\n+_mlx5_os_read_dev_counters(struct rte_eth_dev *dev, int pf, uint64_t *stats)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;\n@@ -1265,7 +1290,11 @@ mlx5_os_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)\n \tet_stats->cmd = ETHTOOL_GSTATS;\n \tet_stats->n_stats = xstats_ctrl->stats_n;\n \tifr.ifr_data = (caddr_t)et_stats;\n-\tret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);\n+\tif (pf >= 0)\n+\t\tret = mlx5_ifreq_by_ifname(priv->sh->bond.ports[pf].ifname,\n+\t\t\t\t\t SIOCETHTOOL, &ifr);\n+\telse\n+\t\tret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);\n \tif (ret) {\n \t\tDRV_LOG(WARNING,\n \t\t\t\"port %u unable to read statistic values from device\",\n@@ -1273,23 +1302,60 @@ mlx5_os_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)\n \t\treturn ret;\n \t}\n \tfor (i = 0; i != xstats_ctrl->mlx5_stats_n; ++i) {\n-\t\tif (xstats_ctrl->info[i].dev) {\n-\t\t\tret = mlx5_os_read_dev_stat(priv,\n-\t\t\t\t\t xstats_ctrl->info[i].ctr_name,\n-\t\t\t\t\t &stats[i]);\n-\t\t\t/* return last xstats counter if fail to read. */\n-\t\t\tif (ret == 0)\n-\t\t\t\txstats_ctrl->xstats[i] = stats[i];\n-\t\t\telse\n-\t\t\t\tstats[i] = xstats_ctrl->xstats[i];\n-\t\t} else {\n-\t\t\tstats[i] = (uint64_t)\n-\t\t\t\tet_stats->data[xstats_ctrl->dev_table_idx[i]];\n-\t\t}\n+\t\tif (xstats_ctrl->info[i].dev)\n+\t\t\tcontinue;\n+\t\tstats[i] += (uint64_t)\n+\t\t\t et_stats->data[xstats_ctrl->dev_table_idx[i]];\n \t}\n \treturn 0;\n }\n \n+/**\n+ * Read device counters.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device.\n+ * @param[out] stats\n+ * Counters table output buffer.\n+ *\n+ * @return\n+ * 0 on success and stats is filled, negative errno value otherwise and\n+ * rte_errno is set.\n+ */\n+int\n+mlx5_os_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tstruct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;\n+\tint ret = 0, i;\n+\n+\tmemset(stats, 0, sizeof(*stats) * xstats_ctrl->mlx5_stats_n);\n+\t/* Read ifreq counters. */\n+\tif (priv->master && priv->pf_bond >= 0) {\n+\t\t/* Sum xstats from bonding device member ports. */\n+\t\tfor (i = 0; i < priv->sh->bond.n_port; i++) {\n+\t\t\tret = _mlx5_os_read_dev_counters(dev, i, stats);\n+\t\t\tif (ret)\n+\t\t\t\treturn ret;\n+\t\t}\n+\t} else {\n+\t\tret = _mlx5_os_read_dev_counters(dev, -1, stats);\n+\t}\n+\t/* Read IB counters. */\n+\tfor (i = 0; i != xstats_ctrl->mlx5_stats_n; ++i) {\n+\t\tif (!xstats_ctrl->info[i].dev)\n+\t\t\tcontinue;\n+\t\tret = mlx5_os_read_dev_stat(priv, xstats_ctrl->info[i].ctr_name,\n+\t\t\t\t\t &stats[i]);\n+\t\t/* return last xstats counter if fail to read. */\n+\t\tif (ret != 0)\n+\t\t\txstats_ctrl->xstats[i] = stats[i];\n+\t\telse\n+\t\t\tstats[i] = xstats_ctrl->xstats[i];\n+\t}\n+\treturn ret;\n+}\n+\n /**\n * Query the number of statistics provided by ETHTOOL.\n *\n@@ -1303,13 +1369,19 @@ mlx5_os_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)\n int\n mlx5_os_get_stats_n(struct rte_eth_dev *dev)\n {\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct ethtool_drvinfo drvinfo;\n \tstruct ifreq ifr;\n \tint ret;\n \n \tdrvinfo.cmd = ETHTOOL_GDRVINFO;\n \tifr.ifr_data = (caddr_t)&drvinfo;\n-\tret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);\n+\tif (priv->master && priv->pf_bond >= 0)\n+\t\t/* Bonding PF. */\n+\t\tret = mlx5_ifreq_by_ifname(priv->sh->bond.ports[0].ifname,\n+\t\t\t\t\t SIOCETHTOOL, &ifr);\n+\telse\n+\t\tret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);\n \tif (ret) {\n \t\tDRV_LOG(WARNING, \"port %u unable to query number of statistics\",\n \t\t\tdev->data->port_id);\n@@ -1480,7 +1552,12 @@ mlx5_os_stats_init(struct rte_eth_dev *dev)\n \tstrings->string_set = ETH_SS_STATS;\n \tstrings->len = dev_stats_n;\n \tifr.ifr_data = (caddr_t)strings;\n-\tret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);\n+\tif (priv->master && priv->pf_bond >= 0)\n+\t\t/* Bonding master. */\n+\t\tret = mlx5_ifreq_by_ifname(priv->sh->bond.ports[0].ifname,\n+\t\t\t\t\t SIOCETHTOOL, &ifr);\n+\telse\n+\t\tret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);\n \tif (ret) {\n \t\tDRV_LOG(WARNING, \"port %u unable to get statistic names\",\n \t\t\tdev->data->port_id);\n", "prefixes": [ "v4", "8/8" ] }