virtio-pci: Initialize the supported admin commands

Initialize the supported admin commands upon activating the admin queue.

The supported commands are saved as part of the admin queue context.

Next patches in this series will expose APIs to use them.

Reviewed-by: Feng Liu <feliu@nvidia.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Yishai Hadas <yishaih@nvidia.com>
Link: https://lore.kernel.org/r/20231219093247.170936-6-yishaih@nvidia.com
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig
index 0a53a61231c2944092d3ecac74d5caf40aaca2d3..c17193544268aa7cf0af5a3de5addcad2ec91e39 100644 (file)
--- a/drivers/virtio/Kconfig
+++ b/drivers/virtio/Kconfig
@@ -60,6 +60,11 @@ config VIRTIO_PCI
 
          If unsure, say M.
 
+config VIRTIO_PCI_ADMIN_LEGACY
+       bool
+       depends on VIRTIO_PCI && (X86 || COMPILE_TEST)
+       default y
+
 config VIRTIO_PCI_LEGACY
        bool "Support for legacy virtio draft 0.9.X and older devices"
        default y

diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h
index 282d087a9266720f9be6902f10afc3cb5a4e9fa0..a39bffd5fd4623a33d3748bc1c84ab2c6679ea44 100644 (file)
--- a/drivers/virtio/virtio_pci_common.h
+++ b/drivers/virtio/virtio_pci_common.h
@@ -47,6 +47,7 @@ struct virtio_pci_admin_vq {
        struct virtio_pci_vq_info info;
        /* serializing admin commands execution and virtqueue deletion */
        struct mutex cmd_lock;
+       u64 supported_cmds;
        /* Name of the admin queue: avq.$vq_index. */
        char name[10];
        u16 vq_index;
@@ -155,6 +156,24 @@ static inline void virtio_pci_legacy_remove(struct virtio_pci_device *vp_dev)
 int virtio_pci_modern_probe(struct virtio_pci_device *);
 void virtio_pci_modern_remove(struct virtio_pci_device *);
 
+#define VIRTIO_LEGACY_ADMIN_CMD_BITMAP \
+       (BIT_ULL(VIRTIO_ADMIN_CMD_LEGACY_COMMON_CFG_WRITE) | \
+        BIT_ULL(VIRTIO_ADMIN_CMD_LEGACY_COMMON_CFG_READ) | \
+        BIT_ULL(VIRTIO_ADMIN_CMD_LEGACY_DEV_CFG_WRITE) | \
+        BIT_ULL(VIRTIO_ADMIN_CMD_LEGACY_DEV_CFG_READ) | \
+        BIT_ULL(VIRTIO_ADMIN_CMD_LEGACY_NOTIFY_INFO))
+
+/* Unlike modern drivers which support hardware virtio devices, legacy drivers
+ * assume software-based devices: e.g. they don't use proper memory barriers
+ * on ARM, use big endian on PPC, etc. X86 drivers are mostly ok though, more
+ * or less by chance. For now, only support legacy IO on X86.
+ */
+#ifdef CONFIG_VIRTIO_PCI_ADMIN_LEGACY
+#define VIRTIO_ADMIN_CMD_BITMAP VIRTIO_LEGACY_ADMIN_CMD_BITMAP
+#else
+#define VIRTIO_ADMIN_CMD_BITMAP 0
+#endif
+
 int vp_modern_admin_cmd_exec(struct virtio_device *vdev,
                             struct virtio_admin_cmd *cmd);
 

diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 9bd66300a80aacf3d2f33d3f09db22f42a9960c3..f62b530aa3b5b0e6d555ffef8e39c7bd5fda63a5 100644 (file)
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -39,6 +39,7 @@ static bool vp_is_avq(struct virtio_device *vdev, unsigned int index)
 }
 
 static int virtqueue_exec_admin_cmd(struct virtio_pci_admin_vq *admin_vq,
+                                   u16 opcode,
                                    struct scatterlist **sgs,
                                    unsigned int out_num,
                                    unsigned int in_num,
@@ -51,6 +52,11 @@ static int virtqueue_exec_admin_cmd(struct virtio_pci_admin_vq *admin_vq,
        if (!vq)
                return -EIO;
 
+       if (opcode != VIRTIO_ADMIN_CMD_LIST_QUERY &&
+           opcode != VIRTIO_ADMIN_CMD_LIST_USE &&
+           !((1ULL << opcode) & admin_vq->supported_cmds))
+               return -EOPNOTSUPP;
+
        ret = virtqueue_add_sgs(vq, sgs, out_num, in_num, data, GFP_KERNEL);
        if (ret < 0)
                return -EIO;
@@ -117,8 +123,9 @@ int vp_modern_admin_cmd_exec(struct virtio_device *vdev,
        }
 
        mutex_lock(&vp_dev->admin_vq.cmd_lock);
-       ret = virtqueue_exec_admin_cmd(&vp_dev->admin_vq, sgs,
-                                      out_num, in_num, sgs);
+       ret = virtqueue_exec_admin_cmd(&vp_dev->admin_vq,
+                                      le16_to_cpu(cmd->opcode),
+                                      sgs, out_num, in_num, sgs);
        mutex_unlock(&vp_dev->admin_vq.cmd_lock);
 
        if (ret) {
@@ -142,6 +149,43 @@ err_alloc:
        return ret;
 }
 
+static void virtio_pci_admin_cmd_list_init(struct virtio_device *virtio_dev)
+{
+       struct virtio_pci_device *vp_dev = to_vp_device(virtio_dev);
+       struct virtio_admin_cmd cmd = {};
+       struct scatterlist result_sg;
+       struct scatterlist data_sg;
+       __le64 *data;
+       int ret;
+
+       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       if (!data)
+               return;
+
+       sg_init_one(&result_sg, data, sizeof(*data));
+       cmd.opcode = cpu_to_le16(VIRTIO_ADMIN_CMD_LIST_QUERY);
+       cmd.group_type = cpu_to_le16(VIRTIO_ADMIN_GROUP_TYPE_SRIOV);
+       cmd.result_sg = &result_sg;
+
+       ret = vp_modern_admin_cmd_exec(virtio_dev, &cmd);
+       if (ret)
+               goto end;
+
+       *data &= cpu_to_le64(VIRTIO_ADMIN_CMD_BITMAP);
+       sg_init_one(&data_sg, data, sizeof(*data));
+       cmd.opcode = cpu_to_le16(VIRTIO_ADMIN_CMD_LIST_USE);
+       cmd.data_sg = &data_sg;
+       cmd.result_sg = NULL;
+
+       ret = vp_modern_admin_cmd_exec(virtio_dev, &cmd);
+       if (ret)
+               goto end;
+
+       vp_dev->admin_vq.supported_cmds = le64_to_cpu(*data);
+end:
+       kfree(data);
+}
+
 static void vp_modern_avq_activate(struct virtio_device *vdev)
 {
        struct virtio_pci_device *vp_dev = to_vp_device(vdev);
@@ -151,6 +195,7 @@ static void vp_modern_avq_activate(struct virtio_device *vdev)
                return;
 
        __virtqueue_unbreak(admin_vq->info.vq);
+       virtio_pci_admin_cmd_list_init(vdev);
 }
 
 static void vp_modern_avq_deactivate(struct virtio_device *vdev)