From: Patryk Wlazlyn <patryk.wlazlyn@linux.intel.com>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
rafael.j.wysocki@intel.com, len.brown@intel.com,
artem.bityutskiy@linux.intel.com, dave.hansen@linux.intel.com,
patryk.wlazlyn@linux.intel.com, peterz@infradead.org,
tglx@linutronix.de, gautham.shenoy@amd.com
Subject: [RFC PATCH v4 1/8] cpuidle: Do not return from cpuidle_play_dead() on callback failures
Date: Mon, 25 Nov 2024 14:20:21 +0100 [thread overview]
Message-ID: <20241125132029.7241-2-patryk.wlazlyn@linux.intel.com> (raw)
In-Reply-To: <20241125132029.7241-1-patryk.wlazlyn@linux.intel.com>
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
Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
---
drivers/cpuidle/cpuidle.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 06ace16f9e71..0835da449db8 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/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;
}
--
2.47.0
next prev parent reply other threads:[~2024-11-25 13:20 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-25 13:20 [RFC PATCH v4 0/8] SRF: Fix offline CPU preventing pc6 entry Patryk Wlazlyn
2024-11-25 13:20 ` Patryk Wlazlyn [this message]
2024-11-25 13:26 ` [RFC PATCH v4 1/8] cpuidle: Do not return from cpuidle_play_dead() on callback failures Rafael J. Wysocki
2024-11-25 14:36 ` Patryk Wlazlyn
2024-11-25 13:20 ` [RFC PATCH v4 2/8] cpuidle: Change :enter_dead() driver callback return type to void Patryk Wlazlyn
2024-11-25 13:20 ` [RFC PATCH v4 3/8] ACPI: processor_idle: Use acpi_idle_play_dead() for all C-states Patryk Wlazlyn
2024-11-25 13:24 ` Rafael J. Wysocki
2024-11-25 14:39 ` Patryk Wlazlyn
2024-11-25 14:36 ` Gautham R. Shenoy
2024-11-25 13:20 ` [RFC PATCH v4 4/8] x86/smp: Allow calling mwait_play_dead with arbitrary hint Patryk Wlazlyn
2024-11-25 14:39 ` Rafael J. Wysocki
2024-11-26 11:36 ` Patryk Wlazlyn
2024-11-26 11:45 ` Rafael J. Wysocki
2024-11-25 13:20 ` [RFC PATCH v4 5/8] x86/smp native_play_dead: Prefer cpuidle_play_dead() over mwait_play_dead() Patryk Wlazlyn
2024-11-25 13:45 ` Peter Zijlstra
2024-11-25 13:56 ` Rafael J. Wysocki
2024-11-25 14:43 ` Patryk Wlazlyn
2024-11-25 14:48 ` Rafael J. Wysocki
2024-11-26 11:56 ` Patryk Wlazlyn
2024-11-26 12:04 ` Rafael J. Wysocki
2024-11-26 13:10 ` Patryk Wlazlyn
2024-11-26 13:38 ` Rafael J. Wysocki
2024-11-25 13:20 ` [RFC PATCH v4 6/8] intel_idle: Provide enter_dead() handler for SRF Patryk Wlazlyn
2024-11-25 13:44 ` Rafael J. Wysocki
2024-11-25 14:48 ` Patryk Wlazlyn
2024-11-25 14:50 ` Rafael J. Wysocki
2024-11-25 13:53 ` Peter Zijlstra
2024-11-25 13:58 ` Rafael J. Wysocki
2024-11-25 14:12 ` Peter Zijlstra
2024-11-25 14:19 ` Rafael J. Wysocki
2024-11-25 13:20 ` [RFC PATCH v4 7/8] acpi_idle: Add FFH cstate handling Patryk Wlazlyn
2024-11-25 13:41 ` Rafael J. Wysocki
2024-11-25 14:00 ` Rafael J. Wysocki
2024-11-25 15:14 ` Gautham R. Shenoy
2024-11-26 12:03 ` Patryk Wlazlyn
2024-11-25 13:20 ` [RFC PATCH v4 8/8] acpi_idle: Disallow play_dead with FFH cstate on AMD platforms Patryk Wlazlyn
2024-11-25 13:46 ` Rafael J. Wysocki
2024-11-25 13:54 ` Peter Zijlstra
2024-11-25 14:56 ` Patryk Wlazlyn
2024-11-25 15:17 ` Gautham R. Shenoy
2024-11-25 15:15 ` Gautham R. Shenoy
2024-11-26 12:05 ` Patryk Wlazlyn
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=20241125132029.7241-2-patryk.wlazlyn@linux.intel.com \
--to=patryk.wlazlyn@linux.intel.com \
--cc=artem.bityutskiy@linux.intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=gautham.shenoy@amd.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=tglx@linutronix.de \
--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