From: Matan Azrad Date: Mon, 27 Jul 2020 08:07:59 +0000 (+0000) Subject: vdpa/mlx5: fix steering update in virtq unset X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=d2a58c24029ccd35f56701e774c94060904bc774 vdpa/mlx5: fix steering update in virtq unset When a virtq is destroyed by the driver, it must be removed from the steering RQT which holds its reference. The driver didn't remove the virtq from RQT before destroying it what caused HW syndrome in virtq unset. Remove the virtq from RQT before destroying it. Fixes: 9f09b1ca15c5 ("vdpa/mlx5: recreate a virtq becoming enabled") Cc: stable@dpdk.org Signed-off-by: Xueming Li Signed-off-by: Matan Azrad Reviewed-by: Maxime Coquelin --- diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c index 3e6126492b..19554f654c 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c @@ -482,6 +482,13 @@ mlx5_vdpa_virtq_enable(struct mlx5_vdpa_priv *priv, int index, int enable) DRV_LOG(INFO, "Virtq %d was modified, recreate it.", index); } if (virtq->virtq) { + virtq->enable = 0; + if (is_virtq_recvq(virtq->index, priv->nr_virtqs)) { + ret = mlx5_vdpa_steer_update(priv); + if (ret) + DRV_LOG(WARNING, "Failed to disable steering " + "for virtq %d.", index); + } ret = mlx5_vdpa_virtq_stop(priv, index); if (ret) DRV_LOG(WARNING, "Failed to stop virtq %d.", index); @@ -493,14 +500,12 @@ mlx5_vdpa_virtq_enable(struct mlx5_vdpa_priv *priv, int index, int enable) DRV_LOG(ERR, "Failed to setup virtq %d.", index); return ret; } - } - virtq->enable = !!enable; - if (is_virtq_recvq(virtq->index, priv->nr_virtqs)) { - /* Need to add received virtq to the RQT table of the TIRs. */ - ret = mlx5_vdpa_steer_update(priv); - if (ret) { - virtq->enable = !enable; - return ret; + virtq->enable = 1; + if (is_virtq_recvq(virtq->index, priv->nr_virtqs)) { + ret = mlx5_vdpa_steer_update(priv); + if (ret) + DRV_LOG(WARNING, "Failed to enable steering " + "for virtq %d.", index); } } return 0;