net/mlx5e: Fix RX reporter for XSK RQs

RX reporter mistakenly reads from the regular (inactive) RQ
when XSK RQ is active. Fix it here.

Fixes: 3db4c85cde7a ("net/mlx5e: xsk: Use queue indices starting from 0 for XSK queues")
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Gal Pressman <gal@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
index 5f6f95ad6888c433ae333a9fb006fbf6f9393a3f..1ae15b8536a8576a793a1bc148f5f9377dcdda66 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -459,7 +459,11 @@ static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter,
                goto unlock;
 
        for (i = 0; i < priv->channels.num; i++) {
-               struct mlx5e_rq *rq = &priv->channels.c[i]->rq;
+               struct mlx5e_channel *c = priv->channels.c[i];
+               struct mlx5e_rq *rq;
+
+               rq = test_bit(MLX5E_CHANNEL_STATE_XSK, c->state) ?
+                       &c->xskrq : &c->rq;
 
                err = mlx5e_rx_reporter_build_diagnose_output(rq, fmsg);
                if (err)