From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM <linux-pm@vger.kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
x86 Maintainers <x86@kernel.org>,
Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com>,
"Gautham R. Shenoy" <gautham.shenoy@amd.com>,
Artem Bityutskiy <artem.bityutskiy@linux.intel.com>,
Mario Limonciello <mario.limonciello@amd.com>,
Linux ACPI <linux-acpi@vger.kernel.org>
Subject: [PATCH v2 1/2] cpuidle: Do not return from cpuidle_play_dead() on callback failures
Date: Fri, 15 Nov 2024 21:58:31 +0100 [thread overview]
Message-ID: <3318440.aeNJFYEL58@rjwysocki.net> (raw)
In-Reply-To: <13636465.uLZWGnKmhe@rjwysocki.net>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
If the :enter_dead() idle state callback fails for a certain state,
there may be still a shallower state for which it will work.
Because the only caller of cpuidle_play_dead(), native_play_dead(),
falls back to hlt_play_dead() if it returns an error, it should
better try all of the idle states for which :enter_dead() is present
before failing, so change it accordingly.
Also notice that the :enter_dead() state callback is not expected
to return on success (the CPU should be "dead" then), so make
cpuidle_play_dead() ignore its return value.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Tested-by: Mario Limonciello <mario.limonciello@amd.com> # 6.12-rc7
---
v1 -> v2:
* Make cpuidle_play_dead() never return 0.
* Add tags from Mario (I have added them because the change of the patch
should not make a practical difference, but if you want them to be
dropped, please let me know).
---
drivers/cpuidle/cpuidle.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
Index: linux-pm/drivers/cpuidle/cpuidle.c
===================================================================
--- linux-pm.orig/drivers/cpuidle/cpuidle.c
+++ linux-pm/drivers/cpuidle/cpuidle.c
@@ -69,11 +69,15 @@ int cpuidle_play_dead(void)
if (!drv)
return -ENODEV;
- /* Find lowest-power state that supports long-term idle */
- for (i = drv->state_count - 1; i >= 0; i--)
+ for (i = drv->state_count - 1; i >= 0; i--) {
if (drv->states[i].enter_dead)
- return drv->states[i].enter_dead(dev, i);
+ drv->states[i].enter_dead(dev, i);
+ }
+ /*
+ * If :enter_dead() is successful, it will never return, so reaching
+ * here means that all of them failed above or were not present.
+ */
return -ENODEV;
}
next prev parent reply other threads:[~2024-11-15 21:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-15 20:57 [PATCH v2 0/2] cpuidle: Do not return from cpuidle_play_dead() on callback failures Rafael J. Wysocki
2024-11-15 20:58 ` Rafael J. Wysocki [this message]
2024-11-19 14:04 ` [PATCH v2 1/2] " Gautham R. Shenoy
2024-11-15 21:00 ` [PATCH v2 2/2] cpuidle: Change :enter_dead() driver callback return type to void Rafael J. Wysocki
2024-11-19 15:09 ` Gautham R. Shenoy
2024-11-19 16:05 ` Mario Limonciello
2024-11-19 17:13 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3318440.aeNJFYEL58@rjwysocki.net \
--to=rjw@rjwysocki.net \
--cc=artem.bityutskiy@linux.intel.com \
--cc=gautham.shenoy@amd.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=patryk.wlazlyn@linux.intel.com \
--cc=peterz@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox