virtio-pci: alloc only resources actually used.

Move resource allocation from common code to legacy and modern code.
Only request resources actually used, i.e. bar0 in legacy mode and
the bar(s) specified by capabilities in modern mode.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 59a5b0f7bf74f88da6670bcbf924d8cc1e75b1ee)

Reviewed-by: Si-Wei Liu <si-wei.liu@oracle.com>
Signed-off-by: Jim Quigley <Jim.Quigley@oracle.com>
Orabug: 27054871

Conflicts:
	drivers/virtio/virtio_pci_legacy.c

This was a minor contextual change introduced because upstream
applied the following patches in the order :-

	vring: Use the DMA API on Xen (Andy Lutomirski)  [Orabug: 26388044]
	virtio_pci: Use the DMA API if enabled (Andy Lutomirski)  [Orabug: 26388044]
	virtio_mmio: Use the DMA API if enabled (Andy Lutomirski)  [Orabug: 26388044]
	virtio: Add improved queue allocation API (Andy Lutomirski)  [Orabug: 26388044]
	virtio_ring: Support DMA APIs (Andy Lutomirski)  [Orabug: 26388044]
	vring: Introduce vring_use_dma_api() (Andy Lutomirski) Orabug: 26388044]
	virtio-pci: alloc only resources actually used.

and we are now applying them as :-

	virtio-pci: alloc only resources actually used.
	vring: Use the DMA API on Xen (Andy Lutomirski)  [Orabug: 26388044]
	virtio_pci: Use the DMA API if enabled (Andy Lutomirski)  [Orabug: 26388044]
	....

diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index 14f767e8e5c5579eea581c092b2611643b76751e..197c905db0ab2db27656b19eca2247a7ee0ad789 100644 (file)
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -510,10 +510,6 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,
        if (rc)
                goto err_enable_device;
 
-       rc = pci_request_regions(pci_dev, "virtio-pci");
-       if (rc)
-               goto err_request_regions;
-
        if (force_legacy) {
                rc = virtio_pci_legacy_probe(vp_dev);
                /* Also try modern mode if we can't map BAR0 (no IO space). */
@@ -543,8 +539,6 @@ err_register:
        else
             virtio_pci_modern_remove(vp_dev);
 err_probe:
-       pci_release_regions(pci_dev);
-err_request_regions:
        pci_disable_device(pci_dev);
 err_enable_device:
        kfree(vp_dev);
@@ -563,7 +557,6 @@ static void virtio_pci_remove(struct pci_dev *pci_dev)
        else
                virtio_pci_modern_remove(vp_dev);
 
-       pci_release_regions(pci_dev);
        pci_disable_device(pci_dev);
        put_device(dev);
 }

diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h
index f2b4d0c4f2ff8bbf1cbd6cc33f03dd057aec104e..1a3c689d1b9ef11a9b7a96a2f6d2441a6336a675 100644 (file)
--- a/drivers/virtio/virtio_pci_common.h
+++ b/drivers/virtio/virtio_pci_common.h
@@ -69,6 +69,8 @@ struct virtio_pci_device {
        /* Multiply queue_notify_off by this value. (non-legacy mode). */
        u32 notify_offset_multiplier;
 
+       int modern_bars;
+
        /* Legacy only field */
        /* the IO mapping for the PCI config space */
        void __iomem *ioaddr;

diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
index bc58eefdfba1c0f1b308e9344591fdd7e4c32ec0..8c4e61783441b9f818c18b6dedd0b113b575ab77 100644 (file)
--- a/drivers/virtio/virtio_pci_legacy.c
+++ b/drivers/virtio/virtio_pci_legacy.c
@@ -226,7 +226,7 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev)
        rc = -ENOMEM;
        vp_dev->ioaddr = pci_iomap(pci_dev, 0, 0);
        if (!vp_dev->ioaddr)
-               return -ENOMEM;
+               goto err_iomap;
 
        vp_dev->isr = vp_dev->ioaddr + VIRTIO_PCI_ISR;
 
@@ -244,6 +244,10 @@ int virtio_pci_legacy_probe(struct virtio_pci_device *vp_dev)
        vp_dev->del_vq = del_vq;
 
        return 0;
