Skip to contentSkip to conversation

PM: sleep: core: Avoid setting power.must_resume to false

PATCH Superseded Prasad Sodagudi 3 participants 4 messages Aug 23, 2021 – Aug 27, 2021

Subsystems (4)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 PM: sleep: core: Avoid setting power.must_resume to false

There are variables(power.may_skip_resume and dev->power.must_resume) and DPM_FLAG_MAY_SKIP_RESUME flags to control the resume of devices after a system wide suspend transition.

Setting the DPM_FLAG_MAY_SKIP_RESUME flag means that the driver allows its "noirq" and "early" resume callbacks to be skipped if the device can be left in suspend after a system-wide transition into the working state. PM core determines that the driver's "noirq" and "early" resume callbacks should be skipped or not with dev_pm_skip_resume() function by checking power.may_skip_resume variable.

power.must_resume variable is getting set to false in __device_suspend() function without checking device's DPM_FLAG_MAY_SKIP_RESUME settings. In problematic scenario, where all the devices in the suspend_late stage are successful and some device can fail to suspend in suspend_noirq phase. So some devices successfully suspended in suspend_late stage are not getting chance to execute __device_suspend_noirq() to set dev->power.must_resume variable to true and not getting resumed in early_resume phase.

Add a check for device's DPM_FLAG_MAY_SKIP_RESUME flag before setting power.must_resume variable in __device_suspend function.

Fixes 6e176bf8d461 ("PM: sleep: core: Do not skip callbacks in the resume phase")

---
V3 -> V4: Remove dev->power.usage_count variable check V2 -> V3: Format issues patch posting
V1 -> V2: Fixed indentation and commit text to include scenario

 drivers/base/power/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/power/main.c +4 -1
index d568772..50e8ea3 100644
@@ -1642,7 +1642,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
 	}
 
 	dev->power.may_skip_resume = true;
-	dev->power.must_resume = false;
+	if (dev_pm_test_driver_flags(dev, DPM_FLAG_MAY_SKIP_RESUME))
+		dev->power.must_resume = false;
+	else
+		dev->power.must_resume = true;
 
 	dpm_watchdog_set(&wd, dev);
 	device_lock(dev);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
maintainer
#1 lore raw
Quoted 38 lines · Prasad Sodagudi

There are variables(power.may_skip_resume and dev->power.must_resume) and DPM_FLAG_MAY_SKIP_RESUME flags to control the resume of devices after a system wide suspend transition.

Setting the DPM_FLAG_MAY_SKIP_RESUME flag means that the driver allows its "noirq" and "early" resume callbacks to be skipped if the device can be left in suspend after a system-wide transition into the working state. PM core determines that the driver's "noirq" and "early" resume callbacks should be skipped or not with dev_pm_skip_resume() function by checking power.may_skip_resume variable.

power.must_resume variable is getting set to false in __device_suspend() function without checking device's DPM_FLAG_MAY_SKIP_RESUME settings. In problematic scenario, where all the devices in the suspend_late stage are successful and some device can fail to suspend in suspend_noirq phase. So some devices successfully suspended in suspend_late stage are not getting chance to execute __device_suspend_noirq() to set dev->power.must_resume variable to true and not getting resumed in early_resume phase.

Add a check for device's DPM_FLAG_MAY_SKIP_RESUME flag before setting power.must_resume variable in __device_suspend function.

Fixes 6e176bf8d461 ("PM: sleep: core: Do not skip callbacks in the resume phase")

---
V3 -> V4: Remove dev->power.usage_count variable check V2 -> V3: Format issues patch posting
V1 -> V2: Fixed indentation and commit text to include scenario

 drivers/base/power/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/power/main.c +0 -0
index d568772..50e8ea3 100644
@@ -1642,7 +1642,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
 	}

drivers/base/power/main.c static int __device_suspend(struct device *dev, pm_message_t state, bool async) · line 1651

Quoted 10 lines
drivers/base/power/main.c +4 -1
 
 	dev->power.may_skip_resume = true;
-	dev->power.must_resume = false;
+	if (dev_pm_test_driver_flags(dev, DPM_FLAG_MAY_SKIP_RESUME))
+		dev->power.must_resume = false;
+	else
+		dev->power.must_resume = true;
 
 	dpm_watchdog_set(&wd, dev);
 	device_lock(dev);

Seems sane, Rafael, any comments?

thanks,

greg k-h

#2 lore raw
Quoted 48 lines · Greg KH
Quoted 46 lines · Prasad Sodagudi

There are variables(power.may_skip_resume and dev->power.must_resume) and DPM_FLAG_MAY_SKIP_RESUME flags to control the resume of devices after a system wide suspend transition.

