vdpa/mlx5: Fix umem sizes assignments on VQ create

[ Upstream commit e3011776af16caf423f2c36d0047acd624c274fa ]

Fix copy paste bug assigning umem1 size to umem2 and umem3. The issue
was discovered when trying to use a 1:1 MR that covers the entire
address space where firmware complained that provided sizes are not
large enough. 1:1 MRs are required to support virtio_vdpa.

Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices")
Signed-off-by: Eli Cohen <elic@nvidia.com>
Link: https://lore.kernel.org/r/20210530090317.8284-1-elic@nvidia.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index 8af30d0..ef76cfe 100644 (file)
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -814,9 +814,9 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtque
        MLX5_SET(virtio_q, vq_ctx, umem_1_id, mvq->umem1.id);
        MLX5_SET(virtio_q, vq_ctx, umem_1_size, mvq->umem1.size);
        MLX5_SET(virtio_q, vq_ctx, umem_2_id, mvq->umem2.id);
-       MLX5_SET(virtio_q, vq_ctx, umem_2_size, mvq->umem1.size);
+       MLX5_SET(virtio_q, vq_ctx, umem_2_size, mvq->umem2.size);
        MLX5_SET(virtio_q, vq_ctx, umem_3_id, mvq->umem3.id);
-       MLX5_SET(virtio_q, vq_ctx, umem_3_size, mvq->umem1.size);
+       MLX5_SET(virtio_q, vq_ctx, umem_3_size, mvq->umem3.size);
        MLX5_SET(virtio_q, vq_ctx, pd, ndev->mvdev.res.pdn);
        if (MLX5_CAP_DEV_VDPA_EMULATION(ndev->mvdev.mdev, eth_frame_offload_type))
                MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0, 1);