x86: 5-level related changes into decompression code
Subsystems (3)
v3 cover x86: 5-level related changes into decompression code
Hi Ingo,
Here's updated changes that prepare the code to boot-time switching between paging modes and handle booting in 5-level mode when bootloader put kernel image above 4G, but haven't enabled 5-level paging for us.
First two patches can be backported to v4.14 to provide sensible error message when CONFIG_X86_5LEVEL=y kernel is booted on hardware that doesn't support the feature.
Please review and consider applying.
Kirill A. Shutemov (5):
x86/boot/compressed/64: Detect and handle 5-level paging at boot-time x86/boot/compressed/64: Print error if 5-level paging is not supported x86/boot/compressed/64: Rename pagetable.c to kaslr_64.c x86/boot/compressed/64: Introduce place_trampoline() x86/boot/compressed/64: Handle 5-level paging boot if kernel is above
4G
arch/x86/boot/compressed/Makefile | 3 +-
arch/x86/boot/compressed/head_64.S | 108 +++++++++++++--------
.../boot/compressed/{pagetable.c => kaslr_64.c} | 0
arch/x86/boot/compressed/misc.c | 16 +++
arch/x86/boot/compressed/pgtable.h | 18 ++++
arch/x86/boot/compressed/pgtable_64.c | 61 ++++++++++++
6 files changed, 166 insertions(+), 40 deletions(-)
rename arch/x86/boot/compressed/{pagetable.c => kaslr_64.c} (100%)
create mode 100644 arch/x86/boot/compressed/pgtable.h
create mode 100644 arch/x86/boot/compressed/pgtable_64.cSignature · 7 lines
2.15.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH v3 1/5 x86/boot/compressed/64: Detect and handle 5-level paging at boot-time
This patch prepare decompression code to boot-time switching between 4- and 5-level paging.
--- arch/x86/boot/compressed/Makefile | 1 + arch/x86/boot/compressed/head_64.S | 16 ++++++++++++---- arch/x86/boot/compressed/pgtable_64.c | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 arch/x86/boot/compressed/pgtable_64.c
arch/x86/boot/compressed/Makefile +1 -0
@@ -80,6 +80,7 @@ vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr.o ifdef CONFIG_X86_64 vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/pagetable.o vmlinux-objs-y += $(obj)/mem_encrypt.o + vmlinux-objs-y += $(obj)/pgtable_64.o endif $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
arch/x86/boot/compressed/head_64.S +12 -4
@@ -305,10 +305,18 @@ ENTRY(startup_64) leaq boot_stack_end(%rbx), %rsp #ifdef CONFIG_X86_5LEVEL - /* Check if 5-level paging has already enabled */ - movq %cr4, %rax - testl $X86_CR4_LA57, %eax - jnz lvl5 + /* + * Check if we need to enable 5-level paging. + * RSI holds real mode data and need to be preserved across + * a function call. + */ + pushq %rsi + call l5_paging_required + popq %rsi + + /* If l5_paging_required() returned zero, we're done here. */ + cmpq $0, %rax + je lvl5 /* * At this point we are in long mode with 4-level paging enabled,
arch/x86/boot/compressed/pgtable_64.c new file +18 -0
@@ -0,0 +1,18 @@ +#include <asm/processor.h> + +int l5_paging_required (void ) +{ +/* Check i leaf 7 is supported. */ +if (native_cpuid_eax (0 ) <7 ) +return 0 ; + +/* Check if la57 is supported. */ +if (!(native_cpuid_ecx (7 ) & (1 << (X86_FEATURE_LA57 &31 )))) +return 0 ; + +/* Check if 5-level paging has already been enabled. */ +if (native_read_cr4 () &X86_CR4_LA57 ) +return 0 ; + +return 1 ; +}
Signature · 7 lines
2.15.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
tip-bot for Kirill A. Shutemov
merge bot[tip:x86/urgent] x86/boot/compressed/64: Detect and handle 5-level paging at boot-time
x86/boot/compressed/64: Detect and handle 5-level paging at boot-time
Commit-ID: 10c9a5346f7200f5150608742075470612f9eadb Gitweb: https://git.kernel.org/tip/10c9a5346f7200f5150608742075470612f9eadb Author: Kirill A. Shutemov <[email protected]> AuthorDate: Mon, 4 Dec 2017 15:40:55 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 4 Dec 2017 21:14:34 +0100
x86/boot/compressed/64: Detect and handle 5-level paging at boot-time
Prerequisite for fixing the current problem of instantaneous reboots when a 5-level paging kernel is booted on 4-level paging hardware.
At the same time this change prepares the decompression code to boot-time switching between 4- and 5-level paging.
--- arch/x86/boot/compressed/Makefile | 1 + arch/x86/boot/compressed/head_64.S | 16 ++++++++++++---- arch/x86/boot/compressed/pgtable_64.c | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-)
arch/x86/boot/compressed/Makefile +1 -0
@@ -80,6 +80,7 @@ vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr.o ifdef CONFIG_X86_64 vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/pagetable.o vmlinux-objs-y += $(obj)/mem_encrypt.o + vmlinux-objs-y += $(obj)/pgtable_64.o endif $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
arch/x86/boot/compressed/head_64.S +12 -4
@@ -305,10 +305,18 @@ ENTRY(startup_64) leaq boot_stack_end(%rbx), %rsp #ifdef CONFIG_X86_5LEVEL - /* Check if 5-level paging has already enabled */ - movq %cr4, %rax - testl $X86_CR4_LA57, %eax - jnz lvl5 + /* + * Check if we need to enable 5-level paging. + * RSI holds real mode data and need to be preserved across + * a function call. + */ + pushq %rsi + call l5_paging_required + popq %rsi + + /* If l5_paging_required() returned zero, we're done here. */ + cmpq $0, %rax + je lvl5 /* * At this point we are in long mode with 4-level paging enabled,
arch/x86/boot/compressed/pgtable_64.c new file +18 -0
@@ -0,0 +1,18 @@ +#include <asm/processor.h> + +int l5_paging_required (void ) +{ +/* Check if leaf 7 is supported. */ +if (native_cpuid_eax (0 ) <7 ) +return 0 ; + +/* Check if la57 is supported. */ +if (!(native_cpuid_ecx (7 ) & (1 << (X86_FEATURE_LA57 &31 )))) +return 0 ; + +/* Check if 5-level paging has already been enabled. */ +if (native_read_cr4 () &X86_CR4_LA57 ) +return 0 ; + +return 1 ; +}
Re: [PATCHv3 1/5] x86/boot/compressed/64: Detect and handle 5-level paging at boot-time
In reply to Kirill A. ShutemovQuoted 2 lines · Kirill A. Shutemov
This patch prepare decompression code to boot-time switching between 4- and 5-level paging.
This is the very wrong reason for tagging this commit stable.
Quoted 3 lines
Signed-off-by Kirill A. Shutemov <[email protected]>Cc <[email protected]> [4.14+]
Adding cc stable requires a Fixes tag as well.
arch/x86/boot/compressed/pgtable_64.c line 5
Quoted 3 lines
arch/x86/boot/compressed/pgtable_64.c new file +3
-0+int l5_paging_required (void ) +{ +/* Check i leaf 7 is supported. */
So you introduce the typo here and then you fix it in the next patch which is the actual bug fix as an completely unrelated hunk.
-- a/arch/x86/boot/compressed/pgtable_64.c
+++ b/arch/x86/boot/compressed/pgtable_64.c
@@ -2,7 +2,7 @@
int l5_paging_required(void)
{
- /* Check i leaf 7 is supported. */
+ /* Check if leaf 7 is supported. */
That's just careless and sloppy.
I fixed it up once more along with the lousy changelogs because this crap, which you not even thought about addressing it when shoving your 5-level support into 4.14 needs to be fixed.
I'm really tired of your sloppiness. You waste everyones time just by ignoring feedback and continuing to do what you think is enough. Works for me is _NOT_ enough for kernel development.
I'm not even looking at the rest of the series unless someone else has the stomach to do so and sends a Reviewed-by.
Alternatively you can sit down and look at the changelogs and the code and figure out whether it matches what I told you over and over. Once you think it does, then please feel free to resend it, but be sure that I'm going to apply the most restrictive crap filter on anything which comes from you from now on.
Thanks,
tglx
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Re: [PATCHv3 1/5] x86/boot/compressed/64: Detect and handle 5-level paging at boot-time
Quoted 31 lines · Thomas Gleixner
Quoted 2 lines · Kirill A. Shutemov
This patch prepare decompression code to boot-time switching between 4- and 5-level paging.
This is the very wrong reason for tagging this commit stable.
Quoted 3 lines
Signed-off-by Kirill A. Shutemov <[email protected]>Cc <[email protected]> [4.14+]Adding cc stable requires a Fixes tag as well.
arch/x86/boot/compressed/pgtable_64.c line 5
Quoted 3 lines
arch/x86/boot/compressed/pgtable_64.c new file +3
-0+int l5_paging_required (void ) +{ +/* Check i leaf 7 is supported. */ So you introduce the typo here and then you fix it in the next patch which is the actual bug fix as an completely unrelated hunk.
--
a/arch/x86/boot/compressed/pgtable_64.c
+++b/arch/x86/boot/compressed/pgtable_64.c(quoted diff) +1
-1@@ -2,7 +2,7 @@ int l5_paging_required(void) { - /* Check i leaf 7 is supported. */ + /* Check if leaf 7 is supported. */That's just careless and sloppy.
Quoted 7 lines
I fixed it up once more along with the lousy changelogs because this crap, which you not even thought about addressing it when shoving your 5-level support into 4.14 needs to be fixed.
I'm really tired of your sloppiness. You waste everyones time just by ignoring feedback and continuing to do what you think is enough. Works for me is _NOT_ enough for kernel development.
Sorry. I screwed it up.
I'll do my best to not waste your time again.
Quoted 8 lines
I'm not even looking at the rest of the series unless someone else has the stomach to do so and sends a Reviewed-by.
Alternatively you can sit down and look at the changelogs and the code and figure out whether it matches what I told you over and over. Once you think it does, then please feel free to resend it, but be sure that I'm going to apply the most restrictive crap filter on anything which comes from you from now on.
Fair enough. I'll recheck everything in the morning and send them again.
Thanks,
and sorry again for wasting your time.
Signature · 7 lines
Kirill A. Shutemov -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
tip-bot for Kirill A. Shutemov
merge bot[tip:x86/urgent] x86/boot/compressed/64: Detect and handle 5-level paging at boot-time
In reply to Kirill A. Shutemovx86/boot/compressed/64: Detect and handle 5-level paging at boot-time
Commit-ID: 08529078d8d9adf689bf39cc38d53979a0869970 Gitweb: https://git.kernel.org/tip/08529078d8d9adf689bf39cc38d53979a0869970 Author: Kirill A. Shutemov <[email protected]> AuthorDate: Mon, 4 Dec 2017 15:40:55 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 7 Dec 2017 10:34:39 +0100
x86/boot/compressed/64: Detect and handle 5-level paging at boot-time
Prerequisite for fixing the current problem of instantaneous reboots when a 5-level paging kernel is booted on 4-level paging hardware.
At the same time this change prepares the decompression code to boot-time switching between 4- and 5-level paging.
[ tglx: Folded the GCC < 5 fix. ]
--- arch/x86/boot/compressed/Makefile | 1 + arch/x86/boot/compressed/head_64.S | 16 ++++++++++++---- arch/x86/boot/compressed/pgtable_64.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 4 deletions(-)
arch/x86/boot/compressed/Makefile +1 -0
@@ -80,6 +80,7 @@ vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr.o ifdef CONFIG_X86_64 vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/pagetable.o vmlinux-objs-y += $(obj)/mem_encrypt.o + vmlinux-objs-y += $(obj)/pgtable_64.o endif $(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
arch/x86/boot/compressed/head_64.S +12 -4
@@ -305,10 +305,18 @@ ENTRY(startup_64) leaq boot_stack_end(%rbx), %rsp #ifdef CONFIG_X86_5LEVEL - /* Check if 5-level paging has already enabled */ - movq %cr4, %rax - testl $X86_CR4_LA57, %eax - jnz lvl5 + /* + * Check if we need to enable 5-level paging. + * RSI holds real mode data and need to be preserved across + * a function call. + */ + pushq %rsi + call l5_paging_required + popq %rsi + + /* If l5_paging_required() returned zero, we're done here. */ + cmpq $0, %rax + je lvl5 /* * At this point we are in long mode with 4-level paging enabled,
arch/x86/boot/compressed/pgtable_64.c new file +28 -0
@@ -0,0 +1,28 @@ +#include <asm/processor.h> + +/* +* __force_order is used by special_insns.h asm code to force instruction +* serialization. +* +* It is not referenced from the code, but GCC < 5 with -fPIE would fail +* due to an undefined symbol. Define it to make these ancient GCCs work. +*/ +unsigned long __force_order; + +int l5_paging_required (void ) +{ +/* Check if leaf 7 is supported. */ + +if (native_cpuid_eax (0 ) <7 ) +return 0 ; + +/* Check if la57 is supported. */ +if (!(native_cpuid_ecx (7 ) & (1 << (X86_FEATURE_LA57 &31 )))) +return 0 ; + +/* Check if 5-level paging has already been enabled. */ +if (native_read_cr4 () &X86_CR4_LA57 ) +return 0 ; + +return 1 ; +}
Re: [tip:x86/urgent] x86/boot/compressed/64: Detect and handle 5-level paging at boot-time
Quoted 6 lines · tip-bot for Kirill A. Shutemov
arch/x86/boot/compressed/pgtable_64.c new file +0
-0
arch/x86/boot/compressed/pgtable_64.c line 10
Quoted 10 lines
arch/x86/boot/compressed/pgtable_64.c new file +10
-0@@ -0,0 +1,28 @@ +#include <asm/processor.h> + +/* +* __force_order is used by special_insns.h asm code to force instruction +* serialization. +* +* It is not referenced from the code, but GCC < 5 with -fPIE would fail +* due to an undefined symbol. Define it to make these ancient GCCs work. +*/ +unsigned long __force_order;
There's no need in __force_order in arch/x86/boot/compressed/pagetable.c after the change.
Signature · 1 line
Kirill A. Shutemov
PATCH v3 2/5 x86/boot/compressed/64: Print error if 5-level paging is not supported
In reply to Kirill A. ShutemovWe cannot proceed booting if the machine doesn't support the paging mode kernel was compiled for.
Getting error the usual way -- via validate_cpu() -- is not going to work. We need to enable appropriate paging mode before that, otherwise kernel would triple-fault during KASLR setup.
This code will go away once we get support for boot-time switching between paging modes.
--- arch/x86/boot/compressed/misc.c | 16 ++++++++++++++++ arch/x86/boot/compressed/pgtable_64.c | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-)
arch/x86/boot/compressed/misc.c +16 -0
@@ -169,6 +169,16 @@ void __puthex(unsigned long value) } } +static int l5_supported (void ) +{ +/* Check if leaf 7 is supported. */ +if (native_cpuid_eax (0 ) <7 ) +return 0 ; + +/* Check if la57 is supported. */ +return native_cpuid_ecx (7 ) & (1 << (X86_FEATURE_LA57 &31 )); +} +#if CONFIG_X86_NEED_RELOCS static void handle_relocations (void *output,unsigned long output_len,unsigned long virt_addr)
@@ -362,6 +372,12 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap,console_init ();debug_putstr ("early console in extract_kernel\n" ); +if (IS_ENABLED (CONFIG_X86_5LEVEL ) && !l5_supported ()) { +error ("This linux kernel as configured requires 5-level paging\n" +"This CPU does not support the required 'cr4.la57' feature\n" +"Unable to boot - please use a kernel appropriate for your CPU\n" ); + } + free_mem_ptr = heap;/* Heap */ free_mem_end_ptr = heap +BOOT_HEAP_SIZE ;
arch/x86/boot/compressed/pgtable_64.c +1 -1
@@ -2,7 +2,7 @@int l5_paging_required (void ) { -/* Check i leaf 7 is supported. */ +/* Check if leaf 7 is supported. */ if (native_cpuid_eax (0 ) <7 )return 0 ;
Signature · 7 lines
2.15.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Re: [PATCHv3 2/5] x86/boot/compressed/64: Print error if 5-level paging is not supported
Quoted 10 lines · Kirill A. Shutemov
We cannot proceed booting if the machine doesn't support the paging mode kernel was compiled for.
Getting error the usual way -- via
validate_cpu()-- is not going to work. We need to enable appropriate paging mode before that, otherwise kernel would triple-fault during KASLR setup.This code will go away once we get support for boot-time switching between paging modes.
Quoted 6 lines
Signed-off-by Kirill A. Shutemov <[email protected]>Cc <[email protected]> [4.14+]--- arch/x86/boot/compressed/misc.c | 16 ++++++++++++++++ arch/x86/boot/compressed/pgtable_64.c | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-)
Signature · 11 lines
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>tip-bot for Kirill A. Shutemov
merge bot[tip:x86/urgent] x86/boot/compressed/64: Print error if 5-level paging is not supported
In reply to Kirill A. Shutemovx86/boot/compressed/64: Print error if 5-level paging is not supported
Commit-ID: eabf2a604e0555b8f86a2c6c05c3a27496facf6d Gitweb: https://git.kernel.org/tip/eabf2a604e0555b8f86a2c6c05c3a27496facf6d Author: Kirill A. Shutemov <[email protected]> AuthorDate: Mon, 4 Dec 2017 15:40:56 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 4 Dec 2017 21:14:34 +0100
x86/boot/compressed/64: Print error if 5-level paging is not supported
If the machine does not support the paging mode for which the kernel was compiled, the boot process cannot continue.
It's not possible to let the kernel detect the mismatch as it does not even reach the point where cpu features can be evaluted due to a triple fault in the KASLR setup.
Instead of instantaneous silent reboot, emit an error message which gives the user the information why the boot fails.
--- arch/x86/boot/compressed/misc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/x86/boot/compressed/misc.c +16 -0
@@ -169,6 +169,16 @@ void __puthex(unsigned long value) } } +static bool l5_supported (void ) +{ +/* Check if leaf 7 is supported. */ +if (native_cpuid_eax (0 ) <7 ) +return 0 ; + +/* Check if la57 is supported. */ +return native_cpuid_ecx (7 ) & (1 << (X86_FEATURE_LA57 &31 )); +} +#if CONFIG_X86_NEED_RELOCS static void handle_relocations (void *output,unsigned long output_len,unsigned long virt_addr)
@@ -362,6 +372,12 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap,console_init ();debug_putstr ("early console in extract_kernel\n" ); +if (IS_ENABLED (CONFIG_X86_5LEVEL ) && !l5_supported ()) { +error ("This linux kernel as configured requires 5-level paging\n" +"This CPU does not support the required 'cr4.la57' feature\n" +"Unable to boot - please use a kernel appropriate for your CPU\n" ); + } + free_mem_ptr = heap;/* Heap */ free_mem_end_ptr = heap +BOOT_HEAP_SIZE ;
tip-bot for Kirill A. Shutemov
merge bot[tip:x86/urgent] x86/boot/compressed/64: Print error if 5-level paging is not supported
In reply to Kirill A. Shutemovx86/boot/compressed/64: Print error if 5-level paging is not supported
Commit-ID: 6d7e0ba2d2be9e50cccba213baf07e0e183c1b24 Gitweb: https://git.kernel.org/tip/6d7e0ba2d2be9e50cccba213baf07e0e183c1b24 Author: Kirill A. Shutemov <[email protected]> AuthorDate: Mon, 4 Dec 2017 15:40:56 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 7 Dec 2017 10:36:26 +0100
x86/boot/compressed/64: Print error if 5-level paging is not supported
If the machine does not support the paging mode for which the kernel was compiled, the boot process cannot continue.
It's not possible to let the kernel detect the mismatch as it does not even reach the point where cpu features can be evaluted due to a triple fault in the KASLR setup.
Instead of instantaneous silent reboot, emit an error message which gives the user the information why the boot fails.
--- arch/x86/boot/compressed/misc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/x86/boot/compressed/misc.c +16 -0
@@ -169,6 +169,16 @@ void __puthex(unsigned long value) } } +static bool l5_supported (void ) +{ +/* Check if leaf 7 is supported. */ +if (native_cpuid_eax (0 ) <7 ) +return 0 ; + +/* Check if la57 is supported. */ +return native_cpuid_ecx (7 ) & (1 << (X86_FEATURE_LA57 &31 )); +} +#if CONFIG_X86_NEED_RELOCS static void handle_relocations (void *output,unsigned long output_len,unsigned long virt_addr)
@@ -362,6 +372,12 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap,console_init ();debug_putstr ("early console in extract_kernel\n" ); +if (IS_ENABLED (CONFIG_X86_5LEVEL ) && !l5_supported ()) { +error ("This linux kernel as configured requires 5-level paging\n" +"This CPU does not support the required 'cr4.la57' feature\n" +"Unable to boot - please use a kernel appropriate for your CPU\n" ); + } + free_mem_ptr = heap;/* Heap */ free_mem_end_ptr = heap +BOOT_HEAP_SIZE ;
PATCH v3 3/5 x86/boot/compressed/64: Rename pagetable.c to kaslr_64.c
In reply to Kirill A. ShutemovThe name of the file -- pagetable.c -- is misleading: it only contains helpers used for KASLR in 64-bin mode.
Let's rename the file to reflect its content.
---
arch/x86/boot/compressed/Makefile | 2 +-
arch/x86/boot/compressed/{pagetable.c => kaslr_64.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename arch/x86/boot/compressed/{pagetable.c => kaslr_64.c} (100%)arch/x86/boot/compressed/Makefile +1 -1
@@ -78,7 +78,7 @@ vmlinux-objs-y := $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \ vmlinux-objs-$(CONFIG_EARLY_PRINTK) += $(obj)/early_serial_console.o vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr.o ifdef CONFIG_X86_64 - vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/pagetable.o + vmlinux-objs-$(CONFIG_RANDOMIZE_BASE) += $(obj)/kaslr_64.o vmlinux-objs-y += $(obj)/mem_encrypt.o vmlinux-objs-y += $(obj)/pgtable_64.o endif
arch/x86/boot/compressed/kaslr_64.c renamed from arch/x86/boot/compressed/pagetable.c +0 -0
Signature · 7 lines
2.15.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH v3 4/5 x86/boot/compressed/64: Introduce place_trampoline()
In reply to Kirill A. ShutemovIf bootloader enables 64-bit mode with 4-level paging, we might need to switch over to 5-level paging. The switching requires disabling paging. It works fine if kernel itself is loaded below 4G.
If bootloader put the kernel above 4G (not sure if anybody does this), we would loose control as soon as paging is disabled as code becomes unreachable.
To handle the situation, we need a trampoline in lower memory that would take care about switching on 5-level paging.
Apart from trampoline itself we also need place to store top level page table in lower memory as we don't have a way to load 64-bit value into CR3 from 32-bit mode. We only really need 8-bytes there as we only use the very first entry of the page table. But we allocate whole page anyway. We cannot have the code in the same because, there's hazard that a CPU would read page table speculatively and get confused seeing garbage.
This patch introduces paging_prepare() that check if we need to enable 5-level paging and then finds right spot in lower memory for trampoline, copies trampoline code there and setups new top level page table for 5-level paging.
At this point we do all the preparation, but not yet use trampoline. It will be done in following patch.
--- arch/x86/boot/compressed/head_64.S | 54 ++++++++++++++++------------- arch/x86/boot/compressed/pgtable.h | 18 ++++++++++ arch/x86/boot/compressed/pgtable_64.c | 65 +++++++++++++++++++++++++++++------ 3 files changed, 103 insertions(+), 34 deletions(-) create mode 100644 arch/x86/boot/compressed/pgtable.h
arch/x86/boot/compressed/head_64.S +31 -23
@@ -304,33 +304,45 @@ ENTRY(startup_64) /* Set up the stack */ leaq boot_stack_end(%rbx), %rsp -#ifdef CONFIG_X86_5LEVEL - /* - * Check if we need to enable 5-level paging. - * RSI holds real mode data and need to be preserved across - * a function call. - */ - pushq %rsi - call l5_paging_required - popq %rsi - - /* If l5_paging_required() returned zero, we're done here. */ - cmpq $0, %rax - je lvl5 - /* * At this point we are in long mode with 4-level paging enabled, - * but we want to enable 5-level paging. + * but we might want to enable 5-level paging. * * The problem is that we cannot do it directly. Setting LA57 in * long mode would trigger #GP. So we need to switch off long mode * first. * - * NOTE: This is not going to work if bootloader put us above 4G - * limit. + * We also need trampoline in lower memory to switch from 4- to 5-level + * paging for cases when bootloader put kernel above 4G, but didn't + * enable 5-level paging for us. + * + * For trampoline, we have to have top page table in lower memory as we + * don't have a way to load 64-bit value into CR3 from 32-bit mode. + * + * We go though trampoline even if we don't have to: if we're already + * in 5-level paging mode or if we don't need to switch to it. This way + * the trampoline code gets tested not only in special rare case, but + * on every boot. + */ + + /* + * paging_prepare() would setup trampoline and check if we need to + * enable 5-level paging. + * + * Address of trampoline is rerurned in RAX. The bit 0 is used to + * encode if we need to enabled 5-level paging. * - * The first step is go into compatibility mode. + * RSI holds real mode data and need to be preserved across + * a function call. */ + pushq %rsi + call paging_prepare + popq %rsi + movq %rax, %rcx + andq $(~1UL), %rcx + + testq $1, %rax + jz lvl5 /* Clear additional page table */ leaq lvl5_pgtable(%rbx), %rdi
@@ -352,7 +364,6 @@ ENTRY(startup_64) pushq %rax lretq lvl5: -#endif /* Zero EFLAGS */ pushq $0
@@ -490,7 +501,7 @@ relocated: jmp *%rax .code32 -#ifdef CONFIG_X86_5LEVEL +ENTRY(trampoline_32bit_src) compatible_mode: /* Setup data and stack segments */ movl $__KERNEL_DS, %eax
@@ -526,7 +537,6 @@ compatible_mode: movl %eax, %cr0 lret -#endif no_longmode: /* This isn't an x86-64 CPU so hang */
@@ -585,7 +595,5 @@ boot_stack_end: .balign 4096 pgtable: .fill BOOT_PGT_SIZE, 1, 0 -#ifdef CONFIG_X86_5LEVEL lvl5_pgtable: .fill PAGE_SIZE, 1, 0 -#endif
arch/x86/boot/compressed/pgtable.h new file +18 -0
@@ -0,0 +1,18 @@ +#ifndef BOOT_COMPRESSED_PAGETABLE_H +#define BOOT_COMPRESSED_PAGETABLE_H + +#define TRAMPOLINE_32BIT_SIZE (2 * PAGE_SIZE) + +#define TRAMPOLINE_32BIT_PGTABLE_OFF 0 + +#define TRAMPOLINE_32BIT_CODE_OFF PAGE_SIZE +#define TRAMPOLINE_32BIT_CODE_SIZE 0x50 + +#define TRAMPOLINE_32BIT_STACK_END TRAMPOLINE_32BIT_SIZE + +#ifndef __ASSEMBLER__ + +extern void (*trampoline_32bit_src)(void *return_ptr); + +#endif /* __ASSEMBLER__ */ +#endif /* BOOT_COMPRESSED_PAGETABLE_H */
arch/x86/boot/compressed/pgtable_64.c +54 -11
72 lines not on this page · raw message
Signature · 7 lines
2.15.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH v3 5/5 x86/boot/compressed/64: Handle 5-level paging boot if kernel is above 4G
In reply to Kirill A. ShutemovThis patch addresses shortcoming in current boot process on machines that supports 5-level paging.
If bootloader enables 64-bit mode with 4-level paging, we need to switch over to 5-level paging. The switching requires disabling paging. It works fine if kernel itself is loaded below 4G.
If bootloader put the kernel above 4G (not sure if anybody does this), we would loose control as soon as paging is disabled as code becomes unreachable.
This patch implements trampoline in lower memory to handle this situation.
We only need the memory for very short time, until main kernel image setup its own page tables.
We go though trampoline even if we don't have to: if we're already in 5-level paging mode or if we don't need to switch to it. This way the trampoline code gets tested not only in special rare case, but on every boot.
--- arch/x86/boot/compressed/head_64.S | 72 +++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 29 deletions(-)
arch/x86/boot/compressed/head_64.S +43 -29
@@ -33,6 +33,7 @@ #include <asm/processor-flags.h> #include <asm/asm-offsets.h> #include <asm/bootparam.h> +#include "pgtable.h" /* * Locally defined symbols should be marked hidden:
@@ -339,31 +340,22 @@ ENTRY(startup_64) call paging_prepare popq %rsi movq %rax, %rcx - andq $(~1UL), %rcx - - testq $1, %rax - jz lvl5 - - /* Clear additional page table */ - leaq lvl5_pgtable(%rbx), %rdi - xorq %rax, %rax - movq $(PAGE_SIZE/8), %rcx - rep stosq /* - * Setup current CR3 as the first and only entry in a new top level - * page table. + * Load address of trampoline_return into RDI. + * It will be used by trampoline to return to main code. */ - movq %cr3, %rdi - leaq 0x7 (%rdi), %rax - movq %rax, lvl5_pgtable(%rbx) + leaq trampoline_return(%rip), %rdi /* Switch to compatibility mode (CS.L = 0 CS.D = 1) via far return */ pushq $__KERNEL32_CS - leaq compatible_mode(%rip), %rax + andq $(~1UL), %rax /* Clear bit 0: encode if 5-level paging neeeded */ + leaq TRAMPOLINE_32BIT_CODE_OFF(%rax), %rax pushq %rax lretq -lvl5: +trampoline_return: + /* Restore stack, 32-bit trampoline uses own stack */ + leaq boot_stack_end(%rbx), %rsp /* Zero EFLAGS */ pushq $0
@@ -501,36 +493,51 @@ relocated: jmp *%rax .code32 +/* + * This is 32-bit trampoline that will be copied over to low memory. + * + * RDI contains return address (might be above 4G). + * ECX contains the base address of trampoline memory. + * Bit 0 of ECX encodes if 5-level paging is required. + */ ENTRY(trampoline_32bit_src) -compatible_mode: /* Setup data and stack segments */ movl $__KERNEL_DS, %eax movl %eax, %ds movl %eax, %ss + movl %ecx, %edx + andl $(~1UL), %edx + + /* Setup new stack at the end of trampoline memory */ + leal TRAMPOLINE_32BIT_STACK_END (%edx), %esp + /* Disable paging */ movl %cr0, %eax btrl $X86_CR0_PG_BIT, %eax movl %eax, %cr0 - /* Point CR3 to 5-level paging */ - leal lvl5_pgtable(%ebx), %eax + /* Point CR3 to trampoline top level page table */ + leal TRAMPOLINE_32BIT_PGTABLE_OFF (%edx), %eax movl %eax, %cr3 /* Enable PAE and LA57 mode */ movl %cr4, %eax - orl $(X86_CR4_PAE | X86_CR4_LA57), %eax + orl $X86_CR4_PAE, %eax + + /* Bit 0 of ECX encodes if 5-level paging is required */ + testl $1, %ecx + jz 1f + orl $X86_CR4_LA57, %eax +1: movl %eax, %cr4 - /* Calculate address we are running at */ - call 1f -1: popl %edi - subl $1b, %edi + /* Calculate address of paging_enabled once we are in trampoline */ + leal paging_enabled - trampoline_32bit_src + TRAMPOLINE_32BIT_CODE_OFF (%edx), %eax /* Prepare stack for far return to Long Mode */ pushl $__KERNEL_CS - leal lvl5(%edi), %eax - push %eax + pushl %eax /* Enable paging back */ movl $(X86_CR0_PG | X86_CR0_PE), %eax
@@ -538,6 +545,15 @@ compatible_mode: lret + .code64 +paging_enabled: + /* Return from trampoline */ + jmp *%rdi + + /* Bound size of trampoline code */ + .org trampoline_32bit_src + TRAMPOLINE_32BIT_CODE_SIZE + + .code32 no_longmode: /* This isn't an x86-64 CPU so hang */ 1:
@@ -595,5 +611,3 @@ boot_stack_end: .balign 4096 pgtable: .fill BOOT_PGT_SIZE, 1, 0 -lvl5_pgtable: - .fill PAGE_SIZE, 1, 0
Signature · 7 lines
2.15.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>