summaryrefslogtreecommitdiff
path: root/drivers/net/mlx5/mlx5_stats.c
diff options
context:
space:
mode:
authorShahaf Shuler <shahafs@mellanox.com>2017-02-21 16:37:24 +0200
committerFerruh Yigit <ferruh.yigit@intel.com>2017-04-04 15:52:50 +0200
commite62bc9e70608b90cf639209127501c33e4f12342 (patch)
tree39932bd70425e16142479f41395c040724e146b9 /drivers/net/mlx5/mlx5_stats.c
parentcd89f22a1e9770d312cac03c10705d48e5e36b4b (diff)
downloaddpdk-e62bc9e70608b90cf639209127501c33e4f12342.zip
dpdk-e62bc9e70608b90cf639209127501c33e4f12342.tar.gz
dpdk-e62bc9e70608b90cf639209127501c33e4f12342.tar.xz
net/mlx5: fix extended statistics
The number of extended statistics counters is queried through ETHTOOL. ETHTOOL provides a different number when the link is up or down. Since extended statistics query occurs at device start, segmentation fault might happen when changing the link state before and after the device start. this commit address this issue, and query the number of statistics before every call to ETHTOOL. Fixes: a4193ae3bc4f ("net/mlx5: support extended statistics") Cc: stable@dpdk.org Signed-off-by: Shahaf Shuler <shahafs@mellanox.com> Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Diffstat (limited to 'drivers/net/mlx5/mlx5_stats.c')
-rw-r--r--drivers/net/mlx5/mlx5_stats.c48
1 files changed, 39 insertions, 9 deletions
diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
index a211841..1953293 100644
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
@@ -176,6 +176,29 @@ priv_read_dev_counters(struct priv *priv, uint64_t *stats)
}
/**
+ * Query the number of statistics provided by ETHTOOL.
+ *
+ * @param priv
+ * Pointer to private structure.
+ *
+ * @return
+ * Number of statistics on success, -1 on error.
+ */
+static int
+priv_ethtool_get_stats_n(struct priv *priv) {
+ struct ethtool_drvinfo drvinfo;
+ struct ifreq ifr;
+
+ drvinfo.cmd = ETHTOOL_GDRVINFO;
+ ifr.ifr_data = (caddr_t)&drvinfo;
+ if (priv_ifreq(priv, SIOCETHTOOL, &ifr) != 0) {
+ WARN("unable to query number of statistics");
+ return -1;
+ }
+ return drvinfo.n_stats;
+}
+
+/**
* Init the structures to read device counters.
*
* @param priv
@@ -188,19 +211,11 @@ priv_xstats_init(struct priv *priv)
unsigned int i;
unsigned int j;
struct ifreq ifr;
- struct ethtool_drvinfo drvinfo;
struct ethtool_gstrings *strings = NULL;
unsigned int dev_stats_n;
unsigned int str_sz;
- /* How many statistics are available. */
- drvinfo.cmd = ETHTOOL_GDRVINFO;
- ifr.ifr_data = (caddr_t)&drvinfo;
- if (priv_ifreq(priv, SIOCETHTOOL, &ifr) != 0) {
- WARN("unable to get driver info");
- return;
- }
- dev_stats_n = drvinfo.n_stats;
+ dev_stats_n = priv_ethtool_get_stats_n(priv);
if (dev_stats_n < 1) {
WARN("no extended statistics available");
return;
@@ -422,7 +437,15 @@ mlx5_xstats_get(struct rte_eth_dev *dev,
int ret = xstats_n;
if (n >= xstats_n && stats) {
+ struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
+ int stats_n;
+
priv_lock(priv);
+ stats_n = priv_ethtool_get_stats_n(priv);
+ if (stats_n < 0)
+ return -1;
+ if (xstats_ctrl->stats_n != stats_n)
+ priv_xstats_init(priv);
ret = priv_xstats_get(priv, stats);
priv_unlock(priv);
}
@@ -439,8 +462,15 @@ void
mlx5_xstats_reset(struct rte_eth_dev *dev)
{
struct priv *priv = mlx5_get_priv(dev);
+ struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
+ int stats_n;
priv_lock(priv);
+ stats_n = priv_ethtool_get_stats_n(priv);
+ if (stats_n < 0)
+ return;
+ if (xstats_ctrl->stats_n != stats_n)
+ priv_xstats_init(priv);
priv_xstats_reset(priv);
priv_unlock(priv);
}