From: David Woodhouse <dwmw2@infradead.org>
To: "Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Borislav Petkov" <bp@alien8.de>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
x86@kernel.org, "H . Peter Anvin" <hpa@zytor.com>,
"Eric Biederman" <ebiederm@xmission.com>,
"David Woodhouse" <dwmw@amazon.co.uk>,
"Sourabh Jain" <sourabhjain@linux.ibm.com>,
"Hari Bathini" <hbathini@linux.ibm.com>,
"Michael Ellerman" <mpe@ellerman.id.au>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Baoquan He" <bhe@redhat.com>, "Yuntao Wang" <ytcoode@gmail.com>,
"David Kaplan" <david.kaplan@amd.com>,
"Tao Liu" <ltao@redhat.com>,
"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
"Kai Huang" <kai.huang@intel.com>,
"Ard Biesheuvel" <ardb@kernel.org>,
"Josh Poimboeuf" <jpoimboe@kernel.org>,
"Breno Leitao" <leitao@debian.org>,
"Wei Yang" <richard.weiyang@gmail.com>,
"Rong Xu" <xur@google.com>,
"Thomas Weißschuh" <thomas.weissschuh@linutronix.de>,
linux-kernel@vger.kernel.org, kexec@lists.infradead.org,
"Simon Horman" <horms@kernel.org>,
"Dave Young" <dyoung@redhat.com>,
"Peter Zijlstra" <peterz@infradead.org>,
bsz@amazon.de, nathan@kernel.org
Subject: [PATCH v2 0/9] x86/kexec: Fixes for tip/x86/boot
Date: Thu, 9 Jan 2025 14:04:12 +0000 [thread overview]
Message-ID: <20250109140757.2841269-1-dwmw2@infradead.org> (raw)
Fix a few bugs introduced by the recent rework of the relocate_kernel()
code, and one which has been there in the kjump code from the beginning.
• Global read-only TLB entries made relocate_kernel() crash when writing
to its own page after the %cr3 switch should have made it writeable.
• The preserve_context flag was lost when invoking swap_pages on the way
back, causing pages not to be swapped.
• The wrong page was being used as the swap page.
• The ABI for the kjump call asks the callee to put its entry address for
next time at %rsp+8 before returning, but we set %rsp to the top of the
available page, such that the entry address is at the start of some
other page.
• The relocate_kernel() function lacked Clang CFI information, but is now
called via a function pointer, leading to a crash¹.
• The relocate_kernel() code and data could end up being linked into the
wrong place for a LTO / -ffunction-sections build.
Thanks to Nathan for reporting many of the above.
Also a few minor cleanups, including a comments-only patch from Rafael
on the suspend-like part of kjump as a prelude to actually cleaning that
up.
¹ Fixed by just adding __nocfi. Actually providing the CFI information
for relocate_kernel() will need a bit more work, so let's just do the
simple fix for now.
v2:
• Rebase
• Save a whole byte on a 'movq $1, %r11' instruction.
• Fix duplicated word in comment.
• Avoid absolute relocations against __relocate_kernel_start
David Woodhouse (7):
x86/kexec: Disable global pages before writing to control page
x86/kexec: Ensure preserve_context flag is set on return to kernel
x86/kexec: Use correct swap page in swap_pages function
x86/kexec: Fix stack and handling of re-entry point for ::preserve_context
x86/kexec: Mark machine_kexec() with __nocfi
x86/kexec: Cope with relocate_kernel() not being at the start of the page
x86/kexec: Use typedef for relocate_kernel_fn function prototype
Nathan Chancellor (1):
x86/kexec: Fix location of relocate_kernel with -ffunction-sections
Rafael J. Wysocki (1):
kexec_core: Add and update comments regarding the KEXEC_JUMP flow
arch/x86/include/asm/kexec.h | 26 ++++++++--------
arch/x86/kernel/machine_kexec_32.c | 7 +----
arch/x86/kernel/machine_kexec_64.c | 8 ++---
arch/x86/kernel/relocate_kernel_64.S | 57 ++++++++++++++++++++++++------------
arch/x86/kernel/vmlinux.lds.S | 4 +--
kernel/kexec_core.c | 23 +++++++++++----
6 files changed, 74 insertions(+), 51 deletions(-)
next reply other threads:[~2025-01-09 14:08 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-09 14:04 David Woodhouse [this message]
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: x86/boot] " tip-bot2 for Rafael J. Wysocki
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=20250109140757.2841269-1-dwmw2@infradead.org \
--to=dwmw2@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=ardb@kernel.org \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=bsz@amazon.de \
--cc=dave.hansen@linux.intel.com \
--cc=david.kaplan@amd.com \
--cc=dwmw@amazon.co.uk \
--cc=dyoung@redhat.com \
--cc=ebiederm@xmission.com \
--cc=hbathini@linux.ibm.com \
--cc=horms@kernel.org \
--cc=hpa@zytor.com \
--cc=jpoimboe@kernel.org \
--cc=kai.huang@intel.com \
--cc=kexec@lists.infradead.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ltao@redhat.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=nathan@kernel.org \
--cc=peterz@infradead.org \
--cc=richard.weiyang@gmail.com \
--cc=sourabhjain@linux.ibm.com \
--cc=tglx@linutronix.de \
--cc=thomas.weissschuh@linutronix.de \
--cc=tzimmermann@suse.de \
--cc=x86@kernel.org \
--cc=xur@google.com \
--cc=ytcoode@gmail.com \
/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®