> On Sep 13, 2018, at 11:33 PM, Xueming Li <xuemi...@mellanox.com> wrote:
>
> This patch fixes the issue that representor port shows xstats of PF.
>
> Fixes: 5a4b8e2612c5 ("net/mlx5: probe all port representors")
Wrong commit SHA.
> Signed-off-by: Xueming Li <xuemi...@mellanox.com>
> ---
> drivers/net/mlx5/mlx5_stats.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
> index 91f3d47..ed5b51b 100644
> --- a/drivers/net/mlx5/mlx5_stats.c
> +++ b/drivers/net/mlx5/mlx5_stats.c
> @@ -146,7 +146,7 @@ struct mlx5_counter_ctrl {
> et_stats->cmd = ETHTOOL_GSTATS;
> et_stats->n_stats = xstats_ctrl->stats_n;
> ifr.ifr_data = (caddr_t)et_stats;
> - ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr, 1);
> + ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr, 0);
> if (ret) {
> DRV_LOG(WARNING,
> "port %u unable to read statistic values from device",
> @@ -194,7 +194,7 @@ struct mlx5_counter_ctrl {
>
> drvinfo.cmd = ETHTOOL_GDRVINFO;
> ifr.ifr_data = (caddr_t)&drvinfo;
> - ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr, 1);
> + ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr, 0);
> if (ret) {
> DRV_LOG(WARNING, "port %u unable to query number of statistics",
> dev->data->port_id);
> @@ -229,7 +229,6 @@ struct mlx5_counter_ctrl {
> return;
> }
> dev_stats_n = ret;
> - xstats_ctrl->stats_n = dev_stats_n;
> /* Allocate memory to grab stat names and values. */
> str_sz = dev_stats_n * ETH_GSTRING_LEN;
> strings = (struct ethtool_gstrings *)
> @@ -244,7 +243,7 @@ struct mlx5_counter_ctrl {
> strings->string_set = ETH_SS_STATS;
> strings->len = dev_stats_n;
> ifr.ifr_data = (caddr_t)strings;
> - ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr, 1);
> + ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr, 0);
> if (ret) {
> DRV_LOG(WARNING, "port %u unable to get statistic names",
> dev->data->port_id);
> @@ -275,6 +274,7 @@ struct mlx5_counter_ctrl {
> goto free;
> }
> }
> + xstats_ctrl->stats_n = dev_stats_n;
Any reason to move it?
If it is done to group the code, I'm fine with that.
Thanks,
Yongseok
> /* Copy to base at first time. */
> assert(xstats_n <= MLX5_MAX_XSTATS);
> ret = mlx5_read_dev_counters(dev, xstats_ctrl->base);
> @@ -307,6 +307,8 @@ struct mlx5_counter_ctrl {
> unsigned int i;
> uint64_t counters[n];
>
> + if (!priv->xstats_ctrl.stats_n)
> + return 0;
> if (n >= xstats_n && stats) {
> struct mlx5_xstats_ctrl *xstats_ctrl = &priv->xstats_ctrl;
> int stats_n;
> @@ -480,8 +482,11 @@ struct mlx5_counter_ctrl {
> mlx5_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
> struct rte_eth_xstat_name *xstats_names, unsigned int n)
> {
> + struct priv *priv = dev->data->dev_private;
> unsigned int i;
>
> + if (!priv->xstats_ctrl.stats_n)
> + return 0;
> if (n >= xstats_n && xstats_names) {
> for (i = 0; i != xstats_n; ++i) {
> strncpy(xstats_names[i].name,
> --
> 1.8.3.1
>
