virtio: add support for 64 bit features.

Change u32 to u64, and use BIT_ULL and 1ULL everywhere.

Note: transports are unchanged, and only set low 32 bit.
This guarantees that no transport sets e.g. VERSION_1
by mistake without proper support.

Based on patch by Rusty.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>

diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c
index 97aeb7dce5fcc0e7fa633ba7f2e364f4a4b9187d..d81170a78a8dcd54a32200c90e79d45827522174 100644 (file)
--- a/drivers/lguest/lguest_device.c
+++ b/drivers/lguest/lguest_device.c
@@ -94,7 +94,7 @@ static unsigned desc_size(const struct lguest_device_desc *desc)
 }
 
 /* This gets the device's feature bits. */
-static u32 lg_get_features(struct virtio_device *vdev)
+static u64 lg_get_features(struct virtio_device *vdev)
 {
        unsigned int i;
        u32 features = 0;

diff --git a/drivers/misc/mic/card/mic_virtio.c b/drivers/misc/mic/card/mic_virtio.c
index d5da9ff646cb73ad7d064f892dcb54cdb44ea0c1..f5e756132bdbfd5c38bc9b036fee0f87685529d9 100644 (file)
--- a/drivers/misc/mic/card/mic_virtio.c
+++ b/drivers/misc/mic/card/mic_virtio.c
@@ -68,7 +68,7 @@ static inline struct device *mic_dev(struct mic_vdev *mvdev)
 }
 
 /* This gets the device's feature bits. */
-static u32 mic_get_features(struct virtio_device *vdev)
+static u64 mic_get_features(struct virtio_device *vdev)
 {
        unsigned int i, bits;
        u32 features = 0;

diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index dafaf38dac0a2c959a5b58b03dc58cb8f7451a8f..62897db1331e04e73c84764f608f7ebec95f1034 100644 (file)
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -207,7 +207,7 @@ static void rproc_virtio_reset(struct virtio_device *vdev)
 }
 
 /* provide the vdev features as retrieved from the firmware */
-static u32 rproc_virtio_get_features(struct virtio_device *vdev)
+static u64 rproc_virtio_get_features(struct virtio_device *vdev)
 {
        struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
        struct fw_rsc_vdev *rsc;

diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index fcd312d0c0184b0cd35074021d3f39b186fa3360..2336c7e3b0cf422a3e26d3f44c2a5fe21a654304 100644 (file)
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -80,7 +80,7 @@ static unsigned desc_size(const struct kvm_device_desc *desc)
 }
 
 /* This gets the device's feature bits. */
-static u32 kvm_get_features(struct virtio_device *vdev)
+static u64 kvm_get_features(struct virtio_device *vdev)
 {
        unsigned int i;
        u32 features = 0;

diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c
index 1dbee95838fe3965b228b7907a86e9ee36a2755c..56d78956a8cbf40ec0d29c3b259450c52e8e1e06 100644 (file)
--- a/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@ -660,7 +660,7 @@ static void virtio_ccw_reset(struct virtio_device *vdev)
        kfree(ccw);
 }
 
-static u32 virtio_ccw_get_features(struct virtio_device *vdev)
+static u64 virtio_ccw_get_features(struct virtio_device *vdev)
 {
        struct virtio_ccw_device *vcdev = to_vc_device(vdev);
        struct virtio_feature_desc *features;

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 2b9aafb4d6792d4f676b752e4aa0031cc6ec8674..746d350c8062fcca9606046a55f2619e27e69cc2 100644 (file)
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -159,7 +159,7 @@ static int virtio_dev_probe(struct device *_d)
        int err, i;
        struct virtio_device *dev = dev_to_virtio(_d);
        struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);
-       u32 device_features;
+       u64 device_features;
 
        /* We have a driver! */
        add_status(dev, VIRTIO_CONFIG_S_DRIVER);
@@ -171,14 +171,14 @@ static int virtio_dev_probe(struct device *_d)
        dev->features = 0;
        for (i = 0; i < drv->feature_table_size; i++) {
                unsigned int f = drv->feature_table[i];
-               BUG_ON(f >= 32);
-               if (device_features & (1 << f))
+               BUG_ON(f >= 64);
+               if (device_features & (1ULL << f))
                        __virtio_set_bit(dev, f);
        }
 
        /* Transport features always preserved to pass to finalize_features. */
        for (i = VIRTIO_TRANSPORT_F_START; i < VIRTIO_TRANSPORT_F_END; i++)
