vdpa/mlx5: Add support for modifying the VQ features field

This is done in preparation for the pre-creation of hardware virtqueues
at device add time.

Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com>
Reviewed-by: Cosmin Ratiu <cratiu@nvidia.com>
Message-Id: <20240626-stage-vdpa-vq-precreate-v2-11-560c491078df@nvidia.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index b104849f8477550533b22843aa1a1616f6dbb5c5..db86e541b788f1720eb04a8876912f4afbddb773 100644 (file)
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -1287,6 +1287,15 @@ static int modify_virtqueue(struct mlx5_vdpa_net *ndev,
                MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0,
                        !!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_F_VERSION_1)));
 
+       if (mvq->modified_fields & MLX5_VIRTQ_MODIFY_MASK_QUEUE_FEATURES) {
+               u16 mlx_features = get_features(ndev->mvdev.actual_features);
+
+               MLX5_SET(virtio_net_q_object, obj_context, queue_feature_bit_mask_12_3,
+                        mlx_features >> 3);
+               MLX5_SET(virtio_net_q_object, obj_context, queue_feature_bit_mask_2_0,
+                        mlx_features & 7);
+       }
+
        if (mvq->modified_fields & MLX5_VIRTQ_MODIFY_MASK_VIRTIO_Q_MKEY) {
                vq_mr = mvdev->mr[mvdev->group2asid[MLX5_VDPA_DATAVQ_GROUP]];
 
@@ -2734,7 +2743,8 @@ static int mlx5_vdpa_set_driver_features(struct vdpa_device *vdev, u64 features)
                        struct mlx5_vdpa_virtqueue *mvq = &ndev->vqs[i];
 
                        mvq->modified_fields |= (
-                               MLX5_VIRTQ_MODIFY_MASK_QUEUE_VIRTIO_VERSION
+                               MLX5_VIRTQ_MODIFY_MASK_QUEUE_VIRTIO_VERSION |
+                               MLX5_VIRTQ_MODIFY_MASK_QUEUE_FEATURES
                        );
                }
        }

diff --git a/include/linux/mlx5/mlx5_ifc_vdpa.h b/include/linux/mlx5/mlx5_ifc_vdpa.h
index 34f27c01cec941842a0ad0e9589c1dd99a24e105..58dfa2ee7c8350a4ad8d7860925bccc20ade77b7 100644 (file)
--- a/include/linux/mlx5/mlx5_ifc_vdpa.h
+++ b/include/linux/mlx5/mlx5_ifc_vdpa.h
@@ -150,6 +150,7 @@ enum {
        MLX5_VIRTQ_MODIFY_MASK_VIRTIO_Q_USED_IDX        = (u64)1 << 8,
        MLX5_VIRTQ_MODIFY_MASK_QUEUE_VIRTIO_VERSION     = (u64)1 << 10,
        MLX5_VIRTQ_MODIFY_MASK_VIRTIO_Q_MKEY            = (u64)1 << 11,
+       MLX5_VIRTQ_MODIFY_MASK_QUEUE_FEATURES           = (u64)1 << 12,
        MLX5_VIRTQ_MODIFY_MASK_DESC_GROUP_MKEY          = (u64)1 << 14,
 };