PM: sleep: core: Restrict power.set_active propagation
Subsystems (6)
PATCH 1/1 PM: sleep: core: Restrict power.set_active propagation
From: Rafael J. Wysocki <[email protected]>
Commit 3775fc538f53 ("PM: sleep: core: Synchronize runtime PM status of parents and children") exposed an issue related to simple_pm_bus_pm_ops that uses pm_runtime_force_suspend() and pm_runtime_force_resume() as bus type PM callbacks for the noirq phases of system-wide suspend and resume.
The problem is that pm_runtime_force_suspend() does not distinguish runtime-suspended devices from devices for which runtime PM has never been enabled, so if it sees a device with runtime PM status set to RPM_ACTIVE, it will assume that runtime PM is enabled for that device and so it will attempt to suspend it with the help of its runtime PM callbacks which may not be ready for that. As it turns out, this causes simple_pm_bus_runtime_suspend() to crash due to a NULL pointer dereference.
Another problem related to the above commit and simple_pm_bus_pm_ops is that setting runtime PM status of a device handled by the latter to RPM_ACTIVE will actually prevent it from being resumed because pm_runtime_force_resume() only resumes devices with runtime PM status set to RPM_SUSPENDED.
To mitigate these issues, do not allow power.set_active to propagate beyond the parent of the device with DPM_FLAG_SMART_SUSPEND set that will need to be resumed, which should be a sufficient stop-gap for the time being, but they will need to be properly addressed in the future because in general during system-wide resume it is necessary to resume all devices in a dependency chain in which at least one device is going to be resumed.
--- drivers/base/power/main.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/base/power/main.c +9 -12
@@ -1191,24 +1191,18 @@return PMSG_ON ; } -static void dpm_superior_set_must_resume (struct device *dev,bool set_active) +static void dpm_superior_set_must_resume (struct device *dev) {struct device_link *link;int idx; -if (dev->parent) { +if (dev->parent) dev->parent->power.must_resume = true; -if (set_active) - dev->parent->power.set_active = true; - } idx =device_links_read_lock (); -list_for_each_entry_rcu_locked (link, &dev->links.suppliers, c_node) { +list_for_each_entry_rcu_locked (link, &dev->links.suppliers, c_node) link->supplier->power.must_resume = true; -if (set_active) - link->supplier->power.set_active = true; - }device_links_read_unlock (idx); }
@@ -1287,9 +1281,12 @@ dev->power.must_resume = true;if (dev->power.must_resume) { - dev->power.set_active = dev->power.set_active || -dev_pm_test_driver_flags (dev,DPM_FLAG_SMART_SUSPEND ); -dpm_superior_set_must_resume (dev, dev->power.set_active); +if (dev_pm_test_driver_flags (dev,DPM_FLAG_SMART_SUSPEND )) { + dev->power.set_active = true; +if (dev->parent && !dev->parent->power.ignore_children) + dev->parent->power.set_active = true; + } +dpm_superior_set_must_resume (dev); } Complete:
Johan Hovold
maintainerQuoted 6 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
3775fc538f53("PM: sleep: core: Synchronize runtime PM status of parents and children") exposed an issue related tosimple_pm_bus_pm_opsthat usespm_runtime_force_suspend()andpm_runtime_force_resume()as bus type PM callbacks for the noirq phases of system-wide suspend and
Despite the name of the driver these are plain device driver PM callbacks (not bus PM ops).
Quoted 17 lines
resume.
The problem is that
pm_runtime_force_suspend()does not distinguish runtime-suspended devices from devices for which runtime PM has never been enabled, so if it sees a device with runtime PM status set toRPM_ACTIVE, it will assume that runtime PM is enabled for that device and so it will attempt to suspend it with the help of its runtime PM callbacks which may not be ready for that. As it turns out, this causessimple_pm_bus_runtime_suspend()to crash due to a NULL pointer dereference.Another problem related to the above commit and
simple_pm_bus_pm_opsis that setting runtime PM status of a device handled by the latter toRPM_ACTIVEwill actually prevent it from being resumed becausepm_runtime_force_resume()only resumes devices with runtime PM status set toRPM_SUSPENDED.
Quoted 7 lines
To mitigate these issues, do not allow power.set_active to propagate beyond the parent of the device with
DPM_FLAG_SMART_SUSPENDset that will need to be resumed, which should be a sufficient stop-gap for the time being, but they will need to be properly addressed in the future because in general during system-wide resume it is necessary to resume all devices in a dependency chain in which at least one device is going to be resumed.
So this works as long as no parent of a device with DPM_FLAG_SMART_SUSPEND set is using pm_runtime_force_resume().
This is the case in the systems I work on, but have you verified that this is currently generally true? Not many drivers use this flag, but it all depends on what their devices' parents' drivers do:
drivers/acpi/acpi_tad.c drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c drivers/i2c/busses/i2c-designware-platdrv.c drivers/mfd/intel-lpss.c drivers/pci/pcie/portdrv.c drivers/pwm/pwm-lpss-platform.c drivers/soundwire/intel_auxdevice.c
Most of these look like ACPI drivers so nothing that would sit directly on a simple-pm-bus at least.
Quoted 5 lines
Fixes 3775fc538f53 ("PM: sleep: core: Synchronize runtime PM status of parents and children")Reported-by Jon Hunter <[email protected]>Tested-by Johan Hovold <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
Johan
Rafael J. Wysocki
maintainerQuoted 11 lines · Johan Hovold
Quoted 6 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
3775fc538f53("PM: sleep: core: Synchronize runtime PM status of parents and children") exposed an issue related tosimple_pm_bus_pm_opsthat usespm_runtime_force_suspend()andpm_runtime_force_resume()as bus type PM callbacks for the noirq phases of system-wide suspend andDespite the name of the driver these are plain device driver PM callbacks (not bus PM ops).
Right, I was confused.
BTW, I still think that it is invalid to use pm_runtime_force_suspend() and pm_runtime_force_resume() as system-wide PM callbacks without enabling runtime PM. The system-wide PM callbacks should be wrappers around these checking something (eg. dev_get_drvdata(dev)) other than dev->power.runtime_status. It is too fragile the current way.
Quoted 41 lines
Quoted 17 lines
resume.
The problem is that
pm_runtime_force_suspend()does not distinguish runtime-suspended devices from devices for which runtime PM has never been enabled, so if it sees a device with runtime PM status set toRPM_ACTIVE, it will assume that runtime PM is enabled for that device and so it will attempt to suspend it with the help of its runtime PM callbacks which may not be ready for that. As it turns out, this causessimple_pm_bus_runtime_suspend()to crash due to a NULL pointer dereference.Another problem related to the above commit and
simple_pm_bus_pm_opsis that setting runtime PM status of a device handled by the latter toRPM_ACTIVEwill actually prevent it from being resumed becausepm_runtime_force_resume()only resumes devices with runtime PM status set toRPM_SUSPENDED.Quoted 7 lines
To mitigate these issues, do not allow power.set_active to propagate beyond the parent of the device with
DPM_FLAG_SMART_SUSPENDset that will need to be resumed, which should be a sufficient stop-gap for the time being, but they will need to be properly addressed in the future because in general during system-wide resume it is necessary to resume all devices in a dependency chain in which at least one device is going to be resumed.So this works as long as no parent of a device with
DPM_FLAG_SMART_SUSPENDset is usingpm_runtime_force_resume().This is the case in the systems I work on, but have you verified that this is currently generally true? Not many drivers use this flag, but it all depends on what their devices' parents' drivers do:
drivers/acpi/acpi_tad.cdrivers/gpu/drm/amd/amdgpu/amdgpu_drv.cdrivers/i2c/busses/i2c-designware-platdrv.cdrivers/mfd/intel-lpss.cdrivers/pci/pcie/portdrv.cdrivers/pwm/pwm-lpss-platform.cdrivers/soundwire/intel_auxdevice.c
Quoted 2 lines
Most of these look like ACPI drivers so nothing that would sit directly on a simple-pm-bus at least.
I'm not worried about these.
Also, I have a patch series to get the power.set_active propagation into agreement with pm_runtime_force_suspend/resume(). I'll post it tomorrow.
Quoted 32 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
3775fc538f53("PM: sleep: core: Synchronize runtime PM status of parents and children") exposed an issue related tosimple_pm_bus_pm_opsthat usespm_runtime_force_suspend()andpm_runtime_force_resume()as bus type PM callbacks for the noirq phases of system-wide suspend and resume.The problem is that
pm_runtime_force_suspend()does not distinguish runtime-suspended devices from devices for which runtime PM has never been enabled, so if it sees a device with runtime PM status set toRPM_ACTIVE, it will assume that runtime PM is enabled for that device and so it will attempt to suspend it with the help of its runtime PM callbacks which may not be ready for that. As it turns out, this causessimple_pm_bus_runtime_suspend()to crash due to a NULL pointer dereference.Another problem related to the above commit and
simple_pm_bus_pm_opsis that setting runtime PM status of a device handled by the latter toRPM_ACTIVEwill actually prevent it from being resumed becausepm_runtime_force_resume()only resumes devices with runtime PM status set toRPM_SUSPENDED.To mitigate these issues, do not allow power.set_active to propagate beyond the parent of the device with
DPM_FLAG_SMART_SUSPENDset that will need to be resumed, which should be a sufficient stop-gap for the time being, but they will need to be properly addressed in the future because in general during system-wide resume it is necessary to resume all devices in a dependency chain in which at least one device is going to be resumed.
Quoted 5 lines
Fixes 3775fc538f53 ("PM: sleep: core: Synchronize runtime PM status of parents and children")Reported-by Jon Hunter <[email protected]>Tested-by Johan Hovold <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
Kind regards
Uffe
Quoted 53 lines
--- drivers/base/power/main.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)drivers/base/power/main.c +9
-12@@ -1191,24 +1191,18 @@return PMSG_ON ; } -static void dpm_superior_set_must_resume (struct device *dev,bool set_active) +static void dpm_superior_set_must_resume (struct device *dev) {struct device_link *link;int idx; -if (dev->parent) { +if (dev->parent) dev->parent->power.must_resume = true; -if (set_active) - dev->parent->power.set_active = true; - } idx =device_links_read_lock (); -list_for_each_entry_rcu_locked (link, &dev->links.suppliers, c_node) { +list_for_each_entry_rcu_locked (link, &dev->links.suppliers, c_node) link->supplier->power.must_resume = true; -if (set_active) - link->supplier->power.set_active = true; - }device_links_read_unlock (idx); }@@ -1287,9 +1281,12 @@ dev->power.must_resume = true;if (dev->power.must_resume) { - dev->power.set_active = dev->power.set_active || -dev_pm_test_driver_flags (dev,DPM_FLAG_SMART_SUSPEND ); -dpm_superior_set_must_resume (dev, dev->power.set_active); +if (dev_pm_test_driver_flags (dev,DPM_FLAG_SMART_SUSPEND )) { + dev->power.set_active = true; +if (dev->parent && !dev->parent->power.ignore_children) + dev->parent->power.set_active = true; + } +dpm_superior_set_must_resume (dev); } Complete:
Quoted 77 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
3775fc538f53("PM: sleep: core: Synchronize runtime PM status of parents and children") exposed an issue related tosimple_pm_bus_pm_opsthat usespm_runtime_force_suspend()andpm_runtime_force_resume()as bus type PM callbacks for the noirq phases of system-wide suspend and resume.The problem is that
pm_runtime_force_suspend()does not distinguish runtime-suspended devices from devices for which runtime PM has never been enabled, so if it sees a device with runtime PM status set toRPM_ACTIVE, it will assume that runtime PM is enabled for that device and so it will attempt to suspend it with the help of its runtime PM callbacks which may not be ready for that. As it turns out, this causessimple_pm_bus_runtime_suspend()to crash due to a NULL pointer dereference.Another problem related to the above commit and
simple_pm_bus_pm_opsis that setting runtime PM status of a device handled by the latter toRPM_ACTIVEwill actually prevent it from being resumed becausepm_runtime_force_resume()only resumes devices with runtime PM status set toRPM_SUSPENDED.To mitigate these issues, do not allow power.set_active to propagate beyond the parent of the device with
DPM_FLAG_SMART_SUSPENDset that will need to be resumed, which should be a sufficient stop-gap for the time being, but they will need to be properly addressed in the future because in general during system-wide resume it is necessary to resume all devices in a dependency chain in which at least one device is going to be resumed.Fixes 3775fc538f53 ("PM: sleep: core: Synchronize runtime PM status of parents and children")Reported-by Jon Hunter <[email protected]>Tested-by Johan Hovold <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>--- drivers/base/power/main.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)drivers/base/power/main.c +3
-11@@ -1191,24 +1191,18 @@return PMSG_ON ; } -static void dpm_superior_set_must_resume (struct device *dev,bool set_active) +static void dpm_superior_set_must_resume (struct device *dev) {struct device_link *link;int idx; -if (dev->parent) { +if (dev->parent) dev->parent->power.must_resume = true; -if (set_active) - dev->parent->power.set_active = true; - } idx =device_links_read_lock (); -list_for_each_entry_rcu_locked (link, &dev->links.suppliers, c_node) { +list_for_each_entry_rcu_locked (link, &dev->links.suppliers, c_node) link->supplier->power.must_resume = true; -if (set_active) - link->supplier->power.set_active = true; - }device_links_read_unlock (idx); }@@ -1287,9 +1281,12 @@ dev->power.must_resume = true;if (dev->power.must_resume) { - dev->power.set_active = dev->power.set_active || -dev_pm_test_driver_flags (dev,DPM_FLAG_SMART_SUSPEND );
drivers/base/power/main.c line 1292
Quoted 10 lines
drivers/base/power/main.c +6
-1-dpm_superior_set_must_resume (dev, dev->power.set_active); +if (dev_pm_test_driver_flags (dev,DPM_FLAG_SMART_SUSPEND )) { + dev->power.set_active = true; +if (dev->parent && !dev->parent->power.ignore_children) + dev->parent->power.set_active = true; + } +dpm_superior_set_must_resume (dev); } Complete:
Thanks for fixing!
Jon
Signature · 1 line
nvpublic