From: "tip-bot2 for Rafael J. Wysocki" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
David Woodhouse <dwmw@amazon.co.uk>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/boot] kexec_core: Add and update comments regarding the KEXEC_JUMP flow
Date: Wed, 15 Jan 2025 09:17:51 -0000 [thread overview]
Message-ID: <173693267180.31546.17490565091306081669.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250109140757.2841269-8-dwmw2@infradead.org>
The following commit has been merged into the x86/boot branch of tip:
Commit-ID: dc6ffa6cd52d2cd8fa25b25e42c80faf17f5fe33
Gitweb: https://git.kernel.org/tip/dc6ffa6cd52d2cd8fa25b25e42c80faf17f5fe33
Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
AuthorDate: Thu, 09 Jan 2025 14:04:19
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 14 Jan 2025 13:03:34 +01:00
kexec_core: Add and update comments regarding the KEXEC_JUMP flow
The KEXEC_JUMP flow is analogous to hibernation flows occurring before
and after creating an image and before and after jumping from the
restore kernel to the image one, which is why it uses the same device
callbacks as those hibernation flows.
Add comments explaining that to the code in question and update an
existing comment in it which appears a bit out of context.
No functional changes.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20250109140757.2841269-8-dwmw2@infradead.org
---
kernel/kexec_core.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index c0caa14..b424a5c 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -1001,6 +1001,12 @@ int kernel_kexec(void)
#ifdef CONFIG_KEXEC_JUMP
if (kexec_image->preserve_context) {
+ /*
+ * This flow is analogous to hibernation flows that occur
+ * before creating an image and before jumping from the
+ * restore kernel to the image one, so it uses the same
+ * device callbacks as those two flows.
+ */
pm_prepare_console();
error = freeze_processes();
if (error) {
@@ -1011,12 +1017,10 @@ int kernel_kexec(void)
error = dpm_suspend_start(PMSG_FREEZE);
if (error)
goto Resume_console;
- /* At this point, dpm_suspend_start() has been called,
- * but *not* dpm_suspend_end(). We *must* call
- * dpm_suspend_end() now. Otherwise, drivers for
- * some devices (e.g. interrupt controllers) become
- * desynchronized with the actual state of the
- * hardware at resume time, and evil weirdness ensues.
+ /*
+ * dpm_suspend_end() must be called after dpm_suspend_start()
+ * to complete the transition, like in the hibernation flows
+ * mentioned above.
*/
error = dpm_suspend_end(PMSG_FREEZE);
if (error)
@@ -1052,6 +1056,13 @@ int kernel_kexec(void)
#ifdef CONFIG_KEXEC_JUMP
if (kexec_image->preserve_context) {
+ /*
+ * This flow is analogous to hibernation flows that occur after
+ * creating an image and after the image kernel has got control
+ * back, and in case the devices have been reset or otherwise
+ * manipulated in the meantime, it uses the device callbacks
+ * used by the latter.
+ */
syscore_resume();
Enable_irqs:
local_irq_enable();
next prev parent reply other threads:[~2025-01-15 9:17 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-09 14:04 [PATCH v2 0/9] x86/kexec: Fixes for tip/x86/boot David Woodhouse
2025-01-09 14:04 ` [PATCH v2 1/9] x86/kexec: Disable global pages before writing to control page David Woodhouse
2025-01-15 9:17 ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 2/9] x86/kexec: Ensure preserve_context flag is set on return to kernel David Woodhouse
2025-01-15 9:17 ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 3/9] x86/kexec: Use correct swap page in swap_pages function David Woodhouse
2025-01-15 9:17 ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 4/9] x86/kexec: Fix stack and handling of re-entry point for ::preserve_context David Woodhouse
2025-01-15 9:17 ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 5/9] x86/kexec: Fix location of relocate_kernel with -ffunction-sections David Woodhouse
2025-01-15 9:17 ` [tip: x86/boot] " tip-bot2 for Nathan Chancellor
2025-01-09 14:04 ` [PATCH v2 6/9] x86/kexec: Mark machine_kexec() with __nocfi David Woodhouse
2025-01-15 9:17 ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 7/9] kexec_core: Add and update comments regarding the KEXEC_JUMP flow David Woodhouse
2025-01-15 9:17 ` tip-bot2 for Rafael J. Wysocki [this message]
2025-01-09 14:04 ` [PATCH v2 8/9] x86/kexec: Cope with relocate_kernel() not being at the start of the page David Woodhouse
2025-01-15 9:17 ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-09 14:04 ` [PATCH v2 9/9] x86/kexec: Use typedef for relocate_kernel_fn function prototype David Woodhouse
2025-01-15 9:17 ` [tip: x86/boot] " tip-bot2 for David Woodhouse
2025-01-14 11:34 ` [PATCH v2 0/9] x86/kexec: Fixes for tip/x86/boot David Woodhouse
2025-01-14 11:51 ` Borislav Petkov
2025-01-14 11:53 ` David Woodhouse
2025-01-14 12:11 ` Borislav Petkov
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=173693267180.31546.17490565091306081669.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=dwmw@amazon.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--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
all inboxes | Powered by JetHome®