virtio: hand virtio ring alignment as argument to vring_new_virtqueue

This allows each virtio user to hand in the alignment appropriate to
their virtio_ring structures.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>

5 files changed, 9 insertions, 6 deletions

diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c
index f062dc55c573..b02f6bcb64c4 100644
--- a/drivers/lguest/lguest_device.c
+++ b/drivers/lguest/lguest_device.c
@@ -259,8 +259,8 @@ static struct virtqueue *lg_find_vq(struct virtio_device *vdev,
 
         /* OK, tell virtio_ring.c to set up a virtqueue now we know its size
          * and we've got a pointer to its pages. */
-        vq = vring_new_virtqueue(lvq->config.num, vdev, lvq->pages,
-                                 lg_notify, callback);
+        vq = vring_new_virtqueue(lvq->config.num, LGUEST_VRING_ALIGN,
+                                 vdev, lvq->pages, lg_notify, callback);
         if (!vq) {
                 err = -ENOMEM;
                 goto unmap;
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index f5a2dbe75575..4e8354aa8576 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -193,7 +193,8 @@ static struct virtqueue *kvm_find_vq(struct virtio_device *vdev,
         if (err)
                 goto out;
 
-        vq = vring_new_virtqueue(config->num, vdev, (void *) config->address,
+        vq = vring_new_virtqueue(config->num, KVM_S390_VIRTIO_RING_ALIGN,
+                                 vdev, (void *) config->address,
                                  kvm_notify, callback);
         if (!vq) {
                 err = -ENOMEM;
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index f28643f3a4e8..7462a51e820b 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -249,8 +249,8 @@ static struct virtqueue *vp_find_vq(struct virtio_device *vdev, unsigned index,
                   vp_dev->ioaddr + VIRTIO_PCI_QUEUE_PFN);
 
         /* create the vring */
-        vq = vring_new_virtqueue(info->num, vdev, info->queue,
-                                 vp_notify, callback);
+        vq = vring_new_virtqueue(info->num, VIRTIO_PCI_VRING_ALIGN,
+                                 vdev, info->queue, vp_notify, callback);
         if (!vq) {
                 err = -ENOMEM;
                 goto out_activate_queue;
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 6eb5303fed11..5777196bf6c9 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -274,6 +274,7 @@ static struct virtqueue_ops vring_vq_ops = {
 };
 
 struct virtqueue *vring_new_virtqueue(unsigned int num,
+                                      unsigned int vring_align,
                                       struct virtio_device *vdev,
                                       void *pages,
                                       void (*notify)(struct virtqueue *),
@@ -292,7 +293,7 @@ struct virtqueue *vring_new_virtqueue(unsigned int num,
         if (!vq)
                 return NULL;
 
-        vring_init(&vq->vring, num, pages, PAGE_SIZE);
+        vring_init(&vq->vring, num, pages, vring_align);
         vq->vq.callback = callback;
         vq->vq.vdev = vdev;
         vq->vq.vq_ops = &vring_vq_ops;
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h
index 01bf3124e312..71e03722fb59 100644
--- a/include/linux/virtio_ring.h
+++ b/include/linux/virtio_ring.h
@@ -115,6 +115,7 @@ struct virtio_device;
 struct virtqueue;
 
 struct virtqueue *vring_new_virtqueue(unsigned int num,
+                                      unsigned int vring_align,
                                       struct virtio_device *vdev,
                                       void *pages,
                                       void (*notify)(struct virtqueue *vq),