Patchwork powerpc: reduce multi-hit of pcibios_setup_device() in hotplug

login
register
mail settings
Submitter Wei Yang
Date June 11, 2014, 7:12 a.m.
Message ID <20140611071241.GA10729@richard>
Download mbox | patch
Permalink /patch/358498/
State Changes Requested
Headers show

Comments

Wei Yang - June 11, 2014, 7:12 a.m.
On Mon, May 12, 2014 at 12:59:19PM +1000, Benjamin Herrenschmidt wrote:
>On Thu, 2014-05-08 at 14:30 +0800, Wei Yang wrote:
>> During the EEH hotplug event, pcibios_setup_device() will be invoked two
>> times. And the last time will trigger a warning of re-attachment of iommu
>> group.
>> 
>> The two times are:
>> 
>>     pci_device_add
>>         ...
>>         pcibios_add_device
>>         pcibios_setup_device   <- 1st time
>>     pcibios_add_pci_devices
>>         ...
>>         pcibios_setup_bus_devices
>>         pcibios_setup_device   <- 2rd time
>> 
>> As we see, in pcibios_add_pci_devices() the pci_bus passed in as a parameter
>> is initialized and already added in the system. Which means the
>> pcibios_setup_device() in pcibios_add_device() will be called. Then the
>> pcibios_setup_device() in pcibios_setup_bus_devices() is the 2nd time to be
>> called on the same pci_dev.
>
>(CC'ing Bjorn to make sure I get the mess right :-)
>
>So the patch makes me a bit nervous because we have convoluted
>dependencies on some of that in the actual PCI hotplug code (the
>real thing which rescans busses etc...).
>
>I *think* the patch might be right (though incomplete) on those
>grounds, but I'd like you to verify and test the various hotplug
>cases in pHyp and I think issue comes from pcibios_add_device() being
>somewhat a late addition.
>
>Basically, what happens I think is at boot time:
>
> - bus->is_added is false, dev->is_added is false during initial probe
>   of a given device. So pcibios_add_device() does nothing.
>
> - shortly afterward, the core calls pcibios_fixup_bus(), still with
>bus->is_added set to false, which *will* do the setup because
>dev->is_added is also false for all devices.
>
> - we set bus->is_added
>
> - we call pci_bus_add_devices() which sets all the dev->is_added
>
>So far so good. Now, when we hotplug something (and there are some
>distinction here depending on what hotplug path we take which is why I'd
>like you to scrutinize things a bit more), we mostly hit powerpc's
>pcibios_add_pci_devices().
>
>Now this function will operate differently on a "devtree" style probe
>(phyp/kvm guest) vs. a "normal" probe (other bare metal machines).
>
>The normal case is what you are trying to fix here. It does an explicit
>pcibios_setup_bus_devices() on the bus being rescanned. I think you are
>right this isn't necessary. This bus has bus->is_added set to true and
>thus pcibios_add_device() will do the setup for any new devices. 
>
>That makes me think that we need a similar fix in pci_of_scan.c for
>when we call of_rescan_bus(). The fix would be probably in
>__of_scan_bus(), to move the call to pcibios_setup_bus_devices() inside
>the if (!rescan_existing) statement, since if we are scanning an
>existing bus (which thus has bus->is_added set), we know
>pcibios_add_devices() will have done the updates.
>
>In fact I wonder if we could just use bus->is_added for the test in
>there and get rid of the "rescan_existing" argument completely. Worth
>adding something like WARN_ON(rescan_existing != bus->is_added); and
>do a few tests of hotplug to see what it looks like.
>
>Now there are two different hotplug path at least in the pseries code,
>so have a look make sure we aren't missing anything here and please test
>all cases !
>
>Cheers,
>Ben.

Hi, Ben,

Sorry for the long delay. It took me some time to investigate and test the code.
Currently, the hotplug by qemu monitor command line has been verified. Two pci
device on the same bus have been hotpluged one by one successfully.

Another case in my mind is the EEH hotplug, which requires code in
Qemu/Sapphire/Kernel. I will did further test later.

Below is the patch which is verified in guest with monitor command line. If my
understanding is not correct, please let me know :-)

From 69c5f014836b24897356731c39cbaf18f4563573 Mon Sep 17 00:00:00 2001
From: Wei Yang <weiyang@linux.vnet.ibm.com>
Date: Tue, 10 Jun 2014 15:28:53 +0800
Subject: [PATCH] powerpc/pci: Use bus->is_added in of_scan_bus() as in
 general platform

When scan the pci bus on general platform, it use bus->is_added to mark the
bus has been added successfully. While this flag is not used when the bus scan
relies on device node. Instead, it uses a particular parameter
"rescan_existing" to play the same role.

This patch enables the bus->is_added when device node is used, drops the
"rescan_existing" parameter. Also it skip the pcibios_setup_bus_devices()
procedure when bus has already been added, since the pcibios_setup_device()
step is done in pci_device_add() when the bus is already added.

Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
---
 arch/powerpc/kernel/pci_of_scan.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
