2021-05-30 09:05:12

by Eli Cohen

Subject: [PATCH v2] vdpa/mlx5: Fix umem sizes assignments on VQ create

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 <[email protected]>
---
V0 --> V1:
Add more information in changelog

V1 --> V2:
Fix typo in changelog

drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index 189e4385df40..53312f0460ad 100644
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -828,9 +828,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);
--
2.31.1

2021-05-31 08:00:55

by Jason Wang

Subject: Re: [PATCH v2] vdpa/mlx5: Fix umem sizes assignments on VQ create

?? 2021/5/30 ????5:03, Eli Cohen д??:
> 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 <[email protected]>
> ---
> V0 --> V1:
> Add more information in changelog
>
> V1 --> V2:
> Fix typo in changelog


Acked-by: Jason Wang <[email protected]>


>
> drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> index 189e4385df40..53312f0460ad 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -828,9 +828,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);