PM: add: move warn message out of mutex lock.
Subsystems (4)
PATCH 1/1 PM: add: move warn message out of mutex lock.
dpm_list_mtx does not protect any data used by dev_warn for checking parent's power, move dev_warn out of mutex lock block make the lock more efficient, especially when the warn is triggered. This can happen on some HW when resume from suspend with USB camera opened:
Quoted 3 lines
usb 3-1.1: reset high-speed USB device number 4 using
xhci_hcd..ep_81: PM: parent 3-1.1:1.1 should not be sleeping
--- drivers/base/power/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/power/main.c +1 -1
@@ -134,10 +134,10 @@ void device_pm_add(struct device *dev)pr_debug ("Adding info for %s:%s\n" , dev->bus ? dev->bus->name :"No Bus" ,dev_name (dev));device_pm_check_callbacks (dev); -mutex_lock (&dpm_list_mtx);if (dev->parent && dev->parent->power.is_prepared)dev_warn (dev,"parent %s should not be sleeping\n" ,dev_name (dev->parent)); +mutex_lock (&dpm_list_mtx);list_add_tail (&dev->power.entry, &dpm_list); dev->power.in_dpm_list = true;mutex_unlock (&dpm_list_mtx);
Signature · 1 line
2.39.2
Greg KH
maintainerQuoted 6 lines · David Wang
dpm_list_mtxdoes not protect any data used bydev_warnfor checking parent's power, movedev_warnout of mutex lock block make the lock more efficient, especially when the warn is triggered. This can happen on some HW when resume from suspend with USB camera opened:
Please wrap changelog lines at 72 columns if possible.
Quoted 14 lines
Quoted 3 lines
usb 3-1.1: reset high-speed USB device number 4 using
xhci_hcd..ep_81: PM: parent 3-1.1:1.1 should not be sleepingSigned-off-by David Wang <[email protected]>--- drivers/base/power/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/base/power/main.c +0
-0
drivers/base/power/main.c void device_pm_add(struct device *dev) · line 140
Quoted 8 lines
drivers/base/power/main.c +1
-1@@ -134,10 +134,10 @@ void device_pm_add(struct device *dev)pr_debug ("Adding info for %s:%s\n" , dev->bus ? dev->bus->name :"No Bus" ,dev_name (dev));device_pm_check_callbacks (dev); -mutex_lock (&dpm_list_mtx);if (dev->parent && dev->parent->power.is_prepared)dev_warn (dev,"parent %s should not be sleeping\n" ,dev_name (dev->parent)); +mutex_lock (&dpm_list_mtx);
I do not understand how this change will remove the offending log message. It should be safe to hold the lock while the check happens and the message is printed out, you should not see any functional change at all.
So are you sure this is needed?
thanks,
greg k-h
Hi,
Thanks for reviewing~
Quoted 38 lines · Greg KH
Quoted 6 lines · David Wang
dpm_list_mtxdoes not protect any data used bydev_warnfor checking parent's power, movedev_warnout of mutex lock block make the lock more efficient, especially when the warn is triggered. This can happen on some HW when resume from suspend with USB camera opened:Please wrap changelog lines at 72 columns if possible.
Quoted 14 lines
Quoted 3 lines
usb 3-1.1: reset high-speed USB device number 4 using
xhci_hcd..ep_81: PM: parent 3-1.1:1.1 should not be sleepingSigned-off-by David Wang <[email protected]>--- drivers/base/power/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/base/power/main.c +0
-0drivers/base/power/main.c void device_pm_add(struct device *dev) · line 140
Quoted 8 lines
drivers/base/power/main.c +1
-1@@ -134,10 +134,10 @@ void device_pm_add(struct device *dev)pr_debug ("Adding info for %s:%s\n" , dev->bus ? dev->bus->name :"No Bus" ,dev_name (dev));device_pm_check_callbacks (dev); -mutex_lock (&dpm_list_mtx);if (dev->parent && dev->parent->power.is_prepared)dev_warn (dev,"parent %s should not be sleeping\n" ,dev_name (dev->parent)); +mutex_lock (&dpm_list_mtx);I do not understand how this change will remove the offending log message. It should be safe to hold the lock while the check happens and the message is printed out, you should not see any functional change at all.
Quoted 1 line
So are you sure this is needed?
This patch does not fix anything, the warning is still there and indeed no functional change at all. It is more of a code refactor: when I follow the kernel warn on my system and check the code, I feel its better to move dev_warn out of the lock section since the lock is not meant to protect it, right? And I mention the warning message in the commit log because I think it would make the lock-holding unnecessarily longer when the warning do happen.
Quoted 4 lines
thanks,
greg k-h
Rafael J. Wysocki
maintainerQuoted 6 lines · David Wang
dpm_list_mtxdoes not protect any data used bydev_warnfor checking parent's power, movedev_warnout of mutex lock block make the lock more efficient, especially when the warn is triggered.
It does protect the power.is_prepared flag of the parent.
Rafael J. Wysocki
maintainerQuoted 10 lines · Rafael J. Wysocki
Quoted 6 lines · David Wang
dpm_list_mtxdoes not protect any data used bydev_warnfor checking parent's power, movedev_warnout of mutex lock block make the lock more efficient, especially when the warn is triggered.It does protect the power.is_prepared flag of the parent.
In fact, the update of it in device_resume() is racy with respect to the check in device_pm_add(), but the purpose of it is mostly to allow the device driver's resume callback to add children without triggering the warning.
Hi,
Quoted 10 lines · Rafael J. Wysocki
Quoted 9 lines · Rafael J. Wysocki
Quoted 6 lines · David Wang
dpm_list_mtxdoes not protect any data used bydev_warnfor checking parent's power, movedev_warnout of mutex lock block make the lock more efficient, especially when the warn is triggered.
Quoted 6 lines
Quoted 1 line
It does protect the power.is_prepared flag of the parent.
In fact, the update of it in
device_resume()is racy with respect to the check indevice_pm_add(), but the purpose of it is mostly to allow the device driver's resume callback to add children without triggering the warning.
Kind of confused by this... if dpm_list_mtx could protect power.is_prepared, then codes that change power.is_prepared should also hold this lock, but normally they only use device_lock(dev);
David
Rafael J. Wysocki
maintainerQuoted 22 lines · David Wang
Hi,
Quoted 10 lines · Rafael J. Wysocki
Quoted 9 lines · Rafael J. Wysocki
Quoted 6 lines · David Wang
dpm_list_mtxdoes not protect any data used bydev_warnfor checking parent's power, movedev_warnout of mutex lock block make the lock more efficient, especially when the warn is triggered.Quoted 6 lines
Quoted 1 line
It does protect the power.is_prepared flag of the parent.
In fact, the update of it in
device_resume()is racy with respect to the check indevice_pm_add(), but the purpose of it is mostly to allow the device driver's resume callback to add children without triggering the warning.
Quoted 3 lines
Kind of confused by this... if
dpm_list_mtxcould protect power.is_prepared, then codes that change power.is_prepared should also hold this lock, but normally they only usedevice_lock(dev);
It is confusing, sorry about that.
The bottom line though is that you want to get rid of the spurious warning in device_pm_add() AFAICS.
To that end, can you please try the patch I sent in the other thread:
https://lore.kernel.org/linux-pm/CAJZ5v0hMnnDjKJLMgcT_p1nnejyyAyaqaA_AF5t+_=PsSMfceQ@mail.gmail.com/
Quoted 29 lines · Rafael J. Wysocki
Quoted 22 lines · David Wang
Hi,
Quoted 10 lines · Rafael J. Wysocki
Quoted 9 lines · Rafael J. Wysocki
Quoted 6 lines · David Wang
dpm_list_mtxdoes not protect any data used bydev_warnfor checking parent's power, movedev_warnout of mutex lock block make the lock more efficient, especially when the warn is triggered.Quoted 6 lines
Quoted 1 line
It does protect the power.is_prepared flag of the parent.
In fact, the update of it in
device_resume()is racy with respect to the check indevice_pm_add(), but the purpose of it is mostly to allow the device driver's resume callback to add children without triggering the warning.Quoted 3 lines
Kind of confused by this... if
dpm_list_mtxcould protect power.is_prepared, then codes that change power.is_prepared should also hold this lock, but normally they only usedevice_lock(dev);It is confusing, sorry about that.
Quoted 7 lines
The bottom line though is that you want to get rid of the spurious warning in
device_pm_add()AFAICS.To that end, can you please try the patch I sent in the other thread:
https://lore.kernel.org/linux-pm/CAJZ5v0hMnnDjKJLMgcT_p1nnejyyAyaqaA_AF5t+_=PsSMfceQ@mail.gmail.com/
Sure, I will try it and update later.
But this patch is just about code-refactor, not about the warn itself.....
David