vDPA: report virtio-block MQ info to user space

This commits allows vDPA reporting virtio-block multi-queue
configuration to user sapce.

Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
Message-Id: <20240218185606.13509-6-lingshan.zhu@intel.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
index 3e3c84b..4c348da 100644 (file)
--- a/drivers/vdpa/vdpa.c
+++ b/drivers/vdpa/vdpa.c
@@ -999,6 +999,19 @@ vdpa_dev_blk_seg_max_config_fill(struct sk_buff *msg, u64 features,
        return nla_put_u32(msg, VDPA_ATTR_DEV_BLK_CFG_SEG_MAX, val_u32);
 }
 
+static int vdpa_dev_blk_mq_config_fill(struct sk_buff *msg, u64 features,
+                                      const struct virtio_blk_config *config)
+{
+       u16 val_u16;
+
+       if ((features & BIT_ULL(VIRTIO_BLK_F_MQ)) == 0)
+               return 0;
+
+       val_u16 = __virtio16_to_cpu(true, config->num_queues);
+
+       return nla_put_u16(msg, VDPA_ATTR_DEV_BLK_CFG_NUM_QUEUES, val_u16);
+}
+
 static int vdpa_dev_blk_config_fill(struct vdpa_device *vdev,
                                    struct sk_buff *msg)
 {
@@ -1025,6 +1038,9 @@ static int vdpa_dev_blk_config_fill(struct vdpa_device *vdev,
        if (vdpa_dev_blk_seg_max_config_fill(msg, features_device, &config))
                return -EMSGSIZE;
 
+       if (vdpa_dev_blk_mq_config_fill(msg, features_device, &config))
+               return -EMSGSIZE;
+
        return 0;
 }
 

diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h
index 2dc92fc..3c8e3c8 100644 (file)
--- a/include/uapi/linux/vdpa.h
+++ b/include/uapi/linux/vdpa.h
@@ -60,6 +60,7 @@ enum vdpa_attr {
        VDPA_ATTR_DEV_BLK_CFG_SEG_SIZE,         /* u32 */
        VDPA_ATTR_DEV_BLK_CFG_BLK_SIZE,         /* u32 */
        VDPA_ATTR_DEV_BLK_CFG_SEG_MAX,          /* u32 */
+       VDPA_ATTR_DEV_BLK_CFG_NUM_QUEUES,       /* u16 */
 
        /* new attributes must be added above here */
        VDPA_ATTR_MAX,