x86/kdump: Fix 'kmem -s' reported an invalid freepointer when SME was active
Subsystems (4)
v6 cover x86/kdump: Fix 'kmem -s' reported an invalid freepointer when SME was active
In purgatory(), the main things are as below:
[1] verify sha256 hashes for various segments. Lets keep these codes, and do not touch the logic.
[2] copy the first 640k content to a backup region.
Lets safely remove it and clean all code related to backup region.
This patch series will remove the backup region, because the current handling of copying the first 640k runs into problems when SME is active(https://bugzilla.kernel.org/show_bug.cgi?id=204793).
The low 1MiB region will always be reserved when the crashkernel kernel command line option is specified. And this way makes it unnecessary to do anything with the low 1MiB region, because the memory allocated later won't fall into the low 1MiB area.
This series includes two patches:
[1] x86/kdump: always reserve the low 1MiB when the crashkernel option is specified
The low 1MiB region will always be reserved when the crashkernel kernel command line option is specified, which ensures that the memory allocated later won't fall into the low 1MiB area.
[2] x86/kdump: clean up all the code related to the backup region Remove the backup region and clean up.
Changes since v1:
[1] Add extra checking condition: when the crashkernel option is specified, reserve the low 640k area.
Changes since v2:
[1] Reserve the low 1MiB region when the crashkernel option is only specified.(Suggested by Eric)
[2] Remove the unused crash_copy_backup_region()
[3] Remove the backup region and clean up
[4] Split them into three patches
Changes since v3:
[1] Improve the first patch's log
[2] Improve the third patch based on Eric's suggestions
Changes since v4:
[1] Correct some typos, and also improve the first patch's log
[2] Add a new function kexec_reserve_low_1MiB() in kernel/kexec_core.c and which is called by reserve_real_mode(). (Suggested by Boris)
Changes since v5:
[1] Call the cmdline_find_option() instead of strstr() to check the crashkernel option. (Suggested by Hatayama)
[2] Add a weak function kexec_reserve_low_1MiB() in kernel/kexec_core.c, and implement the kexec_reserve_low_1MiB() in arch/x86/kernel/ machine_kexec_64.c so that it does not cause the compile error on non-x86 kernel, and also ensures that it can work well on x86 kernel.
Lianbo Jiang (2):
x86/kdump: always reserve the low 1MiB when the crashkernel option is
specified
x86/kdump: clean up all the code related to the backup region
arch/x86/include/asm/kexec.h | 10 ---- arch/x86/include/asm/purgatory.h | 10 ---- arch/x86/kernel/crash.c | 87 ++++-------------------------- arch/x86/kernel/machine_kexec_64.c | 62 ++++++--------------- arch/x86/purgatory/purgatory.c | 19 ------- arch/x86/realmode/init.c | 2 + include/linux/kexec.h | 2 + kernel/kexec_core.c | 3 ++ 8 files changed, 33 insertions(+), 162 deletions(-)
Signature · 1 line
2.17.1
PATCH v6 1/2 x86/kdump: always reserve the low 1MiB when the crashkernel option is specified
Kdump kernel will reuse the first 640k region because the real mode trampoline has to work in this area. When the vmcore is dumped, the old memory in this area may be accessed, therefore, kernel has to copy the contents of the first 640k area to a backup region so that kdump kernel can read the old memory from the backup area of the first 640k area, which is done in the purgatory().
But, the current handling of copying the first 640k area runs into problems when SME is enabled, kernel does not properly copy these old memory to the backup area in the purgatory(), thereby, kdump kernel reads out the encrypted contents, because the kdump kernel must access the first kernel's memory with the encryption bit set when SME is enabled in the first kernel. Please refer to this link:
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204793
Finally, it causes the following errors, and the crash tool gets invalid pointers when parsing the vmcore.
crash> kmem -s|grep -i invalid
kmem: dma-kmalloc-512: slab:ffffd77680001c00 invalid freepointer:a6086ac099f0c5a4
kmem: dma-kmalloc-512: slab:ffffd77680001c00 invalid freepointer:a6086ac099f0c5a4 crash>
To avoid the above errors, when the crashkernel option is specified, lets reserve the remaining low 1MiB memory(after reserving real mode memory) so that the allocated memory does not fall into the low 1MiB area, which makes us not to copy the first 640k content to a backup region in purgatory(). This indicates that it does not need to be included in crash dumps or used for anything except the processor trampolines that must live in the low 1MiB.
---
BTW:I also tried to fix the above problem in purgatory(), but there are too many restricts in purgatory() context, for example: i can't allocate new memory to create the identity mapping page table for SME situation.
Currently, there are two places where the first 640k area is needed, the first one is in the find_trampoline_placement(), another one is in the reserve_real_mode(), and their content doesn't matter.
In addition, also need to clean all the code related to the backup region later.
arch/x86/kernel/machine_kexec_64.c | 15 +++++++++++++++ arch/x86/realmode/init.c | 2 ++ include/linux/kexec.h | 2 ++ kernel/kexec_core.c | 3 +++ 4 files changed, 22 insertions(+)
arch/x86/kernel/machine_kexec_64.c +15 -0
@@ -17,6 +17,7 @@#include <linux/suspend.h> #include <linux/vmalloc.h> #include <linux/efi.h> +#include <linux/memblock.h> #include <asm/init.h> #include <asm/pgtable.h>
@@ -27,6 +28,7 @@#include <asm/kexec-bzimage64.h> #include <asm/setup.h> #include <asm/set_memory.h> +#include <asm/cmdline.h> #ifdef CONFIG_ACPI /*
@@ -687,3 +689,16 @@ void arch_kexec_pre_free_pages(void *vaddr, unsigned int pages)*/ set_memory_encrypted ((unsigned long )vaddr, pages); } + +/* +* When the crashkernel option is specified, only use the low +* 1MiB for the real mode trampoline. +*/ +void __init kexec_reserve_low_1MiB (void ) +{ +if (cmdline_find_option (boot_command_line,"crashkernel" , +NULL ,0 ) >0 ) { +memblock_reserve (0 ,1 <<20 ); +pr_info ("Reserving the low 1MiB of memory for crashkernel\n" ); + } +}
arch/x86/realmode/init.c +2 -0
@@ -3,6 +3,7 @@#include <linux/slab.h> #include <linux/memblock.h> #include <linux/mem_encrypt.h> +#include <linux/kexec.h> #include <asm/set_memory.h> #include <asm/pgtable.h>
@@ -34,6 +35,7 @@ void __init reserve_real_mode(void)memblock_reserve (mem, size);set_real_mode_mem (mem); +kexec_reserve_low_1MiB (); }static void __init setup_real_mode (void )
include/linux/kexec.h +2 -0
@@ -306,6 +306,7 @@ extern void __crash_kexec(struct pt_regs *);extern void crash_kexec (struct pt_regs *);int kexec_should_crash (struct task_struct *);int kexec_crash_loaded (void ); +void __init kexec_reserve_low_1MiB (void );void crash_save_cpu (struct pt_regs *regs,int cpu);extern int kimage_crash_copy_vmcoreinfo (struct kimage *image);
@@ -397,6 +398,7 @@ static inline void __crash_kexec(struct pt_regs *regs) { }static inline void crash_kexec (struct pt_regs *regs) { }static inline int kexec_should_crash (struct task_struct *p) {return 0 ; }static inline int kexec_crash_loaded (void ) {return 0 ; } +static inline void __init kexec_reserve_low_1MiB (void ) { }#define kexec_in_progress false#endif /* CONFIG_KEXEC_CORE */
kernel/kexec_core.c +3 -0
@@ -1213,3 +1213,6 @@ void __weak arch_kexec_protect_crashkres(void)void __weak arch_kexec_unprotect_crashkres (void ) {} + +void __init __weak kexec_reserve_low_1MiB (void ) +{}
Signature · 1 line
2.17.1
Re: [PATCH 1/2 v6] x86/kdump: always reserve the low 1MiB when the crashkernel option is specified
Quoted 134 lines · Lianbo Jiang
Kdump kernel will reuse the first 640k region because the real mode trampoline has to work in this area. When the vmcore is dumped, the old memory in this area may be accessed, therefore, kernel has to copy the contents of the first 640k area to a backup region so that kdump kernel can read the old memory from the backup area of the first 640k area, which is done in the
purgatory().But, the current handling of copying the first 640k area runs into problems when SME is enabled, kernel does not properly copy these old memory to the backup area in the
purgatory(), thereby, kdump kernel reads out the encrypted contents, because the kdump kernel must access the first kernel's memory with the encryption bit set when SME is enabled in the first kernel. Please refer to this link:Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204793
Finally, it causes the following errors, and the crash tool gets invalid pointers when parsing the vmcore.
crash> kmem -s|grep -i invalid
kmem: dma-kmalloc-512: slab:ffffd77680001c00 invalid freepointer:a6086ac099f0c5a4
kmem: dma-kmalloc-512: slab:ffffd77680001c00 invalid freepointer:a6086ac099f0c5a4 crash>To avoid the above errors, when the crashkernel option is specified, lets reserve the remaining low 1MiB memory(after reserving real mode memory) so that the allocated memory does not fall into the low 1MiB area, which makes us not to copy the first 640k content to a backup region in
purgatory(). This indicates that it does not need to be included in crash dumps or used for anything except the processor trampolines that must live in the low 1MiB.Signed-off-by Lianbo Jiang <[email protected]>---
BTW:I also tried to fix the above problem inpurgatory(), but there are too many restricts inpurgatory()context, for example: i can't allocate new memory to create the identity mapping page table for SME situation.Currently, there are two places where the first 640k area is needed, the first one is in the
find_trampoline_placement(), another one is in thereserve_real_mode(), and their content doesn't matter.In addition, also need to clean all the code related to the backup region later.
arch/x86/kernel/machine_kexec_64.c | 15 +++++++++++++++ arch/x86/realmode/init.c | 2 ++ include/linux/kexec.h | 2 ++ kernel/kexec_core.c | 3 +++ 4 files changed, 22 insertions(+)arch/x86/kernel/machine_kexec_64.c +15
-0@@ -17,6 +17,7 @@#include <linux/suspend.h> #include <linux/vmalloc.h> #include <linux/efi.h> +#include <linux/memblock.h> #include <asm/init.h> #include <asm/pgtable.h> @@ -27,6 +28,7 @@#include <asm/kexec-bzimage64.h> #include <asm/setup.h> #include <asm/set_memory.h> +#include <asm/cmdline.h> #ifdef CONFIG_ACPI /* @@ -687,3 +689,16 @@ void arch_kexec_pre_free_pages(void *vaddr, unsigned int pages)*/ set_memory_encrypted ((unsigned long )vaddr, pages); } + +/* +* When the crashkernel option is specified, only use the low +* 1MiB for the real mode trampoline. +*/ +void __init kexec_reserve_low_1MiB (void ) +{ +if (cmdline_find_option (boot_command_line,"crashkernel" , +NULL ,0 ) >0 ) { +memblock_reserve (0 ,1 <<20 ); +pr_info ("Reserving the low 1MiB of memory for crashkernel\n" ); + } +}arch/x86/realmode/init.c +2
-0@@ -3,6 +3,7 @@#include <linux/slab.h> #include <linux/memblock.h> #include <linux/mem_encrypt.h> +#include <linux/kexec.h> #include <asm/set_memory.h> #include <asm/pgtable.h> @@ -34,6 +35,7 @@ void __init reserve_real_mode(void)memblock_reserve (mem, size);set_real_mode_mem (mem); +kexec_reserve_low_1MiB (); }static void __init setup_real_mode (void )include/linux/kexec.h +2
-0@@ -306,6 +306,7 @@ extern void __crash_kexec(struct pt_regs *);extern void crash_kexec (struct pt_regs *);int kexec_should_crash (struct task_struct *);int kexec_crash_loaded (void ); +void __init kexec_reserve_low_1MiB (void );void crash_save_cpu (struct pt_regs *regs,int cpu);extern int kimage_crash_copy_vmcoreinfo (struct kimage *image);@@ -397,6 +398,7 @@ static inline void __crash_kexec(struct pt_regs *regs) { }static inline void crash_kexec (struct pt_regs *regs) { }static inline int kexec_should_crash (struct task_struct *p) {return 0 ; }static inline int kexec_crash_loaded (void ) {return 0 ; } +static inline void __init kexec_reserve_low_1MiB (void ) { }#define kexec_in_progress false#endif /* CONFIG_KEXEC_CORE */ kernel/kexec_core.c +0
-0
kernel/kexec_core.c void __weak arch_kexec_protect_crashkres(void) · line 1218
Quoted 6 lines
kernel/kexec_core.c +3
-0@@ -1213,3 +1213,6 @@ void __weak arch_kexec_protect_crashkres(void)void __weak arch_kexec_unprotect_crashkres (void ) {} + +void __init __weak kexec_reserve_low_1MiB (void ) +{}
Hi Lianbo,
Since this is x86 only, add a weak function sounds not necessary. For example can just move it to arch/x86/include/asm/kexec.h Or maybe even better to limit it to kdump only, move it to arch/x86/include/asm/crash.h
and arch/x86/kernel/crash.c
Thanks
Dave
Re: [PATCH 1/2 v6] x86/kdump: always reserve the low 1MiB when the crashkernel option is specified
Quoted 144 lines · Dave Young
Quoted 134 lines · Lianbo Jiang
Kdump kernel will reuse the first 640k region because the real mode trampoline has to work in this area. When the vmcore is dumped, the old memory in this area may be accessed, therefore, kernel has to copy the contents of the first 640k area to a backup region so that kdump kernel can read the old memory from the backup area of the first 640k area, which is done in the
purgatory().But, the current handling of copying the first 640k area runs into problems when SME is enabled, kernel does not properly copy these old memory to the backup area in the
purgatory(), thereby, kdump kernel reads out the encrypted contents, because the kdump kernel must access the first kernel's memory with the encryption bit set when SME is enabled in the first kernel. Please refer to this link:Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=204793
Finally, it causes the following errors, and the crash tool gets invalid pointers when parsing the vmcore.
crash> kmem -s|grep -i invalid
kmem: dma-kmalloc-512: slab:ffffd77680001c00 invalid freepointer:a6086ac099f0c5a4
kmem: dma-kmalloc-512: slab:ffffd77680001c00 invalid freepointer:a6086ac099f0c5a4 crash>To avoid the above errors, when the crashkernel option is specified, lets reserve the remaining low 1MiB memory(after reserving real mode memory) so that the allocated memory does not fall into the low 1MiB area, which makes us not to copy the first 640k content to a backup region in
purgatory(). This indicates that it does not need to be included in crash dumps or used for anything except the processor trampolines that must live in the low 1MiB.Signed-off-by Lianbo Jiang <[email protected]>---
BTW:I also tried to fix the above problem inpurgatory(), but there are too many restricts inpurgatory()context, for example: i can't allocate new memory to create the identity mapping page table for SME situation.Currently, there are two places where the first 640k area is needed, the first one is in the
find_trampoline_placement(), another one is in thereserve_real_mode(), and their content doesn't matter.In addition, also need to clean all the code related to the backup region later.
arch/x86/kernel/machine_kexec_64.c | 15 +++++++++++++++ arch/x86/realmode/init.c | 2 ++ include/linux/kexec.h | 2 ++ kernel/kexec_core.c | 3 +++ 4 files changed, 22 insertions(+)arch/x86/kernel/machine_kexec_64.c +15
-0@@ -17,6 +17,7 @@#include <linux/suspend.h> #include <linux/vmalloc.h> #include <linux/efi.h> +#include <linux/memblock.h> #include <asm/init.h> #include <asm/pgtable.h> @@ -27,6 +28,7 @@#include <asm/kexec-bzimage64.h> #include <asm/setup.h> #include <asm/set_memory.h> +#include <asm/cmdline.h> #ifdef CONFIG_ACPI /* @@ -687,3 +689,16 @@ void arch_kexec_pre_free_pages(void *vaddr, unsigned int pages)*/ set_memory_encrypted ((unsigned long )vaddr, pages); } + +/* +* When the crashkernel option is specified, only use the low +* 1MiB for the real mode trampoline. +*/ +void __init kexec_reserve_low_1MiB (void ) +{ +if (cmdline_find_option (boot_command_line,"crashkernel" , +NULL ,0 ) >0 ) { +memblock_reserve (0 ,1 <<20 ); +pr_info ("Reserving the low 1MiB of memory for crashkernel\n" ); + } +}arch/x86/realmode/init.c +2
-0@@ -3,6 +3,7 @@#include <linux/slab.h> #include <linux/memblock.h> #include <linux/mem_encrypt.h> +#include <linux/kexec.h> #include <asm/set_memory.h> #include <asm/pgtable.h> @@ -34,6 +35,7 @@ void __init reserve_real_mode(void)memblock_reserve (mem, size);set_real_mode_mem (mem); +kexec_reserve_low_1MiB (); }static void __init setup_real_mode (void )include/linux/kexec.h +2
-0@@ -306,6 +306,7 @@ extern void __crash_kexec(struct pt_regs *);extern void crash_kexec (struct pt_regs *);int kexec_should_crash (struct task_struct *);int kexec_crash_loaded (void ); +void __init kexec_reserve_low_1MiB (void );void crash_save_cpu (struct pt_regs *regs,int cpu);extern int kimage_crash_copy_vmcoreinfo (struct kimage *image);@@ -397,6 +398,7 @@ static inline void __crash_kexec(struct pt_regs *regs) { }static inline void crash_kexec (struct pt_regs *regs) { }static inline int kexec_should_crash (struct task_struct *p) {return 0 ; }static inline int kexec_crash_loaded (void ) {return 0 ; } +static inline void __init kexec_reserve_low_1MiB (void ) { }#define kexec_in_progress false#endif /* CONFIG_KEXEC_CORE */ kernel/kexec_core.c +0
-0kernel/kexec_core.c void __weak arch_kexec_protect_crashkres(void) · line 1218
Quoted 6 lines
kernel/kexec_core.c +3
-0@@ -1213,3 +1213,6 @@ void __weak arch_kexec_protect_crashkres(void)void __weak arch_kexec_unprotect_crashkres (void ) {} + +void __init __weak kexec_reserve_low_1MiB (void ) +{}Hi Lianbo,
Quoted 6 lines
Since this is x86 only, add a weak function sounds not necessary. For example can just move it to
arch/x86/include/asm/kexec.hOr maybe even better to limit it to kdump only, move it toarch/x86/include/asm/crash.h
andarch/x86/kernel/crash.c
Good point. I will improve them and then post again.
Thanks.
Lianbo
Quoted 3 lines
Thanks
Dave
PATCH v6 2/2 x86/kdump: clean up all the code related to the backup region
In reply to Lianbo JiangWhen the crashkernel kernel command line option is specified, the low 1MiB memory will always be reserved, which makes that the memory allocated later won't fall into the low 1MiB area, thereby, it's not necessary to create a backup region and also no need to copy the first 640k content to a backup region.
Currently, the code related to the backup region can be safely removed, so lets clean up.
--- arch/x86/include/asm/kexec.h | 10 ---- arch/x86/include/asm/purgatory.h | 10 ---- arch/x86/kernel/crash.c | 87 ++++-------------------------- arch/x86/kernel/machine_kexec_64.c | 47 ---------------- arch/x86/purgatory/purgatory.c | 19 ------- 5 files changed, 11 insertions(+), 162 deletions(-)
arch/x86/include/asm/kexec.h +0 -10
@@ -66,10 +66,6 @@ struct kimage;# define KEXEC_ARCH KEXEC_ARCH_X86_64#endif -/* Memory to backup during crash kdump */ -#define KEXEC_BACKUP_SRC_START (0UL) -#define KEXEC_BACKUP_SRC_END (640 * 1024UL - 1)/* 640K */ -/* * This function is responsible for capturing register states if coming * via panic otherwise just fix up the ss and sp if coming via kernel
@@ -154,12 +150,6 @@ struct kimage_arch {pud_t *pud;pmd_t *pmd;pte_t *pte; -/* Details of backup region */ -unsigned long backup_src_start; -unsigned long backup_src_sz; - -/* Physical address of backup segment */ -unsigned long backup_load_addr;/* Core ELF header buffer */ void *elf_headers;
arch/x86/include/asm/purgatory.h +0 -10
@@ -6,16 +6,6 @@#include <linux/purgatory.h> extern void purgatory (void ); -/* -* These forward declarations serve two purposes: -* -* 1) Make sparse happy when checking arch/purgatory -* 2) Document that these are required to be global so the symbol -* lookup in kexec works -*/ -extern unsigned long purgatory_backup_dest; -extern unsigned long purgatory_backup_src; -extern unsigned long purgatory_backup_sz;#endif /* __ASSEMBLY__ */ #endif /* _ASM_PURGATORY_H */
arch/x86/kernel/crash.c +11 -76
141 lines not on this page · raw message
arch/x86/kernel/machine_kexec_64.c +0 -47
59 lines not on this page · raw message
arch/x86/purgatory/purgatory.c +0 -19
@@ -14,28 +14,10 @@#include "../boot/string.h" -unsigned long purgatory_backup_dest __section(.kexec-purgatory); -unsigned long purgatory_backup_src __section(.kexec-purgatory); -unsigned long purgatory_backup_sz __section(.kexec-purgatory); - u8 purgatory_sha256_digest[SHA256_DIGEST_SIZE] __section(.kexec-purgatory); struct kexec_sha_region purgatory_sha_regions[KEXEC_SEGMENT_MAX] __section(.kexec-purgatory); -/* -* On x86, second kernel requries first 640K of memory to boot. Copy -* first 640K to a backup region in reserved memory range so that second -* kernel can use first 640K. -*/ -static int copy_backup_region (void ) -{ -if (purgatory_backup_dest) { -memcpy ((void *)purgatory_backup_dest, - (void *)purgatory_backup_src, purgatory_backup_sz); - } -return 0 ; -} -static int verify_sha256_digest (void ) {struct kexec_sha_region *ptr, *end;
@@ -66,7 +48,6 @@ void purgatory(void)for (;;) ; } -copy_backup_region (); }/*
Signature · 7 lines
2.17.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec