Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Dragos Tatulea and committed by
Michael S. Tsirkin
cdc3c7ea f70080c5

+12 -1
+11 -1
drivers/vdpa/mlx5/net/mlx5_vnet.c
··· 1287 1287 MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0, 1288 1288 !!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_F_VERSION_1))); 1289 1289 1290 + if (mvq->modified_fields & MLX5_VIRTQ_MODIFY_MASK_QUEUE_FEATURES) { 1291 + u16 mlx_features = get_features(ndev->mvdev.actual_features); 1292 + 1293 + MLX5_SET(virtio_net_q_object, obj_context, queue_feature_bit_mask_12_3, 1294 + mlx_features >> 3); 1295 + MLX5_SET(virtio_net_q_object, obj_context, queue_feature_bit_mask_2_0, 1296 + mlx_features & 7); 1297 + } 1298 + 1290 1299 if (mvq->modified_fields & MLX5_VIRTQ_MODIFY_MASK_VIRTIO_Q_MKEY) { 1291 1300 vq_mr = mvdev->mr[mvdev->group2asid[MLX5_VDPA_DATAVQ_GROUP]]; 1292 1301 ··· 2743 2734 struct mlx5_vdpa_virtqueue *mvq = &ndev->vqs[i]; 2744 2735 2745 2736 mvq->modified_fields |= ( 2746 - MLX5_VIRTQ_MODIFY_MASK_QUEUE_VIRTIO_VERSION 2737 + MLX5_VIRTQ_MODIFY_MASK_QUEUE_VIRTIO_VERSION | 2738 + MLX5_VIRTQ_MODIFY_MASK_QUEUE_FEATURES 2747 2739 ); 2748 2740 } 2749 2741 }
+1
include/linux/mlx5/mlx5_ifc_vdpa.h
··· 150 150 MLX5_VIRTQ_MODIFY_MASK_VIRTIO_Q_USED_IDX = (u64)1 << 8, 151 151 MLX5_VIRTQ_MODIFY_MASK_QUEUE_VIRTIO_VERSION = (u64)1 << 10, 152 152 MLX5_VIRTQ_MODIFY_MASK_VIRTIO_Q_MKEY = (u64)1 << 11, 153 + MLX5_VIRTQ_MODIFY_MASK_QUEUE_FEATURES = (u64)1 << 12, 153 154 MLX5_VIRTQ_MODIFY_MASK_DESC_GROUP_MKEY = (u64)1 << 14, 154 155 }; 155 156