x86/kdump: Fix 'kmem -s' reported an invalid freepointer when SME was active
Subsystems (3)
v7 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.
Changes since v6:
[1] Move the kexec_reserve_low_1MiB() to arch/x86/kernel/crash.c and also move its declaration function to arch/x86/include/asm/crash.h (Suggested by Dave Young)
[2] Adjust the corresponding header files.
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/crash.h | 6 ++ arch/x86/include/asm/kexec.h | 10 --- arch/x86/include/asm/purgatory.h | 10 --- arch/x86/kernel/crash.c | 102 ++++++++--------------------- arch/x86/kernel/machine_kexec_64.c | 47 ------------- arch/x86/purgatory/purgatory.c | 19 ------ arch/x86/realmode/init.c | 2 + 7 files changed, 34 insertions(+), 162 deletions(-)
Signature · 1 line
2.17.1
PATCH v7 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.
--- arch/x86/include/asm/crash.h | 6 ++++++ arch/x86/kernel/crash.c | 15 +++++++++++++++ arch/x86/realmode/init.c | 2 ++ 3 files changed, 23 insertions(+)
arch/x86/include/asm/crash.h +6 -0
@@ -8,4 +8,10 @@ int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params);void crash_smp_send_stop (void ); +#ifdef CONFIG_KEXEC_CORE +void __init kexec_reserve_low_1MiB (void ); +#else +static inline void __init kexec_reserve_low_1MiB (void ) { } +#endif +#endif /* _ASM_X86_CRASH_H */
arch/x86/kernel/crash.c +15 -0
@@ -24,6 +24,7 @@#include <linux/export.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <linux/memblock.h> #include <asm/processor.h> #include <asm/hardirq.h>
@@ -39,6 +40,7 @@#include <asm/virtext.h> #include <asm/intel_pt.h> #include <asm/crash.h> +#include <asm/cmdline.h> /* Used while preparing memory map entries for second kernel */ struct crash_memmap_data {
@@ -68,6 +70,19 @@ static inline void cpu_crash_vmclear_loaded_vmcss(void)rcu_read_unlock (); } +/* +* 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" ); + } +} +#if defined(CONFIG_SMP ) && defined(CONFIG_X86_LOCAL_APIC )static void kdump_nmi_callback (int cpu,struct pt_regs *regs)
arch/x86/realmode/init.c +2 -0
@@ -8,6 +8,7 @@#include <asm/pgtable.h> #include <asm/realmode.h> #include <asm/tlbflush.h> +#include <asm/crash.h> struct real_mode_header *real_mode_header;u32 *trampoline_cr4_features;
@@ -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 )
Signature · 7 lines
2.17.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 1/2 v7] x86/kdump: always reserve the low 1MiB when the crashkernel option is specified
Quoted 75 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]>--- arch/x86/include/asm/crash.h | 6 ++++++ arch/x86/kernel/crash.c | 15 +++++++++++++++ arch/x86/realmode/init.c | 2 ++ 3 files changed, 23 insertions(+)arch/x86/include/asm/crash.h +6
-0@@ -8,4 +8,10 @@ int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params);void crash_smp_send_stop (void ); +#ifdef CONFIG_KEXEC_CORE +void __init kexec_reserve_low_1MiB (void ); +#else +static inline void __init kexec_reserve_low_1MiB (void ) { } +#endif +#endif /* _ASM_X86_CRASH_H */ arch/x86/kernel/crash.c +2
-0@@ -24,6 +24,7 @@#include <linux/export.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <linux/memblock.h> #include <asm/processor.h> #include <asm/hardirq.h> @@ -39,6 +40,7 @@#include <asm/virtext.h> #include <asm/intel_pt.h> #include <asm/crash.h> +#include <asm/cmdline.h> /* Used while preparing memory map entries for second kernel */ struct crash_memmap_data {
arch/x86/kernel/crash.c static inline void cpu_crash_vmclear_loaded_vmcss(void) · line 77
Quoted 8 lines
arch/x86/kernel/crash.c +5
-0@@ -68,6 +70,19 @@ static inline void cpu_crash_vmclear_loaded_vmcss(void)rcu_read_unlock (); } +/* +* When the crashkernel option is specified, only use the low +* 1MiB for the real mode trampoline. +*/ +void __init kexec_reserve_low_1MiB (void )
Thanks for the effort, Lianbo. I believe everyone is confident with this solution and fix.
I have a tiny concern, why the function name is kexec_reserve_low_1MiB(), but not kexec_reserve_low_1M()?
I searched in kernel code with below filter, didn't see MiB appearing in a function name. I am not sure about it either, just ask.
git grep "_[1-9]*M " arch/ kernel/ mm include/ drivers/ net/ init fs crypto/ certs/ ipc lib
Thanks
Baoquan
Quoted 34 lines
arch/x86/kernel/crash.c +8
-0+{ +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" ); + } +} +#if defined(CONFIG_SMP ) && defined(CONFIG_X86_LOCAL_APIC )static void kdump_nmi_callback (int cpu,struct pt_regs *regs)arch/x86/realmode/init.c +2
-0@@ -8,6 +8,7 @@#include <asm/pgtable.h> #include <asm/realmode.h> #include <asm/tlbflush.h> +#include <asm/crash.h> struct real_mode_header *real_mode_header;u32 *trampoline_cr4_features;@@ -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 )Signature · 1 line
2.17.1
Re: [PATCH 1/2 v7] x86/kdump: always reserve the low 1MiB when the crashkernel option is specified
Quoted 88 lines · Baoquan He
Quoted 75 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]>--- arch/x86/include/asm/crash.h | 6 ++++++ arch/x86/kernel/crash.c | 15 +++++++++++++++ arch/x86/realmode/init.c | 2 ++ 3 files changed, 23 insertions(+)arch/x86/include/asm/crash.h +6
-0@@ -8,4 +8,10 @@ int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params);void crash_smp_send_stop (void ); +#ifdef CONFIG_KEXEC_CORE +void __init kexec_reserve_low_1MiB (void ); +#else +static inline void __init kexec_reserve_low_1MiB (void ) { } +#endif +#endif /* _ASM_X86_CRASH_H */ arch/x86/kernel/crash.c +2
-0@@ -24,6 +24,7 @@#include <linux/export.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <linux/memblock.h> #include <asm/processor.h> #include <asm/hardirq.h> @@ -39,6 +40,7 @@#include <asm/virtext.h> #include <asm/intel_pt.h> #include <asm/crash.h> +#include <asm/cmdline.h> /* Used while preparing memory map entries for second kernel */ struct crash_memmap_data {arch/x86/kernel/crash.c static inline void cpu_crash_vmclear_loaded_vmcss(void) · line 77
Quoted 8 lines
arch/x86/kernel/crash.c +5
-0@@ -68,6 +70,19 @@ static inline void cpu_crash_vmclear_loaded_vmcss(void)rcu_read_unlock (); } +/* +* When the crashkernel option is specified, only use the low +* 1MiB for the real mode trampoline. +*/ +void __init kexec_reserve_low_1MiB (void )Thanks for the effort, Lianbo. I believe everyone is confident with this solution and fix.
Quoted 2 lines
I have a tiny concern, why the function name is
kexec_reserve_low_1MiB(), but notkexec_reserve_low_1M()?
Thanks for your comment, Baoquan.
It means that kernel will reserve 1M 'Byte' memory, the function name does not have special meaning.
Would you mind if i change it to the crash_reserve_low_1M()?
void __init crash_reserve_low_1M(void)
Thanks.
Lianbo
Quoted 38 lines
I searched in kernel code with below filter, didn't see MiB appearing in a function name. I am not sure about it either, just ask.
git grep "_[1-9]*M "
arch/kernel/mminclude/drivers/net/init fscrypto/certs/ipc libThanks
BaoquanQuoted 30 lines
arch/x86/kernel/crash.c +8
-0+{ +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" ); + } +} +#if defined(CONFIG_SMP ) && defined(CONFIG_X86_LOCAL_APIC )static void kdump_nmi_callback (int cpu,struct pt_regs *regs)arch/x86/realmode/init.c +2
-0@@ -8,6 +8,7 @@#include <asm/pgtable.h> #include <asm/realmode.h> #include <asm/tlbflush.h> +#include <asm/crash.h> struct real_mode_header *real_mode_header;u32 *trampoline_cr4_features;@@ -34,6 +35,7 @@ void __init reserve_real_mode(void)memblock_reserve (mem, size);set_real_mode_mem (mem); +kexec_reserve_low_1MiB (); }
Quoted 4 lines
Quoted 4 lines
arch/x86/realmode/init.c +0
-0static void __init setup_real_mode (void )Signature · 1 line
2.17.1
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 1/2 v7] x86/kdump: always reserve the low 1MiB when the crashkernel option is specified
Quoted 17 lines · lijiang
Quoted 14 lines
arch/x86/kernel/crash.c static inline void cpu_crash_vmclear_loaded_vmcss(void) · line 77
Quoted 10 lines
struct
crash_memmap_data{arch/x86/kernel/crash.c +5
-0@@ -68,6 +70,19 @@ static inline void cpu_crash_vmclear_loaded_vmcss(void)rcu_read_unlock (); } +/* +* When the crashkernel option is specified, only use the low +* 1MiB for the real mode trampoline. +*/ +void __init kexec_reserve_low_1MiB (void )Thanks for the effort, Lianbo. I believe everyone is confident with this solution and fix.
Quoted 2 lines
I have a tiny concern, why the function name is
kexec_reserve_low_1MiB(), but notkexec_reserve_low_1M()?
Quoted 6 lines
Thanks for your comment, Baoquan.
It means that kernel will reserve 1M 'Byte' memory, the function name does not have special meaning.
Would you mind if i change it to the
crash_reserve_low_1M()?
Yes, crash_xx looks better since it's only related to crash dumping. As for 1M, not very sure, see if other people have comment about it. Anyway, crash_reserve_low_1M() looks good to me. Thanks.
Quoted 44 lines
void
__initcrash_reserve_low_1M(void)Thanks.
LianboQuoted 38 lines
I searched in kernel code with below filter, didn't see MiB appearing in a function name. I am not sure about it either, just ask.
git grep "_[1-9]*M "
arch/kernel/mminclude/drivers/net/init fscrypto/certs/ipc libThanks
BaoquanQuoted 30 lines
arch/x86/kernel/crash.c +8
-0+{ +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" ); + } +} +#if defined(CONFIG_SMP ) && defined(CONFIG_X86_LOCAL_APIC )static void kdump_nmi_callback (int cpu,struct pt_regs *regs)arch/x86/realmode/init.c +2
-0@@ -8,6 +8,7 @@#include <asm/pgtable.h> #include <asm/realmode.h> #include <asm/tlbflush.h> +#include <asm/crash.h> struct real_mode_header *real_mode_header;u32 *trampoline_cr4_features;@@ -34,6 +35,7 @@ void __init reserve_real_mode(void)memblock_reserve (mem, size);set_real_mode_mem (mem); +kexec_reserve_low_1MiB (); }
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
arch/x86/realmode/init.c +0
-0static void __init setup_real_mode (void )Signature · 1 line
2.17.1
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
kbuild test robot
build botRe: [PATCH 1/2 v7] x86/kdump: always reserve the low 1MiB when the crashkernel option is specified
In reply to Lianbo JiangThank you for the patch! Perhaps something to improve:
Hi Lianbo,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.4-rc5 next-20191030]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Lianbo-Jiang/x86-kdump-Fix-kmem-s-reported-an-invalid-freepointer-when-SME-was-active/20191031-001903 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 320000e72ec0613e164ce9608d865396fb2da278 config: i386-defconfig (attached as .config) compiler: gcc-7 (Debian 7.4.0-14) 7.4.0 reproduce: # save the attached .config to linux build tree make ARCH=i386
If you fix the issue, kindly add following tag
All warnings (new ones prefixed by >>):
In file included from arch/x86/realmode/init.c:11:0:
>> arch/x86/include/asm/crash.h:5:32: warning: 'struct kimage' declared inside parameter list will not be visible outside of this definition or declaration
int crash_load_segments(struct kimage *image);
^~~~~~
arch/x86/include/asm/crash.h:6:37: warning: 'struct kimage' declared inside parameter list will not be visible outside of this definition or declaration
int crash_copy_backup_region(struct kimage *image);
^~~~~~ arch/x86/include/asm/crash.h:7:39: warning: 'struct kimage' declared inside parameter list will not be visible outside of this definition or declaration
int crash_setup_memmap_entries(struct kimage *image,
^~~~~~
vim +5 arch/x86/include/asm/crash.h
dd5f726076cc76 Vivek Goyal 2014-08-08 4
dd5f726076cc76 Vivek Goyal 2014-08-08 @5 int crash_load_segments(struct kimage *image); dd5f726076cc76 Vivek Goyal 2014-08-08 6 int crash_copy_backup_region(struct kimage *image); dd5f726076cc76 Vivek Goyal 2014-08-08 7 int crash_setup_memmap_entries(struct kimage *image, dd5f726076cc76 Vivek Goyal 2014-08-08 8 struct boot_params *params); 89f579ce99f7e0 Yi Wang 2018-11-22 9 void crash_smp_send_stop(void);
dd5f726076cc76 Vivek Goyal 2014-08-08 10
:::::: The code at line 5 was first introduced by commit
:::::: dd5f726076cc7639d9713b334c8c133f77c6757a kexec: support for kexec on panic using new system call
:::::: TO: Vivek Goyal <[email protected]> :::::: CC: Linus Torvalds <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH 1/2 v7] x86/kdump: always reserve the low 1MiB when the crashkernel option is specified
Quoted 25 lines · kbuild test robot
Hi Lianbo,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.4-rc5 next-20191030]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]url: https://github.com/0day-ci/linux/commits/Lianbo-Jiang/x86-kdump-Fix-kmem-s-reported-an-invalid-freepointer-when-SME-was-active/20191031-001903 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 320000e72ec0613e164ce9608d865396fb2da278 config: i386-defconfig (attached as .config) compiler: gcc-7 (Debian 7.4.0-14) 7.4.0 reproduce: # save the attached .config to linux build tree make ARCH=i386If you fix the issue, kindly add following tag
Reported-by kbuild test robot <[email protected]>All warnings (new ones prefixed by >>):
In file included from
arch/x86/realmode/init.c:11:0:Quoted 1 line
Quoted 1 line
arch/x86/include/asm/crash.h:5:32: warning: 'struct kimage' declared inside parameter list will not be visible outside of this definition or declaration
Quoted 9 lines
int crash_load_segments(struct kimage *image); ^~~~~~ arch/x86/include/asm/crash.h:6:37: warning: 'struct kimage' declared inside parameter list will not be visible outside of this definition or declaration int crash_copy_backup_region(struct kimage *image); ^~~~~~
arch/x86/include/asm/crash.h:7:39: warning: 'struct kimage' declared inside parameter list will not be visible outside of this definition or declaration
int crash_setup_memmap_entries(struct kimage *image,
^~~~~~
Hi,
The above warnings will still occur without my patches.
But i will fix the warnings in my patch series, and resend v8 later.
Thanks.
Lianbo
Quoted 8 lines
vim +5
arch/x86/include/asm/crash.h
dd5f726076cc76Vivek Goyal 2014-08-08 4dd5f726076cc76 Vivek Goyal 2014-08-08 @5 int crash_load_segments(struct kimage *image); dd5f726076cc76 Vivek Goyal 2014-08-08 6 int crash_copy_backup_region(struct kimage *image); dd5f726076cc76 Vivek Goyal 2014-08-08 7 int crash_setup_memmap_entries(struct kimage *image, dd5f726076cc76 Vivek Goyal 2014-08-08 8 struct boot_params *params); 89f579ce99f7e0 Yi Wang 2018-11-22 9 void crash_smp_send_stop(void);
Quoted 5 lines
dd5f726076cc76Vivek Goyal 2014-08-08 10:::::: The code at line 5 was first introduced by commit
::::::dd5f726076cc7639d9713b334c8c133f77c6757akexec: support for kexec on panic using new system call
Exactly.
Quoted 7 lines
:::::: TO: Vivek Goyal <[email protected]> :::::: CC: Linus Torvalds <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
PATCH v7 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