+
+err_iomap:
+       pci_release_region(pci_dev, 0);
+       return rc;
 }
 
 void virtio_pci_legacy_remove(struct virtio_pci_device *vp_dev)
@@ -251,4 +255,5 @@ void virtio_pci_legacy_remove(struct virtio_pci_device *vp_dev)
        struct pci_dev *pci_dev = vp_dev->pci_dev;
 
        pci_iounmap(pci_dev, vp_dev->ioaddr);
+       pci_release_region(pci_dev, 0);
 }

diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 3ef9708da661ba0d53fdbe9e109bc3623326ab0b..50b0cd5a501e0d6de4afa24ae80bde4da7810754 100644 (file)
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -463,7 +463,7 @@ static const struct virtio_config_ops virtio_pci_config_ops = {
  * Returns offset of the capability, or 0.
  */
 static inline int virtio_pci_find_capability(struct pci_dev *dev, u8 cfg_type,
-                                            u32 ioresource_types)
+                                            u32 ioresource_types, int *bars)
 {
        int pos;
 
@@ -484,8 +484,10 @@ static inline int virtio_pci_find_capability(struct pci_dev *dev, u8 cfg_type,
 
                if (type == cfg_type) {
                        if (pci_resource_len(dev, bar) &&
-                           pci_resource_flags(dev, bar) & ioresource_types)
+                           pci_resource_flags(dev, bar) & ioresource_types) {
+                               *bars |= (1 << bar);
                                return pos;
+                       }
                }
        }
        return 0;
@@ -581,7 +583,8 @@ int virtio_pci_modern_probe(struct virtio_pci_device *vp_dev)
 
        /* check for a common config: if not, use legacy mode (bar 0). */
        common = virtio_pci_find_capability(pci_dev, VIRTIO_PCI_CAP_COMMON_CFG,
-                                           IORESOURCE_IO | IORESOURCE_MEM);
+                                           IORESOURCE_IO | IORESOURCE_MEM,
+                                           &vp_dev->modern_bars);
        if (!common) {
                dev_info(&pci_dev->dev,
                         "virtio_pci: leaving for legacy driver\n");
@@ -590,9 +593,11 @@ int virtio_pci_modern_probe(struct virtio_pci_device *vp_dev)
 
        /* If common is there, these should be too... */
        isr = virtio_pci_find_capability(pci_dev, VIRTIO_PCI_CAP_ISR_CFG,
-                                        IORESOURCE_IO | IORESOURCE_MEM);
+                                        IORESOURCE_IO | IORESOURCE_MEM,
+                                        &vp_dev->modern_bars);
        notify = virtio_pci_find_capability(pci_dev, VIRTIO_PCI_CAP_NOTIFY_CFG,
-                                           IORESOURCE_IO | IORESOURCE_MEM);
+                                           IORESOURCE_IO | IORESOURCE_MEM,
+                                           &vp_dev->modern_bars);
        if (!isr || !notify) {
                dev_err(&pci_dev->dev,
                        "virtio_pci: missing capabilities %i/%i/%i\n",
@@ -611,7 +616,13 @@ int virtio_pci_modern_probe(struct virtio_pci_device *vp_dev)
         * device-specific configuration.
         */
        device = virtio_pci_find_capability(pci_dev, VIRTIO_PCI_CAP_DEVICE_CFG,
-                                           IORESOURCE_IO | IORESOURCE_MEM);
+                                           IORESOURCE_IO | IORESOURCE_MEM,
+                                           &vp_dev->modern_bars);
+
+       err = pci_request_selected_regions(pci_dev, vp_dev->modern_bars,
+                                          "virtio-pci-modern");
+       if (err)
+               return err;
 
        err = -EINVAL;
        vp_dev->common = map_capability(pci_dev, common,
@@ -698,4 +709,5 @@ void virtio_pci_modern_remove(struct virtio_pci_device *vp_dev)
                pci_iounmap(pci_dev, vp_dev->notify_base);
        pci_iounmap(pci_dev, vp_dev->isr);
        pci_iounmap(pci_dev, vp_dev->common);
+       pci_release_selected_regions(pci_dev, vp_dev->modern_bars);
 }