powernv/iov: Ensure the pdn for VFs always contains a valid PE number
Subsystems (3)
Oliver O'Halloran
reviewerPATCH v2 1/3 powernv/iov: Ensure the pdn for VFs always contains a valid PE number
On pseries there is a bug with adding hotplugged devices to an IOMMU group. For a number of dumb reasons fixing that bug first requires re-working how VFs are configured on PowerNV. For background, on PowerNV we use the pcibios_sriov_enable() hook to do two things:
1. Create a pci_dn structure for each of the VFs, and
2. Configure the PHB's internal BARs so the MMIO range for each VF maps to a unique PE.
Roughly speaking a PE is the hardware counterpart to a Linux IOMMU group since all the devices in a PE share the same IOMMU table. A PE also defines the set of devices that should be isolated in response to a PCI error (i.e. bad DMA, UR/CA, AER events, etc). When isolated all MMIO and DMA traffic to and from devicein the PE is blocked by the root complex until the PE is recovered by the OS.
The requirement to block MMIO causes a giant headache because the P8 PHB generally uses a fixed mapping between MMIO addresses and PEs. As a result we need to delay configuring the IOMMU groups for device until after MMIO resources are assigned. For physical devices (i.e. non-VFs) the PE assignment is done in pcibios_setup_bridge() which is called immediately after the MMIO resources for downstream devices (and the bridge's windows) are assigned. For VFs the setup is more complicated because:
a) pcibios_setup_bridge() is not called again when VFs are activated, and
b) The pci_dev for VFs are created by generic code which runs after pcibios_sriov_enable() is called.
The work around for this is a two step process:
1. A fixup in pcibios_add_device() is used to initialised the cached pe_number in pci_dn, then
2. A bus notifier then adds the device to the IOMMU group for the PE specified in pci_dn->pe_number.
A side effect fixing the pseries bug mentioned in the first paragraph is moving the fixup out of pcibios_add_device() and into pcibios_bus_add_device(), which is called much later. This results in step
2. failing because pci_dn->pe_number won't be initialised when the bus notifier is run.
We can fix this by removing the need for the fixup. The PE for a VF is known before the VF is even scanned so we can initialise pci_dn->pe_number pcibios_sriov_enable() instead. Unfortunately, moving the initialisation causes two problems:
1. We trip the WARN_ON() in the current fixup code, and
2. The EEH core clears pdn->pe_number when recovering a VF and relies on the fixup to correctly re-set it.
The only justification for either of these is a comment in eeh_rmv_device() suggesting that pdn->pe_number *must* be set to IODA_INVALID_PE in order for the VF to be scanned. However, this comment appears to have no basis in reality. Both bugs can be fixed by just deleting the code.
---
v2: Re-wrote commit message, got very depressed about the state of things.
The real fix here is to move the IOMMU group setup for both VFs and PFs into pcibios_bus_add_device() and kill the pcibios_setup_bridge() hack and the bus notifier hack, but doing that requires some pretty gnarly changes. The fix here is much less invasive.
--- arch/powerpc/kernel/eeh_driver.c | 6 ------ arch/powerpc/platforms/powernv/pci-ioda.c | 19 +++++++++++++++---- arch/powerpc/platforms/powernv/pci.c | 4 ---- 3 files changed, 15 insertions(+), 14 deletions(-)
arch/powerpc/kernel/eeh_driver.c +0 -6
@@ -541,12 +541,6 @@ static void eeh_rmv_device(struct eeh_dev *edev, void *userdata)pci_iov_remove_virtfn (edev->physfn, pdn->vf_index); edev->pdev =NULL ; - -/* -* We have to set the VF PE number to invalid one, which is -* required to plug the VF successfully. -*/ - pdn->pe_number =IODA_INVALID_PE ;#endif if (rmv_data)list_add (&edev->rmv_entry, &rmv_data->removed_vf_list);
arch/powerpc/platforms/powernv/pci-ioda.c +15 -4
@@ -1558,6 +1558,10 @@ static void pnv_ioda_setup_vf_PE(struct pci_dev *pdev, u16 num_vfs)/* Reserve PE for each VF */ for (vf_index =0 ; vf_index < num_vfs; vf_index++) { +int vf_devfn =pci_iov_virtfn_devfn (pdev, vf_index); +int vf_bus =pci_iov_virtfn_bus (pdev, vf_index); +struct pci_dn *vf_pdn; +if (pdn->m64_single_mode) pe_num = pdn->pe_num_map[vf_index];else
@@ -1570,13 +1574,11 @@ static void pnv_ioda_setup_vf_PE(struct pci_dev *pdev, u16 num_vfs) pe->pbus =NULL ; pe->parent_dev = pdev; pe->mve_number =-1 ; - pe->rid = (pci_iov_virtfn_bus (pdev, vf_index) <<8 ) | -pci_iov_virtfn_devfn (pdev, vf_index); + pe->rid = (vf_bus <<8 ) | vf_devfn;pe_info (pe,"VF %04d:%02d:%02d.%d associated with PE#%x\n" , hose->global_number, pdev->bus->number, -PCI_SLOT (pci_iov_virtfn_devfn (pdev, vf_index)), -PCI_FUNC (pci_iov_virtfn_devfn (pdev, vf_index)), pe_num); +PCI_SLOT (vf_devfn),PCI_FUNC (vf_devfn), pe_num);if (pnv_ioda_configure_pe (phb, pe)) {/* XXX What do we do here ? */
@@ -1590,6 +1592,15 @@ static void pnv_ioda_setup_vf_PE(struct pci_dev *pdev, u16 num_vfs)list_add_tail (&pe->list, &phb->ioda.pe_list);mutex_unlock (&phb->ioda.pe_list_mutex); +/* associate this pe to it's pdn */ +list_for_each_entry (vf_pdn, &pdn->parent->child_list, list) { +if (vf_pdn->busno == vf_bus && + vf_pdn->devfn == vf_devfn) { + vf_pdn->pe_number = pe_num; +break ; + } + } +pnv_pci_ioda2_setup_dma_pe (phb, pe);#ifdef CONFIG_IOMMU_API iommu_register_group(&pe->table_group,
arch/powerpc/platforms/powernv/pci.c +0 -4
@@ -816,16 +816,12 @@ void pnv_pci_dma_dev_setup(struct pci_dev *pdev)struct pnv_phb *phb = hose->private_data;#ifdef CONFIG_PCI_IOV struct pnv_ioda_pe *pe; -struct pci_dn *pdn;/* Fix the VF pdn PE number */ if (pdev->is_virtfn) { - pdn =pci_get_pdn (pdev); -WARN_ON (pdn->pe_number !=IODA_INVALID_PE );list_for_each_entry (pe, &phb->ioda.pe_list, list) {if (pe->rid == ((pdev->bus->number <<8 ) | (pdev->devfn &0xff ))) { - pdn->pe_number = pe->pe_number; pe->pdev = pdev;break ; }
Signature · 1 line
2.9.5
Oliver O'Halloran
reviewerPATCH v2 2/3 powerpc/pci: Fix pcibios_setup_device() ordering
From: Shawn Anastasio <[email protected]>
Move PCI device setup from pcibios_add_device() and pcibios_fixup_bus() to pcibios_bus_add_device(). This ensures that platform-specific DMA and IOMMU setup occurs after the device has been registered in sysfs, which is a requirement for IOMMU group assignment to work
This fixes IOMMU group assignment for hotplugged devices on pseries, where the existing behavior results in IOMMU assignment before registration.
Thanks to Lukas Wunner <[email protected]> for the suggestion.
--- arch/powerpc/kernel/pci-common.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-)
arch/powerpc/kernel/pci-common.c +9 -16
@@ -261,12 +261,6 @@ int pcibios_sriov_disable(struct pci_dev *pdev)#endif /* CONFIG_PCI_IOV */ -void pcibios_bus_add_device (struct pci_dev *pdev) -{ -if (ppc_md.pcibios_bus_add_device) - ppc_md.pcibios_bus_add_device (pdev); -} -static resource_size_t pcibios_io_size (const struct pci_controller *hose) {#ifdef CONFIG_PPC64
@@ -987,15 +981,17 @@ static void pcibios_setup_device(struct pci_dev *dev) ppc_md.pci_irq_fixup (dev); } -int pcibios_add_device (struct pci_dev *dev) +void pcibios_bus_add_device (struct pci_dev *pdev) { -/* -* We can only call pcibios_setup_device() after bus setup is complete, -* since some of the platform specific DMA setup code depends on it. -*/ -if (dev->bus->is_added) -pcibios_setup_device (dev); +/* Perform platform-specific device setup */ +pcibios_setup_device (pdev); + +if (ppc_md.pcibios_bus_add_device) + ppc_md.pcibios_bus_add_device (pdev); +} +int pcibios_add_device (struct pci_dev *dev) +{#ifdef CONFIG_PCI_IOV if (ppc_md.pcibios_fixup_sriov) ppc_md.pcibios_fixup_sriov (dev);
@@ -1037,9 +1033,6 @@ void pcibios_fixup_bus(struct pci_bus *bus)/* Now fixup the bus bus */ pcibios_setup_bus_self (bus); - -/* Now fixup devices on that bus */ -pcibios_setup_bus_devices (bus); }EXPORT_SYMBOL (pcibios_fixup_bus);
Signature · 1 line
2.9.5
Oliver O'Halloran
reviewerPATCH v2 3/3 powerpc/pci: Remove pcibios_setup_bus_devices()
In reply to Oliver O'HalloranWith the previous patch applied pcibios_setup_device() will always be run when pcibios_bus_add_device() is called. There are several code paths where pcibios_setup_bus_device() is still called (the PowerPC specific PCI hotplug support is one) so with just the previous patch applied the setup can be run multiple times on a device, once before the device is added to the bus and once after.
There's no need to run the setup in the early case any more so just remove it entirely.
--- arch/powerpc/include/asm/pci.h | 1 - arch/powerpc/kernel/pci-common.c | 25 ------------------------- arch/powerpc/kernel/pci-hotplug.c | 1 - arch/powerpc/kernel/pci_of_scan.c | 1 - 4 files changed, 28 deletions(-)
arch/powerpc/include/asm/pci.h +0 -1
@@ -113,7 +113,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, pgprot_t prot);extern resource_size_t pcibios_io_space_offset (struct pci_controller *hose); -extern void pcibios_setup_bus_devices (struct pci_bus *bus);extern void pcibios_setup_bus_self (struct pci_bus *bus);extern void pcibios_setup_phb_io_space (struct pci_controller *hose);extern void pcibios_scan_phb (struct pci_controller *hose);
arch/powerpc/kernel/pci-common.c +0 -25
@@ -1000,24 +1000,6 @@ int pcibios_add_device(struct pci_dev *dev)return 0 ; } -void pcibios_setup_bus_devices (struct pci_bus *bus) -{ -struct pci_dev *dev; - -pr_debug ("PCI: Fixup bus devices %d (%s)\n" , - bus->number, bus->self ?pci_name (bus->self) :"PHB" ); - -list_for_each_entry (dev, &bus->devices, bus_list) { -/* Cardbus can call us to add new devices to a bus, so ignore -* those who are already fully discovered -*/ -if (pci_dev_is_added (dev)) -continue ; - -pcibios_setup_device (dev); - } -} -void pcibios_set_master (struct pci_dev *dev) {/* No special bus mastering setup handling */
@@ -1036,13 +1018,6 @@ void pcibios_fixup_bus(struct pci_bus *bus) }EXPORT_SYMBOL (pcibios_fixup_bus); -void pci_fixup_cardbus (struct pci_bus *bus) -{ -/* Now fixup devices on that bus */ -pcibios_setup_bus_devices (bus); -} - -static int skip_isa_ioresource_align (struct pci_dev *dev) { if (pci_has_flag(PCI_CAN_SKIP_ISA_ALIGN) &&
arch/powerpc/kernel/pci-hotplug.c +0 -1
@@ -134,7 +134,6 @@ void pci_hp_add_devices(struct pci_bus *bus)*/ slotno =PCI_SLOT (PCI_DN (dn->child)->devfn);pci_scan_slot (bus,PCI_DEVFN (slotno,0 )); -pcibios_setup_bus_devices (bus); max = bus->busn_res.start;/* * Scan bridges that are already configured. We don't touch
arch/powerpc/kernel/pci_of_scan.c +0 -1
@@ -414,7 +414,6 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,*/ if (!rescan_existing)pcibios_setup_bus_self (bus); -pcibios_setup_bus_devices (bus);/* Now scan child busses */ for_each_pci_bridge (dev, bus)
Signature · 1 line
2.9.5
Quoted 3 lines · Oliver O'Halloran
On pseries there is a bug with adding hotplugged devices to an IOMMU group. For a number of dumb reasons fixing that bug first requires re-working how VFs are configured on PowerNV.
Are these patches expected to land soon, or is there another fix in the pipeline? As far as I can tell this is still an issue.
Quoted 50 lines · Oliver O'Halloran
On pseries there is a bug with adding hotplugged devices to an IOMMU group. For a number of dumb reasons fixing that bug first requires re-working how VFs are configured on PowerNV. For background, on PowerNV we use the
pcibios_sriov_enable()hook to do two things:1. Create a
pci_dnstructure for each of the VFs, and
2. Configure the PHB's internal BARs so the MMIO range for each VF maps to a unique PE.Roughly speaking a PE is the hardware counterpart to a Linux IOMMU group since all the devices in a PE share the same IOMMU table. A PE also defines the set of devices that should be isolated in response to a PCI error (i.e. bad DMA, UR/CA, AER events, etc). When isolated all MMIO and DMA traffic to and from devicein the PE is blocked by the root complex until the PE is recovered by the OS.
The requirement to block MMIO causes a giant headache because the P8 PHB generally uses a fixed mapping between MMIO addresses and PEs. As a result we need to delay configuring the IOMMU groups for device until after MMIO resources are assigned. For physical devices (i.e. non-VFs) the PE assignment is done in
pcibios_setup_bridge()which is called immediately after the MMIO resources for downstream devices (and the bridge's windows) are assigned. For VFs the setup is more complicated because:a)
pcibios_setup_bridge()is not called again when VFs are activated, and
b) Thepci_devfor VFs are created by generic code which runs afterpcibios_sriov_enable()is called.The work around for this is a two step process:
1. A fixup in
pcibios_add_device()is used to initialised the cachedpe_numberinpci_dn, then
2. A bus notifier then adds the device to the IOMMU group for the PE specified inpci_dn->pe_number.A side effect fixing the pseries bug mentioned in the first paragraph is moving the fixup out of
pcibios_add_device()and intopcibios_bus_add_device(), which is called much later. This results in step
2. failing becausepci_dn->pe_numberwon't be initialised when the bus notifier is run.We can fix this by removing the need for the fixup. The PE for a VF is known before the VF is even scanned so we can initialise
pci_dn->pe_numberpcibios_sriov_enable()instead. Unfortunately, moving the initialisation causes two problems:1. We trip the
WARN_ON()in the current fixup code, and
2. The EEH core clearspdn->pe_numberwhen recovering a VF and relies on the fixup to correctly re-set it.
Quoted 8 lines
The only justification for either of these is a comment in
eeh_rmv_device()suggesting thatpdn->pe_number*must* be set toIODA_INVALID_PEin order for the VF to be scanned. However, this comment appears to have no basis in reality. Both bugs can be fixed by just deleting the code.Tested-by Alexey Kardashevskiy <[email protected]>Reviewed-by Alexey Kardashevskiy <[email protected]>Signed-off-by Oliver O'Halloran <[email protected]>
Series applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/3b5b9997b331e77ce967eba2c4bc80dc3134a7fe
cheers