From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,sfr@canb.auug.org.au,mario.limonciello@amd.com,dyoung@redhat.com,dwmw2@infradead.org,bhe@redhat.com,rafael.j.wysocki@intel.com,akpm@linux-foundation.org
Subject: [merged] kexec_core-fix-error-code-path-in-the-kexec_jump-flow.patch removed from -mm tree
Date: Sat, 12 Jul 2025 14:42:48 -0700 [thread overview]
Message-ID: <20250712214248.CAD0CC4CEEF@smtp.kernel.org> (raw)
The quilt patch titled
Subject: kexec_core: fix error code path in the KEXEC_JUMP flow
has been removed from the -mm tree. Its filename was
kexec_core-fix-error-code-path-in-the-kexec_jump-flow.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Subject: kexec_core: fix error code path in the KEXEC_JUMP flow
Date: Thu, 10 Jul 2025 15:10:41 +0200
If dpm_suspend_start() fails, dpm_resume_end() must be called to recover
devices whose suspend callbacks have been called, but this does not happen
in the KEXEC_JUMP flow's error path due to a confused goto target label.
Address this by using the correct target label in the goto statement in
question.
[sfr@canb.auug.org.au: remove now-unused label]
Link: https://lkml.kernel.org/r/20250711105804.3447e832@canb.auug.org.au
Link: https://lkml.kernel.org/r/2396879.ElGaqSPkdT@rjwysocki.net
Fixes: 2965faa5e03d ("kexec: split kexec_load syscall from kexec core code")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Mario Limonciello <mario.limonciello@amd.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
kernel/kexec_core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/kernel/kexec_core.c~kexec_core-fix-error-code-path-in-the-kexec_jump-flow
+++ a/kernel/kexec_core.c
@@ -1080,7 +1080,7 @@ int kernel_kexec(void)
console_suspend_all();
error = dpm_suspend_start(PMSG_FREEZE);
if (error)
- goto Resume_console;
+ goto Resume_devices;
/*
* dpm_suspend_end() must be called after dpm_suspend_start()
* to complete the transition, like in the hibernation flows
@@ -1135,7 +1135,6 @@ int kernel_kexec(void)
dpm_resume_start(PMSG_RESTORE);
Resume_devices:
dpm_resume_end(PMSG_RESTORE);
- Resume_console:
pm_restore_gfp_mask();
console_resume_all();
thaw_processes();
_
Patches currently in -mm which might be from rafael.j.wysocki@intel.com are
kexec_core-drop-redundant-pm_restore_gfp_mask-call.patch
reply other threads:[~2025-07-12 21:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20250712214248.CAD0CC4CEEF@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=bhe@redhat.com \
--cc=dwmw2@infradead.org \
--cc=dyoung@redhat.com \
--cc=mario.limonciello@amd.com \
--cc=mm-commits@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.