Setting the DPM_FLAG_MAY_SKIP_RESUME flag means that the driver allows its "noirq" and "early" resume callbacks to be skipped if the device can be left in suspend after a system-wide transition into the working state. PM core determines that the driver's "noirq" and "early" resume callbacks should be skipped or not with dev_pm_skip_resume() function by checking power.may_skip_resume variable.

power.must_resume variable is getting set to false in __device_suspend() function without checking device's DPM_FLAG_MAY_SKIP_RESUME settings. In problematic scenario, where all the devices in the suspend_late stage are successful and some device can fail to suspend in suspend_noirq phase. So some devices successfully suspended in suspend_late stage are not getting chance to execute __device_suspend_noirq() to set dev->power.must_resume variable to true and not getting resumed in early_resume phase.

Add a check for device's DPM_FLAG_MAY_SKIP_RESUME flag before setting power.must_resume variable in __device_suspend function.

Fixes 6e176bf8d461 ("PM: sleep: core: Do not skip callbacks in the resume phase")

---
V3 -> V4: Remove dev->power.usage_count variable check V2 -> V3: Format issues patch posting
V1 -> V2: Fixed indentation and commit text to include scenario

 drivers/base/power/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/power/main.c +4 -1
index d568772..50e8ea3 100644
@@ -1642,7 +1642,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
      }
 
      dev->power.may_skip_resume = true;
-     dev->power.must_resume = false;
+     if (dev_pm_test_driver_flags(dev, DPM_FLAG_MAY_SKIP_RESUME))
+             dev->power.must_resume = false;
+     else
+             dev->power.must_resume = true;
 
Quoted 4 lines

drivers/base/power/main.c static int __device_suspend(struct device *dev, pm_message_t state, bool async) · line 1651

Quoted 2 lines
drivers/base/power/main.c +0 -0
      dpm_watchdog_set(&wd, dev);
      device_lock(dev);

Seems sane, Rafael, any comments?

Yup, please see my response:
https://lore.kernel.org/linux-pm/CAJZ5v0hAuZmaB6j4qA7P43J4TshBrYa8UsX3KtH7hkxWZPU2wA@mail.gmail.com/T/#t

Cheers!

#3 lore raw
In reply to Prasad Sodagudi
Quoted 38 lines · Prasad Sodagudi

There are variables(power.may_skip_resume and dev->power.must_resume) and DPM_FLAG_MAY_SKIP_RESUME flags to control the resume of devices after a system wide suspend transition.

Setting the DPM_FLAG_MAY_SKIP_RESUME flag means that the driver allows its "noirq" and "early" resume callbacks to be skipped if the device can be left in suspend after a system-wide transition into the working state. PM core determines that the driver's "noirq" and "early" resume callbacks should be skipped or not with dev_pm_skip_resume() function by checking power.may_skip_resume variable.

power.must_resume variable is getting set to false in __device_suspend() function without checking device's DPM_FLAG_MAY_SKIP_RESUME settings. In problematic scenario, where all the devices in the suspend_late stage are successful and some device can fail to suspend in suspend_noirq phase. So some devices successfully suspended in suspend_late stage are not getting chance to execute __device_suspend_noirq() to set dev->power.must_resume variable to true and not getting resumed in early_resume phase.

Add a check for device's DPM_FLAG_MAY_SKIP_RESUME flag before setting power.must_resume variable in __device_suspend function.

Fixes 6e176bf8d461 ("PM: sleep: core: Do not skip callbacks in the resume phase")

---
V3 -> V4: Remove dev->power.usage_count variable check V2 -> V3: Format issues patch posting
V1 -> V2: Fixed indentation and commit text to include scenario

 drivers/base/power/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/base/power/main.c +0 -0
index d568772..50e8ea3 100644

drivers/base/power/main.c static int __device_suspend(struct device *dev, pm_message_t state, bool async) · line 1648

Quoted 8 lines
drivers/base/power/main.c +4 -1
@@ -1642,7 +1642,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
        }
 
        dev->power.may_skip_resume = true;
-       dev->power.must_resume = false;
+       if (dev_pm_test_driver_flags(dev, DPM_FLAG_MAY_SKIP_RESUME))
+               dev->power.must_resume = false;
+       else
+               dev->power.must_resume = true;

Why don't you write it as

dev->power.must_resume = !dev_pm_test_driver_flags(dev, DPM_FLAG_MAY_SKIP_RESUME);

Quoted 7 lines
drivers/base/power/main.c +0 -1
        dpm_watchdog_set(&wd, dev);
        device_lock(dev);
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project