Benjamin Herrenschmidt - June 11, 2014, 7:29 a.m.
On Wed, 2014-06-11 at 15:12 +0800, Wei Yang wrote:

> Sorry for the long delay. It took me some time to investigate and test the code.
> Currently, the hotplug by qemu monitor command line has been verified. Two pci
> device on the same bus have been hotpluged one by one successfully.
> 
> Another case in my mind is the EEH hotplug, which requires code in
> Qemu/Sapphire/Kernel. I will did further test later.
> 
> Below is the patch which is verified in guest with monitor command line. If my
> understanding is not correct, please let me know :-)

Please verify under pHyp, the code path are a bit different.

Cheers,
Ben.

> >From 69c5f014836b24897356731c39cbaf18f4563573 Mon Sep 17 00:00:00 2001
> From: Wei Yang <weiyang@linux.vnet.ibm.com>
> Date: Tue, 10 Jun 2014 15:28:53 +0800
> Subject: [PATCH] powerpc/pci: Use bus->is_added in of_scan_bus() as in
>  general platform
> 
> When scan the pci bus on general platform, it use bus->is_added to mark the
> bus has been added successfully. While this flag is not used when the bus scan
> relies on device node. Instead, it uses a particular parameter
> "rescan_existing" to play the same role.
> 
> This patch enables the bus->is_added when device node is used, drops the
> "rescan_existing" parameter. Also it skip the pcibios_setup_bus_devices()
> procedure when bus has already been added, since the pcibios_setup_device()
> step is done in pci_device_add() when the bus is already added.
> 
> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
> ---
>  arch/powerpc/kernel/pci_of_scan.c |   14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
> index 83c26d8..3e943ab 100644
> --- a/arch/powerpc/kernel/pci_of_scan.c
> +++ b/arch/powerpc/kernel/pci_of_scan.c
> @@ -334,10 +334,8 @@ static struct pci_dev *of_scan_pci_dev(struct pci_bus *bus,
>   * __of_scan_bus - given a PCI bus node, setup bus and scan for child devices
>   * @node: device tree node for the PCI bus
>   * @bus: pci_bus structure for the PCI bus
> - * @rescan_existing: Flag indicating bus has already been set up
>   */
> -static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
> -			  int rescan_existing)
> +static void __of_scan_bus(struct device_node *node, struct pci_bus *bus)
>  {
>  	struct device_node *child;
>  	struct pci_dev *dev;
> @@ -356,9 +354,11 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
>  	/* Apply all fixups necessary. We don't fixup the bus "self"
>  	 * for an existing bridge that is being rescanned
>  	 */
> -	if (!rescan_existing)
> +	if (!bus->is_added) {
>  		pcibios_setup_bus_self(bus);
> -	pcibios_setup_bus_devices(bus);
> +		pcibios_setup_bus_devices(bus);
> +		bus->is_added = 1;
> +	}
>  
>  	/* Now scan child busses */
>  	list_for_each_entry(dev, &bus->devices, bus_list) {
> @@ -376,7 +376,7 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
>   */
>  void of_scan_bus(struct device_node *node, struct pci_bus *bus)
>  {
> -	__of_scan_bus(node, bus, 0);
> +	__of_scan_bus(node, bus);
>  }
>  EXPORT_SYMBOL_GPL(of_scan_bus);
>  
> @@ -390,7 +390,7 @@ EXPORT_SYMBOL_GPL(of_scan_bus);
>   */
>  void of_rescan_bus(struct device_node *node, struct pci_bus *bus)
>  {
> -	__of_scan_bus(node, bus, 1);
> +	__of_scan_bus(node, bus);
>  }
>  EXPORT_SYMBOL_GPL(of_rescan_bus);
>  
> -- 
> 1.7.9.5
> 
> >
> >
> >_______________________________________________
> >Linuxppc-dev mailing list
> >Linuxppc-dev@lists.ozlabs.org
> >https://lists.ozlabs.org/listinfo/linuxppc-dev
>
Wei Yang - June 11, 2014, 9 a.m.
On Wed, Jun 11, 2014 at 05:29:44PM +1000, Benjamin Herrenschmidt wrote:
>On Wed, 2014-06-11 at 15:12 +0800, Wei Yang wrote:
>
>> Sorry for the long delay. It took me some time to investigate and test the code.
>> Currently, the hotplug by qemu monitor command line has been verified. Two pci
>> device on the same bus have been hotpluged one by one successfully.
>> 
>> Another case in my mind is the EEH hotplug, which requires code in
>> Qemu/Sapphire/Kernel. I will did further test later.
>> 
>> Below is the patch which is verified in guest with monitor command line. If my
>> understanding is not correct, please let me know :-)
>
>Please verify under pHyp, the code path are a bit different.

Yep, I will test it.

>
>Cheers,
>Ben.
>
>> >From 69c5f014836b24897356731c39cbaf18f4563573 Mon Sep 17 00:00:00 2001
>> From: Wei Yang <weiyang@linux.vnet.ibm.com>
>> Date: Tue, 10 Jun 2014 15:28:53 +0800
>> Subject: [PATCH] powerpc/pci: Use bus->is_added in of_scan_bus() as in
>>  general platform
>> 
>> When scan the pci bus on general platform, it use bus->is_added to mark the
>> bus has been added successfully. While this flag is not used when the bus scan
>> relies on device node. Instead, it uses a particular parameter
>> "rescan_existing" to play the same role.
>> 
>> This patch enables the bus->is_added when device node is used, drops the
>> "rescan_existing" parameter. Also it skip the pcibios_setup_bus_devices()
>> procedure when bus has already been added, since the pcibios_setup_device()
>> step is done in pci_device_add() when the bus is already added.
>> 
>> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
>> ---
>>  arch/powerpc/kernel/pci_of_scan.c |   14 +++++++-------
>>  1 file changed, 7 insertions(+), 7 deletions(-)
>> 
>> diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
>> index 83c26d8..3e943ab 100644
>> --- a/arch/powerpc/kernel/pci_of_scan.c
>> +++ b/arch/powerpc/kernel/pci_of_scan.c
>> @@ -334,10 +334,8 @@ static struct pci_dev *of_scan_pci_dev(struct pci_bus *bus,
>>   * __of_scan_bus - given a PCI bus node, setup bus and scan for child devices
>>   * @node: device tree node for the PCI bus
>>   * @bus: pci_bus structure for the PCI bus
>> - * @rescan_existing: Flag indicating bus has already been set up
>>   */
>> -static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
>> -			  int rescan_existing)
>> +static void __of_scan_bus(struct device_node *node, struct pci_bus *bus)
>>  {
>>  	struct device_node *child;
>>  	struct pci_dev *dev;
>> @@ -356,9 +354,11 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
>>  	/* Apply all fixups necessary. We don't fixup the bus "self"
>>  	 * for an existing bridge that is being rescanned
>>  	 */
>> -	if (!rescan_existing)
>> +	if (!bus->is_added) {
>>  		pcibios_setup_bus_self(bus);
>> -	pcibios_setup_bus_devices(bus);
>> +		pcibios_setup_bus_devices(bus);
>> +		bus->is_added = 1;
>> +	}
>>  
>>  	/* Now scan child busses */
>>  	list_for_each_entry(dev, &bus->devices, bus_list) {
>> @@ -376,7 +376,7 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
>>   */
>>  void of_scan_bus(struct device_node *node, struct pci_bus *bus)
>>  {
>> -	__of_scan_bus(node, bus, 0);
>> +	__of_scan_bus(node, bus);
>>  }
>>  EXPORT_SYMBOL_GPL(of_scan_bus);
>>  
>> @@ -390,7 +390,7 @@ EXPORT_SYMBOL_GPL(of_scan_bus);
>>   */
>>  void of_rescan_bus(struct device_node *node, struct pci_bus *bus)
>>  {
>> -	__of_scan_bus(node, bus, 1);
>> +	__of_scan_bus(node, bus);
>>  }
>>  EXPORT_SYMBOL_GPL(of_rescan_bus);
>>  
>> -- 
>> 1.7.9.5
>> 
>> >
>> >
>> >_______________________________________________
>> >Linuxppc-dev mailing list
>> >Linuxppc-dev@lists.ozlabs.org
>> >https://lists.ozlabs.org/listinfo/linuxppc-dev
>> 
>

Patch

diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 83c26d8..3e943ab 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -334,10 +334,8 @@  static struct pci_dev *of_scan_pci_dev(struct pci_bus *bus,
  * __of_scan_bus - given a PCI bus node, setup bus and scan for child devices
  * @node: device tree node for the PCI bus
  * @bus: pci_bus structure for the PCI bus
- * @rescan_existing: Flag indicating bus has already been set up
  */
-static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
-			  int rescan_existing)
+static void __of_scan_bus(struct device_node *node, struct pci_bus *bus)
 {
 	struct device_node *child;
 	struct pci_dev *dev;
@@ -356,9 +354,11 @@  static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
 	/* Apply all fixups necessary. We don't fixup the bus "self"
 	 * for an existing bridge that is being rescanned
 	 */
-	if (!rescan_existing)
+	if (!bus->is_added) {
 		pcibios_setup_bus_self(bus);
-	pcibios_setup_bus_devices(bus);
+		pcibios_setup_bus_devices(bus);
+		bus->is_added = 1;
+	}
 
 	/* Now scan child busses */
 	list_for_each_entry(dev, &bus->devices, bus_list) {
@@ -376,7 +376,7 @@  static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
  */
 void of_scan_bus(struct device_node *node, struct pci_bus *bus)
 {
-	__of_scan_bus(node, bus, 0);
+	__of_scan_bus(node, bus);
 }
 EXPORT_SYMBOL_GPL(of_scan_bus);
 
@@ -390,7 +390,7 @@  EXPORT_SYMBOL_GPL(of_scan_bus);
  */
 void of_rescan_bus(struct device_node *node, struct pci_bus *bus)
 {
-	__of_scan_bus(node, bus, 1);
+	__of_scan_bus(node, bus);
 }
 EXPORT_SYMBOL_GPL(of_rescan_bus);