PCI/portdrv: Compute MSI/MSI-X IRQ vectors after final allocation

When setting up portdrv MSI/MSI-X interrupts, we previously allocated the
maximum possible number of vectors, read the Interrupt Message Numbers for
each service, saved the IRQ for each, freed the vectors, and finally used
the largest Message Number to reallocate only as many vectors as we need.

The problem is that freeing the vectors invalidates their IRQs, so the
saved IRQ numbers may now be invalid, which can result in errors like
this:

  pcie_pme: probe of 0000:00:00.0:pcie001 failed with error -22
  pciehp 0000:00:00.0:pcie004: Cannot get irq 20 for the hotplug controller
  aer: probe of 0000:00:00.0:pcie002 failed with error -22
  dpc 0000:00:00.0:pcie010: request IRQ22 failed: -22

Change the setup so we save the Interrupt Message Numbers (not the IRQs)
before we free the original setup, then use the Message Numbers to compute
the IRQs (via pci_irq_vector()) *after* we reallocate the vectors.

This should always be safe for MSI-X because the Message Numbers are fixed.
For MSI, the hardware is allowed to change Message Numbers when we update
the MSI Multiple Message Enable field when reallocating the vectors, but
since we allocate enough vectors to accommodate the largest Message Number
we found, that's unlikely.  See PCIe r3.1, sec 7.8.2, 7.10.10, 7.31.2.

Fixes: 3674cc49da9a ("PCI/portdrv: Use pci_irq_alloc_vectors()")
Based-on-patch-by: Dongdong Liu <liudongdong3@huawei.com>
Tested-by: Dongdong Liu <liudongdong3@huawei.com>  # HiSilicon hip08
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 102f5c5fcfe0a95baa5206e12b77ee4410a9c22d..3cd5eb48644a5aad141d59acbebeeb87f97e4b2f 100644 (file)
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -117,6 +117,26 @@ static int pcie_port_enable_irq_vec(struct pci_dev *dev, int *irqs, int mask)
                return -EIO;
        }
 
+       /*
+        * If we allocated more than we need, free them and reallocate fewer.
+        *
+        * Reallocating may change the specific vectors we get, so
+        * pci_irq_vector() must be done *after* the reallocation.
+        *
+        * If we're using MSI, hardware is *allowed* to change the Interrupt
+        * Message Numbers when we free and reallocate the vectors, but we
+        * assume it won't because we allocate enough vectors for the
+        * biggest Message Number we found.
+        */
+       if (nvec != nr_entries) {
+               pci_free_irq_vectors(dev);
+
+               nr_entries = pci_alloc_irq_vectors(dev, nvec, nvec,
+                               PCI_IRQ_MSIX | PCI_IRQ_MSI);
+               if (nr_entries < 0)
+                       return nr_entries;
+       }
+
        /* PME and hotplug share an MSI/MSI-X vector */
        if (mask & (PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP)) {
                irqs[PCIE_PORT_SERVICE_PME_SHIFT] = pci_irq_vector(dev, pme);
@@ -129,16 +149,6 @@ static int pcie_port_enable_irq_vec(struct pci_dev *dev, int *irqs, int mask)
        if (mask & PCIE_PORT_SERVICE_DPC)
                irqs[PCIE_PORT_SERVICE_DPC_SHIFT] = pci_irq_vector(dev, dpc);
 
-       /* If we allocated more than we need, free them and allocate fewer */
-       if (nvec != nr_entries) {
-               pci_free_irq_vectors(dev);
-
-               nr_entries = pci_alloc_irq_vectors(dev, nvec, nvec,
-                               PCI_IRQ_MSIX | PCI_IRQ_MSI);
-               if (nr_entries < 0)
-                       return nr_entries;
-       }
-
        return 0;
 }