4 files changed, 41 insertions, 20 deletions

diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index 5b78fd0aff0a..018c070a357f 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -176,7 +176,7 @@ int register_virtio_device(struct virtio_device *dev)
 
         /* Assign a unique device index and hence name. */
         dev->index = dev_index++;
-        sprintf(dev->dev.bus_id, "virtio%u", dev->index);
+        dev_set_name(&dev->dev, "virtio%u", dev->index);
 
         /* We always start by resetting the device, in case a previous
          * driver messed it up.  This also tests that code path a little. */
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 62eab43152d2..59268266b79a 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -56,6 +56,15 @@ static struct virtio_device_id id_table[] = {
         { 0 },
 };
 
+static u32 page_to_balloon_pfn(struct page *page)
+{
+        unsigned long pfn = page_to_pfn(page);
+
+        BUILD_BUG_ON(PAGE_SHIFT < VIRTIO_BALLOON_PFN_SHIFT);
+        /* Convert pfn from Linux page size to balloon page size. */
+        return pfn >> (PAGE_SHIFT - VIRTIO_BALLOON_PFN_SHIFT);
+}
+
 static void balloon_ack(struct virtqueue *vq)
 {
         struct virtio_balloon *vb;
@@ -99,7 +108,7 @@ static void fill_balloon(struct virtio_balloon *vb, size_t num)
                         msleep(200);
                         break;
                 }
-                vb->pfns[vb->num_pfns] = page_to_pfn(page);
+                vb->pfns[vb->num_pfns] = page_to_balloon_pfn(page);
                 totalram_pages--;
                 vb->num_pages++;
                 list_add(&page->lru, &vb->pages);
@@ -132,7 +141,7 @@ static void leak_balloon(struct virtio_balloon *vb, size_t num)
         for (vb->num_pfns = 0; vb->num_pfns < num; vb->num_pfns++) {
                 page = list_first_entry(&vb->pages, struct page, lru);
                 list_del(&page->lru);
-                vb->pfns[vb->num_pfns] = page_to_pfn(page);
+                vb->pfns[vb->num_pfns] = page_to_balloon_pfn(page);
                 vb->num_pages--;
         }
 
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index c7dc37c7cce9..265fdf2d1276 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -75,7 +75,7 @@ MODULE_DEVICE_TABLE(pci, virtio_pci_id_table);
  * would make more sense for virtio to not insist on having it's own device. */
 static struct device virtio_pci_root = {
         .parent         = NULL,
-        .bus_id         = "virtio-pci",
+        .init_name      = "virtio-pci",
 };
 
 /* Convert a generic virtio device to our structure */
@@ -216,7 +216,7 @@ static struct virtqueue *vp_find_vq(struct virtio_device *vdev, unsigned index,
         struct virtio_pci_device *vp_dev = to_vp_device(vdev);
         struct virtio_pci_vq_info *info;
         struct virtqueue *vq;
-        unsigned long flags;
+        unsigned long flags, size;
         u16 num;
         int err;
 
@@ -237,19 +237,20 @@ static struct virtqueue *vp_find_vq(struct virtio_device *vdev, unsigned index,
         info->queue_index = index;
         info->num = num;
 
-        info->queue = kzalloc(PAGE_ALIGN(vring_size(num,PAGE_SIZE)), GFP_KERNEL);
+        size = PAGE_ALIGN(vring_size(num, VIRTIO_PCI_VRING_ALIGN));
+        info->queue = alloc_pages_exact(size, GFP_KERNEL|__GFP_ZERO);
         if (info->queue == NULL) {
                 err = -ENOMEM;
                 goto out_info;
         }
 
         /* activate the queue */
-        iowrite32(virt_to_phys(info->queue) >> PAGE_SHIFT,
+        iowrite32(virt_to_phys(info->queue) >> VIRTIO_PCI_QUEUE_ADDR_SHIFT,
                   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;
@@ -266,7 +267,7 @@ static struct virtqueue *vp_find_vq(struct virtio_device *vdev, unsigned index,
 
 out_activate_queue:
         iowrite32(0, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_PFN);
-        kfree(info->queue);
+        free_pages_exact(info->queue, size);
 out_info:
         kfree(info);
         return ERR_PTR(err);
@@ -277,7 +278,7 @@ static void vp_del_vq(struct virtqueue *vq)
 {
         struct virtio_pci_device *vp_dev = to_vp_device(vq->vdev);
         struct virtio_pci_vq_info *info = vq->priv;
-        unsigned long flags;
+        unsigned long flags, size;
 
         spin_lock_irqsave(&vp_dev->lock, flags);
         list_del(&info->node);
@@ -289,7 +290,8 @@ static void vp_del_vq(struct virtqueue *vq)
         iowrite16(info->queue_index, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_SEL);
         iowrite32(0, vp_dev->ioaddr + VIRTIO_PCI_QUEUE_PFN);
 
-        kfree(info->queue);
+        size = PAGE_ALIGN(vring_size(info->num, VIRTIO_PCI_VRING_ALIGN));
+        free_pages_exact(info->queue, size);
         kfree(info);
 }
 
@@ -305,6 +307,20 @@ static struct virtio_config_ops virtio_pci_config_ops = {
         .finalize_features = vp_finalize_features,
 };
 
+static void virtio_pci_release_dev(struct device *_d)
+{
+        struct virtio_device *dev = container_of(_d, struct virtio_device, dev);
+        struct virtio_pci_device *vp_dev = to_vp_device(dev);
+        struct pci_dev *pci_dev = vp_dev->pci_dev;
+
+        free_irq(pci_dev->irq, vp_dev);
+        pci_set_drvdata(pci_dev, NULL);
+        pci_iounmap(pci_dev, vp_dev->ioaddr);
+        pci_release_regions(pci_dev);
+        pci_disable_device(pci_dev);
+        kfree(vp_dev);
+}
+
 /* the PCI probing function */
 static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
                                       const struct pci_device_id *id)
@@ -328,6 +344,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
                 return -ENOMEM;
 
         vp_dev->vdev.dev.parent = &virtio_pci_root;
+        vp_dev->vdev.dev.release = virtio_pci_release_dev;
         vp_dev->vdev.config = &virtio_pci_config_ops;
         vp_dev->pci_dev = pci_dev;
         INIT_LIST_HEAD(&vp_dev->virtqueues);
@@ -357,7 +374,7 @@ static int __devinit virtio_pci_probe(struct pci_dev *pci_dev,
 
         /* register a handler for the queue with the PCI device's interrupt */
         err = request_irq(vp_dev->pci_dev->irq, vp_interrupt, IRQF_SHARED,
-                          vp_dev->vdev.dev.bus_id, vp_dev);
+                          dev_name(&vp_dev->vdev.dev), vp_dev);
         if (err)
                 goto out_set_drvdata;
 
@@ -387,12 +404,6 @@ static void __devexit virtio_pci_remove(struct pci_dev *pci_dev)
         struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
 
         unregister_virtio_device(&vp_dev->vdev);
-        free_irq(pci_dev->irq, vp_dev);
-        pci_set_drvdata(pci_dev, NULL);
-        pci_iounmap(pci_dev, vp_dev->ioaddr);
-        pci_release_regions(pci_dev);
-        pci_disable_device(pci_dev);
-        kfree(vp_dev);
 }
 
 #ifdef CONFIG_PM
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;