[PATCH v2] driver core: Move device_links_purge() after bus_remove_device()

[PATCH v2] driver core: Move device_links_purge() after bus_remove_device()

[Jeffy Chen]

The current ordering of code in device_del() triggers a WARN_ON()
in device_links_purge(), because of an unexpected link status.

The device_links_unbind_consumers() call in device_release_driver()
has to take place before device_links_purge() for the status of all
links to be correct, so move the device_links_purge() call in
device_del() after the invocation of bus_remove_device() which calls
device_release_driver().

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---

Changes in v2:
Update commit message provided by Rafael.

 drivers/base/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 12ebd055724c..2e683cdf4a08 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1958,7 +1958,6 @@ void device_del(struct device *dev)
 		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
 					     BUS_NOTIFY_DEL_DEVICE, dev);
 
-	device_links_purge(dev);
 	dpm_sysfs_remove(dev);
 	if (parent)
 		klist_del(&dev->p->knode_parent);
@@ -1986,6 +1985,7 @@ void device_del(struct device *dev)
 	device_pm_remove(dev);
 	driver_deferred_probe_del(dev);
 	device_remove_properties(dev);
+	device_links_purge(dev);
 
 	/* Notify the platform of the removal, in case they
 	 * need to do anything...
-- 
2.11.0

Re: [PATCH v2] driver core: Move device_links_purge() after bus_remove_device()

[Rafael J. Wysocki]

On 10/19/2017 3:32 AM, Jeffy Chen wrote:
> The current ordering of code in device_del() triggers a WARN_ON()
> in device_links_purge(), because of an unexpected link status.
>
> The device_links_unbind_consumers() call in device_release_driver()
> has to take place before device_links_purge() for the status of all
> links to be correct, so move the device_links_purge() call in
> device_del() after the invocation of bus_remove_device() which calls
> device_release_driver().
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

It has not been signed off by me, so you should not have added the line 
above.

> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>

For the patch itself and the changelog *except* for the S-o-b line:

Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

> ---
>
> Changes in v2:
> Update commit message provided by Rafael.
>
>   drivers/base/core.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/base/core.c b/drivers/base/core.c
> index 12ebd055724c..2e683cdf4a08 100644
> --- a/drivers/base/core.c
> +++ b/drivers/base/core.c
> @@ -1958,7 +1958,6 @@ void device_del(struct device *dev)
>   		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,
>   					     BUS_NOTIFY_DEL_DEVICE, dev);
>   
> -	device_links_purge(dev);
>   	dpm_sysfs_remove(dev);
>   	if (parent)
>   		klist_del(&dev->p->knode_parent);
> @@ -1986,6 +1985,7 @@ void device_del(struct device *dev)
>   	device_pm_remove(dev);
>   	driver_deferred_probe_del(dev);
>   	device_remove_properties(dev);
> +	device_links_purge(dev);
>   
>   	/* Notify the platform of the removal, in case they
>   	 * need to do anything...

Re: [PATCH v2] driver core: Move device_links_purge() after bus_remove_device()

[jeffy]

Hi Rafael,

On 10/19/2017 10:56 PM, Rafael J. Wysocki wrote:
>>
>> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> It has not been signed off by me, so you should not have added the line
> above.
>
>> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
>
> For the patch itself and the changelog *except* for the S-o-b line:
>
> Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

sorry, will remove it in next version :)