From: Eli Cohen <elic@nvidia.com>
Date: Wed, 5 Jan 2022 13:46:41 +0200
Subject: vdpa/mlx5: Restore cur_num_vqs in case of failure in change_num_qps()
Patch-mainline: v5.17-rc1
Git-commit: 37e07e705888e4c3502f204e9c6785c9c2d6d86a
References: jsc#PED-1549
Restore ndev->cur_num_vqs to the original value in case change_num_qps()
fails.
Fixes: 52893733f2c5 ("vdpa/mlx5: Add multiqueue support")
Reviewed-by: Si-Wei Liu<si-wei.liu@oracle.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Eli Cohen <elic@nvidia.com>
Link: https://lore.kernel.org/r/20220105114646.577224-10-elic@nvidia.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -1541,9 +1541,11 @@ static int change_num_qps(struct mlx5_vd
return 0;
clean_added:
- for (--i; i >= cur_qps; --i)
+ for (--i; i >= 2 * cur_qps; --i)
teardown_vq(ndev, &ndev->vqs[i]);
+ ndev->cur_num_vqs = 2 * cur_qps;
+
return err;
}