This is a note to let you know that I've just added the patch titled vdpa/mlx5: Fix wrong configuration of virtio_version_1_0 to the 5.16-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: vdpa-mlx5-fix-wrong-configuration-of-virtio_version_1_0.patch and it can be found in the queue-5.16 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 97143b70aa847f2b0a1f959dde126b76ff7b5376 Mon Sep 17 00:00:00 2001 From: Eli Cohen <elic@xxxxxxxxxx> Date: Thu, 30 Dec 2021 16:20:24 +0200 Subject: vdpa/mlx5: Fix wrong configuration of virtio_version_1_0 From: Eli Cohen <elic@xxxxxxxxxx> commit 97143b70aa847f2b0a1f959dde126b76ff7b5376 upstream. Remove overriding of virtio_version_1_0 which forced the virtqueue object to version 1. Fixes: 1a86b377aa21 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices") Signed-off-by: Eli Cohen <elic@xxxxxxxxxx> Link: https://lore.kernel.org/r/20211230142024.142979-1-elic@xxxxxxxxxx Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx> Reviewed-by: Parav Pandit <parav@xxxxxxxxxx> Acked-by: Jason Wang <jasowang@xxxxxxxxxx> Reviewed-by: Si-Wei Liu <si-wei.liu@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -876,8 +876,6 @@ static int create_virtqueue(struct mlx5_ MLX5_SET(virtio_q, vq_ctx, umem_3_id, mvq->umem3.id); 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); err = mlx5_cmd_exec(ndev->mvdev.mdev, in, inlen, out, sizeof(out)); if (err) Patches currently in stable-queue which might be from elic@xxxxxxxxxx are queue-5.16/vdpa-mlx5-fix-wrong-configuration-of-virtio_version_1_0.patch queue-5.16/vdpa-mlx5-fix-config_attr_mask-assignment.patch queue-5.16/vdpa-mlx5-restore-cur_num_vqs-in-case-of-failure-in-change_num_qps.patch queue-5.16/net-mlx5e-fix-matching-on-modified-inner-ip_ecn-bits.patch