[dpdk-stable] patch 'net/mlx5: fix imissed counter overflow' has been queued to stable release 19.11.3
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Tue May 19 15:02:48 CEST 2020
Hi,
FYI, your patch has been queued to stable release 19.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Thanks.
Luca Boccassi
---
>From 7ba59c1fd4dbd5e8758d5c7d532fd4f698f39cdd Mon Sep 17 00:00:00 2001
From: Jiawei Wang <jiaweiw at mellanox.com>
Date: Mon, 30 Mar 2020 06:02:10 +0300
Subject: [PATCH] net/mlx5: fix imissed counter overflow
[ upstream commit c5193a0bbef8bb7aef23c8ee25d9f89167ac58fb ]
The Hw counters is defined as 32bit unsigned value and read from
the sysfs. Firstly read the base value while application start,
then fetch the new value while do query and minus the base value.
If the new value is less than base value, will result in a
negative value and convert to the big value as unsigned 64bit.
PMD add xstats field to store the last successfully read counter,
use it if failed to read hw counter from sysfs.
PMD also record the last output value to handle the wrap around case,
if overflow happened, increase the wrap count by 1 and save into the
higher 32bit, and update the new value into lower 32bit, finally
return the 64bit counter value.
Fixes: ce9494d76c47 ("net/mlx5: report imissed statistics")
Signed-off-by: Jiawei Wang <jiaweiw at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
drivers/net/mlx5/mlx5.h | 3 ++
drivers/net/mlx5/mlx5_stats.c | 57 ++++++++++++++++++++++++++++++-----
2 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index de80f62cc0..048bc66052 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -148,12 +148,15 @@ struct mlx5_xstats_ctrl {
/* Index in the device counters table. */
uint16_t dev_table_idx[MLX5_MAX_XSTATS];
uint64_t base[MLX5_MAX_XSTATS];
+ uint64_t xstats[MLX5_MAX_XSTATS];
+ uint64_t hw_stats[MLX5_MAX_XSTATS];
struct mlx5_counter_ctrl info[MLX5_MAX_XSTATS];
};
struct mlx5_stats_ctrl {
/* Base for imissed counter. */
uint64_t imissed_base;
+ uint64_t imissed;
};
/* devX creation object */
diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
index 205e4fec78..d60a633e15 100644
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
@@ -136,7 +136,7 @@ static const struct mlx5_counter_ctrl mlx5_counters_init[] = {
static const unsigned int xstats_n = RTE_DIM(mlx5_counters_init);
-static inline void
+static inline int
mlx5_read_ib_stat(struct mlx5_priv *priv, const char *ctr_name, uint64_t *stat)
{
FILE *file;
@@ -152,10 +152,11 @@ mlx5_read_ib_stat(struct mlx5_priv *priv, const char *ctr_name, uint64_t *stat)
fclose(file);
if (n == 1)
- return;
+ return 0;
}
}
*stat = 0;
+ return 1;
}
/**
@@ -194,8 +195,14 @@ mlx5_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)
}
for (i = 0; i != xstats_ctrl->mlx5_stats_n; ++i) {
if (xstats_ctrl->info[i].ib) {
- mlx5_read_ib_stat(priv, xstats_ctrl->info[i].ctr_name,
- &stats[i]);
+ ret = mlx5_read_ib_stat(priv,
+ xstats_ctrl->info[i].ctr_name,
+ &stats[i]);
+ /* return last xstats counter if fail to read. */
+ if (ret == 0)
+ xstats_ctrl->xstats[i] = stats[i];
+ else
+ stats[i] = xstats_ctrl->xstats[i];
} else {
stats[i] = (uint64_t)
et_stats->data[xstats_ctrl->dev_table_idx[i]];
@@ -301,6 +308,7 @@ mlx5_stats_init(struct rte_eth_dev *dev)
unsigned int idx = xstats_ctrl->mlx5_stats_n++;
xstats_ctrl->info[idx] = mlx5_counters_init[i];
+ xstats_ctrl->hw_stats[idx] = 0;
}
}
assert(xstats_ctrl->mlx5_stats_n <= MLX5_MAX_XSTATS);
@@ -311,6 +319,7 @@ mlx5_stats_init(struct rte_eth_dev *dev)
DRV_LOG(ERR, "port %u cannot read device counters: %s",
dev->data->port_id, strerror(rte_errno));
mlx5_read_ib_stat(priv, "out_of_buffer", &stats_ctrl->imissed_base);
+ stats_ctrl->imissed = 0;
free:
rte_free(strings);
}
@@ -353,7 +362,23 @@ mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
return ret;
for (i = 0; i != mlx5_stats_n; ++i) {
stats[i].id = i;
- stats[i].value = (counters[i] - xstats_ctrl->base[i]);
+ if (xstats_ctrl->info[i].ib) {
+ uint64_t wrap_n;
+ uint64_t hw_stat = xstats_ctrl->hw_stats[i];
+
+ stats[i].value = (counters[i] -
+ xstats_ctrl->base[i]) &
+ (uint64_t)UINT32_MAX;
+ wrap_n = hw_stat >> 32;
+ if (stats[i].value <
+ (hw_stat & (uint64_t)UINT32_MAX))
+ wrap_n++;
+ stats[i].value |= (wrap_n) << 32;
+ xstats_ctrl->hw_stats[i] = stats[i].value;
+ } else {
+ stats[i].value =
+ (counters[i] - xstats_ctrl->base[i]);
+ }
}
}
return mlx5_stats_n;
@@ -375,9 +400,12 @@ int
mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_stats_ctrl *stats_ctrl = &priv->stats_ctrl;
struct rte_eth_stats tmp;
unsigned int i;
unsigned int idx;
+ uint64_t wrap_n;
+ int ret;
memset(&tmp, 0, sizeof(tmp));
/* Add software counters. */
@@ -420,8 +448,18 @@ mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
#endif
tmp.oerrors += txq->stats.oerrors;
}
- mlx5_read_ib_stat(priv, "out_of_buffer", &tmp.imissed);
- tmp.imissed -= priv->stats_ctrl.imissed_base;
+ ret = mlx5_read_ib_stat(priv, "out_of_buffer", &tmp.imissed);
+ if (ret == 0) {
+ tmp.imissed = (tmp.imissed - stats_ctrl->imissed_base) &
+ (uint64_t)UINT32_MAX;
+ wrap_n = stats_ctrl->imissed >> 32;
+ if (tmp.imissed < (stats_ctrl->imissed & (uint64_t)UINT32_MAX))
+ wrap_n++;
+ tmp.imissed |= (wrap_n) << 32;
+ stats_ctrl->imissed = tmp.imissed;
+ } else {
+ tmp.imissed = stats_ctrl->imissed;
+ }
#ifndef MLX5_PMD_SOFT_COUNTERS
/* FIXME: retrieve and add hardware counters. */
#endif
@@ -458,6 +496,7 @@ mlx5_stats_reset(struct rte_eth_dev *dev)
sizeof(struct mlx5_txq_stats));
}
mlx5_read_ib_stat(priv, "out_of_buffer", &stats_ctrl->imissed_base);
+ stats_ctrl->imissed = 0;
#ifndef MLX5_PMD_SOFT_COUNTERS
/* FIXME: reset hardware counters. */
#endif
@@ -500,8 +539,10 @@ mlx5_xstats_reset(struct rte_eth_dev *dev)
dev->data->port_id, strerror(rte_errno));
return ret;
}
- for (i = 0; i != n; ++i)
+ for (i = 0; i != n; ++i) {
xstats_ctrl->base[i] = counters[i];
+ xstats_ctrl->hw_stats[i] = 0;
+ }
return 0;
}
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-05-19 14:04:45.940398665 +0100
+++ 0033-net-mlx5-fix-imissed-counter-overflow.patch 2020-05-19 14:04:44.168647502 +0100
@@ -1,8 +1,10 @@
-From c5193a0bbef8bb7aef23c8ee25d9f89167ac58fb Mon Sep 17 00:00:00 2001
+From 7ba59c1fd4dbd5e8758d5c7d532fd4f698f39cdd Mon Sep 17 00:00:00 2001
From: Jiawei Wang <jiaweiw at mellanox.com>
Date: Mon, 30 Mar 2020 06:02:10 +0300
Subject: [PATCH] net/mlx5: fix imissed counter overflow
+[ upstream commit c5193a0bbef8bb7aef23c8ee25d9f89167ac58fb ]
+
The Hw counters is defined as 32bit unsigned value and read from
the sysfs. Firstly read the base value while application start,
then fetch the new value while do query and minus the base value.
@@ -17,7 +19,6 @@
return the 64bit counter value.
Fixes: ce9494d76c47 ("net/mlx5: report imissed statistics")
-Cc: stable at dpdk.org
Signed-off-by: Jiawei Wang <jiaweiw at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
@@ -27,10 +28,10 @@
2 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
-index ca6a802211..563d6ab3c0 100644
+index de80f62cc0..048bc66052 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
-@@ -112,12 +112,15 @@ struct mlx5_xstats_ctrl {
+@@ -148,12 +148,15 @@ struct mlx5_xstats_ctrl {
/* Index in the device counters table. */
uint16_t dev_table_idx[MLX5_MAX_XSTATS];
uint64_t base[MLX5_MAX_XSTATS];
@@ -45,12 +46,12 @@
+ uint64_t imissed;
};
- /* Flow list . */
+ /* devX creation object */
diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
-index 7603502967..5bc6fa6aa1 100644
+index 205e4fec78..d60a633e15 100644
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
-@@ -139,7 +139,7 @@ static const struct mlx5_counter_ctrl mlx5_counters_init[] = {
+@@ -136,7 +136,7 @@ static const struct mlx5_counter_ctrl mlx5_counters_init[] = {
static const unsigned int xstats_n = RTE_DIM(mlx5_counters_init);
@@ -59,7 +60,7 @@
mlx5_read_ib_stat(struct mlx5_priv *priv, const char *ctr_name, uint64_t *stat)
{
FILE *file;
-@@ -155,10 +155,11 @@ mlx5_read_ib_stat(struct mlx5_priv *priv, const char *ctr_name, uint64_t *stat)
+@@ -152,10 +152,11 @@ mlx5_read_ib_stat(struct mlx5_priv *priv, const char *ctr_name, uint64_t *stat)
fclose(file);
if (n == 1)
@@ -72,7 +73,7 @@
}
/**
-@@ -197,8 +198,14 @@ mlx5_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)
+@@ -194,8 +195,14 @@ mlx5_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats)
}
for (i = 0; i != xstats_ctrl->mlx5_stats_n; ++i) {
if (xstats_ctrl->info[i].ib) {
@@ -89,15 +90,15 @@
} else {
stats[i] = (uint64_t)
et_stats->data[xstats_ctrl->dev_table_idx[i]];
-@@ -304,6 +311,7 @@ mlx5_stats_init(struct rte_eth_dev *dev)
+@@ -301,6 +308,7 @@ mlx5_stats_init(struct rte_eth_dev *dev)
unsigned int idx = xstats_ctrl->mlx5_stats_n++;
xstats_ctrl->info[idx] = mlx5_counters_init[i];
+ xstats_ctrl->hw_stats[idx] = 0;
}
}
- MLX5_ASSERT(xstats_ctrl->mlx5_stats_n <= MLX5_MAX_XSTATS);
-@@ -314,6 +322,7 @@ mlx5_stats_init(struct rte_eth_dev *dev)
+ assert(xstats_ctrl->mlx5_stats_n <= MLX5_MAX_XSTATS);
+@@ -311,6 +319,7 @@ mlx5_stats_init(struct rte_eth_dev *dev)
DRV_LOG(ERR, "port %u cannot read device counters: %s",
dev->data->port_id, strerror(rte_errno));
mlx5_read_ib_stat(priv, "out_of_buffer", &stats_ctrl->imissed_base);
@@ -105,7 +106,7 @@
free:
rte_free(strings);
}
-@@ -356,7 +365,23 @@ mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
+@@ -353,7 +362,23 @@ mlx5_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *stats,
return ret;
for (i = 0; i != mlx5_stats_n; ++i) {
stats[i].id = i;
@@ -130,7 +131,7 @@
}
}
return mlx5_stats_n;
-@@ -378,9 +403,12 @@ int
+@@ -375,9 +400,12 @@ int
mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
struct mlx5_priv *priv = dev->data->dev_private;
@@ -143,7 +144,7 @@
memset(&tmp, 0, sizeof(tmp));
/* Add software counters. */
-@@ -423,8 +451,18 @@ mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
+@@ -420,8 +448,18 @@ mlx5_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
#endif
tmp.oerrors += txq->stats.oerrors;
}
@@ -164,7 +165,7 @@
#ifndef MLX5_PMD_SOFT_COUNTERS
/* FIXME: retrieve and add hardware counters. */
#endif
-@@ -461,6 +499,7 @@ mlx5_stats_reset(struct rte_eth_dev *dev)
+@@ -458,6 +496,7 @@ mlx5_stats_reset(struct rte_eth_dev *dev)
sizeof(struct mlx5_txq_stats));
}
mlx5_read_ib_stat(priv, "out_of_buffer", &stats_ctrl->imissed_base);
@@ -172,7 +173,7 @@
#ifndef MLX5_PMD_SOFT_COUNTERS
/* FIXME: reset hardware counters. */
#endif
-@@ -503,8 +542,10 @@ mlx5_xstats_reset(struct rte_eth_dev *dev)
+@@ -500,8 +539,10 @@ mlx5_xstats_reset(struct rte_eth_dev *dev)
dev->data->port_id, strerror(rte_errno));
return ret;
}
More information about the stable
mailing list