-               if (device_features & (1 << i))
+               if (device_features & (1ULL << i))
                        __virtio_set_bit(dev, i);
 
        dev->config->finalize_features(dev);

diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index eb5b0e2b434ad61612274deb2f096c1d32387d0e..c63d0efa947b8fb63e740f4cf92ff7facc5b032a 100644 (file)
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -142,7 +142,7 @@ struct virtio_mmio_vq_info {
 
 /* Configuration interface */
 
-static u32 vm_get_features(struct virtio_device *vdev)
+static u64 vm_get_features(struct virtio_device *vdev)
 {
        struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
 

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 4e112c1584889cf282630c4e4ffac43028b0cf2b..7e0efa7fc384bf1fe883ffd939c4534e607e1580 100644 (file)
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -102,7 +102,7 @@ static struct virtio_pci_device *to_vp_device(struct virtio_device *vdev)
 }
 
 /* virtio config->get_features() implementation */
-static u32 vp_get_features(struct virtio_device *vdev)
+static u64 vp_get_features(struct virtio_device *vdev)
 {
        struct virtio_pci_device *vp_dev = to_vp_device(vdev);
 

diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 7828a7f47c2c55573cb8cfe4e91466c60412ee41..149284e5196d24852fdeab261181dce2a3109e03 100644 (file)
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -101,7 +101,7 @@ struct virtio_device {
        const struct virtio_config_ops *config;
        const struct vringh_config_ops *vringh_config;
        struct list_head vqs;
-       u32 features;
+       u64 features;
        void *priv;
 };
 

diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index ffc2ae04879cd626a4021051b95aeff2563dd9d3..f51788439574b70cf33d00fa1186ed42ef683766 100644 (file)
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -66,7 +66,7 @@ struct virtio_config_ops {
                        vq_callback_t *callbacks[],
                        const char *names[]);
        void (*del_vqs)(struct virtio_device *);
-       u32 (*get_features)(struct virtio_device *vdev);
+       u64 (*get_features)(struct virtio_device *vdev);
        void (*finalize_features)(struct virtio_device *vdev);
        const char *(*bus_name)(struct virtio_device *vdev);
        int (*set_vq_affinity)(struct virtqueue *vq, int cpu);
@@ -88,11 +88,11 @@ static inline bool __virtio_test_bit(const struct virtio_device *vdev,
 {
        /* Did you forget to fix assumptions on max features? */
        if (__builtin_constant_p(fbit))
-               BUILD_BUG_ON(fbit >= 32);
+               BUILD_BUG_ON(fbit >= 64);
        else
-               BUG_ON(fbit >= 32);
+               BUG_ON(fbit >= 64);
 
-       return vdev->features & BIT(fbit);
+       return vdev->features & BIT_ULL(fbit);
 }
 
 /**
@@ -105,11 +105,11 @@ static inline void __virtio_set_bit(struct virtio_device *vdev,
 {
        /* Did you forget to fix assumptions on max features? */
        if (__builtin_constant_p(fbit))
-               BUILD_BUG_ON(fbit >= 32);
+               BUILD_BUG_ON(fbit >= 64);
        else
-               BUG_ON(fbit >= 32);
+               BUG_ON(fbit >= 64);
 
-       vdev->features |= BIT(fbit);
+       vdev->features |= BIT_ULL(fbit);
 }
 
 /**
@@ -122,11 +122,11 @@ static inline void __virtio_clear_bit(struct virtio_device *vdev,
 {
        /* Did you forget to fix assumptions on max features? */
        if (__builtin_constant_p(fbit))
-               BUILD_BUG_ON(fbit >= 32);
+               BUILD_BUG_ON(fbit >= 64);
        else
-               BUG_ON(fbit >= 32);
+               BUG_ON(fbit >= 64);
 
-       vdev->features &= ~BIT(fbit);
+       vdev->features &= ~BIT_ULL(fbit);
 }
 
 /**

diff --git a/tools/virtio/linux/virtio.h b/tools/virtio/linux/virtio.h
index 72bff70bfeeb4fa5283026d293dbe358ff7660f4..8eb6421761cd5cc7592d0ed6c6dd8b3f511805d5 100644 (file)
--- a/tools/virtio/linux/virtio.h
+++ b/tools/virtio/linux/virtio.h
@@ -10,7 +10,7 @@
 
 struct virtio_device {
        void *dev;
-       u32 features;
+       u64 features;
 };
 
 struct virtqueue {