Skip to contentSkip to conversation

x86/kdump: Fix 'kmem -s' reported an invalid freepointer when SME was active

PATCH RESEND Superseded Lianbo Jiang 2 participants 7 messages Oct 31, 2019 – Nov 1, 2019

Subsystems (3)

v8 of 9 Superseded Latest is v9 →

lore
Share & tools
lore
#0 lore raw

v8 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 1M 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 1M region, because the memory allocated later won't fall into the low 1M area.

This series includes two patches:
[1] x86/kdump: always reserve the low 1M when the crashkernel option is specified
The low 1M 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 1M 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 1M 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.

Changes since v7:
[1] Change the function name from kexec_reserve_low_1MiB() to

    crash_reserve_low_1M().

[2] Fix some warnings reported by kduild.

Lianbo Jiang (2):
x86/kdump: always reserve the low 1M when the crashkernel option is
specified
x86/kdump: clean up all the code related to the backup region

 arch/x86/include/asm/crash.h       |   8 +++
 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, 36 insertions(+), 162 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH RESEND v8 1/2 x86/kdump: always reserve the low 1M 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 1M memory(after reserving real mode memory) so that the allocated memory does not fall into the low 1M 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 1M.

---
 arch/x86/include/asm/crash.h |  8 ++++++++
 arch/x86/kernel/crash.c      | 15 +++++++++++++++
 arch/x86/realmode/init.c     |  2 ++
 3 files changed, 25 insertions(+)
arch/x86/include/asm/crash.h +8 -0
index 0acf5ee45a21..88eadd08ad70 100644
@@ -2,10 +2,18 @@
 #ifndef _ASM_X86_CRASH_H
 #define _ASM_X86_CRASH_H
 
+struct kimage;
+
 int crash_load_segments(struct kimage *image);
 int crash_copy_backup_region(struct kimage *image);
 int crash_setup_memmap_entries(struct kimage *image,
 		struct boot_params *params);
 void crash_smp_send_stop(void);
 
+#ifdef CONFIG_KEXEC_CORE
+void __init crash_reserve_low_1M(void);
+#else
+static inline void __init crash_reserve_low_1M(void) { }
+#endif
+
 #endif /* _ASM_X86_CRASH_H */
arch/x86/kernel/crash.c +15 -0
index eb651fbde92a..db2301afade5 100644
@@ -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
+ * 1M for the real mode trampoline.
+ */
+void __init crash_reserve_low_1M(void)
+{
+	if (cmdline_find_option(boot_command_line, "crashkernel",
+				NULL, 0) > 0) {
+		memblock_reserve(0, 1<<20);
+		pr_info("Reserving the low 1M 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
index 7dce39c8c034..262f83cad355 100644
@@ -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);
+	crash_reserve_low_1M();
 }
 
 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
maintainer
#2 lore raw

Re: [PATCH 1/2 RESEND v8] x86/kdump: always reserve the low 1M when the crashkernel option is specified

Quoted 32 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 1M memory(after reserving real mode memory) so that the allocated memory does not fall into the low 1M 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 1M.

Quoted 2 lines

Please do not merge a 0day bot fix with another patch of yours which does not cause it in the first place. When you look at this patch alone, what do you think the Reported-by tag means, if anything at all?

Also, it is not a "RESEND" if you change them. You can call them v8.1 or whatever to denote that the change is small.

Also, do not send v9 or v8.1 or whatever, immediately but wait for other reviews. You have sent these patches 4(!) times in this week alone. How would you feel if I hammer your inbox with patches on a daily basis?

You can read

https://www.kernel.org/doc/html/latest/process/submitting-patches.html

in the meantime, especially section

"9) Don't get discouraged - or impatient"

while waiting.

Thx.

Signature · 5 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--
author
#3 lore raw

Re: [PATCH 1/2 RESEND v8] x86/kdump: always reserve the low 1M when the crashkernel option is specified

Quoted 4 lines · Borislav Petkov

Please do not merge a 0day bot fix with another patch of yours which does not cause it in the first place. When you look at this patch alone, what do you think the Reported-by tag means, if anything at all?

Thanks for your suggestions.

Maybe it should be a separate patch to fix the old compile warnings as follow. And i should put the patch into this series.

commit d2091d1f4f67f1c38293b0e93fdbfefa766940cf (HEAD -> master)

Author: Lianbo Jiang <[email protected]>
Date:   Thu Oct 31 15:48:02 2019 +0800

kexec: Fix i386 build warnings that missed declaration of struct kimage

Kbuild test robot reported some build warnings, please refer to the Link below for details.

Add a declaration of struct kimage to fix these compile warnings.

Fixes dd5f726076cc ("kexec: support for kexec on panic using new system call")
arch/x86/include/asm/crash.h +2 -0
index 0acf5ee45a21..ef5638f641f2 100644
@@ -2,6 +2,8 @@
 #ifndef _ASM_X86_CRASH_H
 #define _ASM_X86_CRASH_H
 
+struct kimage;
+
 int crash_load_segments(struct kimage *image);
 int crash_copy_backup_region(struct kimage *image);
 int crash_setup_memmap_entries(struct kimage *image,
Quoted 3 lines

Also, it is not a "RESEND" if you change them. You can call them v8.1 or whatever to denote that the change is small.

Thanks for your explanation in detail.

Quoted 2 lines

Also, do not send v9 or v8.1 or whatever, immediately but wait for other reviews.

OK. Lets wait a week or more.

Quoted 3 lines

You have sent these patches 4(!) times in this week alone. How would you feel if I hammer your inbox with patches on a daily basis? Probably because the change is small.

Anyway, so sorry, it seems inconsiderate.

Quoted 9 lines

You can read

https://www.kernel.org/doc/html/latest/process/submitting-patches.html

in the meantime, especially section

"9) Don't get discouraged - or impatient"

while waiting.

OK. Thanks.

Lianbo

maintainer
#4 lore raw

Re: [PATCH 1/2 RESEND v8] x86/kdump: always reserve the low 1M when the crashkernel option is specified

Quoted 2 lines · lijiang

Maybe it should be a separate patch to fix the old compile warnings as follow. And i should put the patch into this series.

Yes, maybe.

Quoted 8 lines

commit d2091d1f4f67f1c38293b0e93fdbfefa766940cf (HEAD -> master)

Author: Lianbo Jiang <[email protected]>
Date:   Thu Oct 31 15:48:02 2019 +0800

kexec: Fix i386 build warnings that missed declaration of struct kimage

Kbuild test robot reported some build warnings, please refer to the Link below for details.

Explain here what the warnings are, why they trigger and how you're fixing it. How a commit message should look like is also explained in that document I pointed you at.

Refering to some link is not what we do in commit messages.

Quoted 6 lines

Add a declaration of struct kimage to fix these compile warnings.

Fixes dd5f726076cc ("kexec: support for kexec on panic using new system call")

*NEVER* use lkml.org or any other external URL for refering to mail threads but *always* use our own

lkml.kernel.org/r/<Message-ID>

redirector. See other tip commits for an example.

Quoted 11 lines
Quoted 9 lines

You can read

https://www.kernel.org/doc/html/latest/process/submitting-patches.html

in the meantime, especially section

"9) Don't get discouraged - or impatient"

while waiting.

OK. Thanks.

And make sure to read that whole document and also have a look at the process document

https://www.kernel.org/doc/html/latest/process/index.html

so that you can avoid such mistakes in the future.

Thx.

Signature · 5 lines
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--
author
#5 lore raw

Re: [PATCH 1/2 RESEND v8] x86/kdump: always reserve the low 1M when the crashkernel option is specified

Quoted 10 lines · Borislav Petkov
Quoted 2 lines · lijiang

Maybe it should be a separate patch to fix the old compile warnings as follow. And i should put the patch into this series.

Yes, maybe.

Quoted 4 lines

commit d2091d1f4f67f1c38293b0e93fdbfefa766940cf (HEAD -> master)

Author: Lianbo Jiang <[email protected]>
Date:   Thu Oct 31 15:48:02 2019 +0800
Quoted 9 lines
Quoted 4 lines

kexec: Fix i386 build warnings that missed declaration of struct kimage

Kbuild test robot reported some build warnings, please refer to the Link below for details.

Explain here what the warnings are, why they trigger and how you're fixing it. How a commit message should look like is also explained in that document I pointed you at.

OK, looks better('what-why-how'). I will improve the above log.

Quoted 9 lines

Refering to some link is not what we do in commit messages.

Quoted 6 lines

Add a declaration of struct kimage to fix these compile warnings.

Fixes dd5f726076cc ("kexec: support for kexec on panic using new system call")
Quoted 7 lines

*NEVER* use lkml.org or any other external URL for refering to mail threads but *always* use our own

lkml.kernel.org/r/<Message-ID>

redirector. See other tip commits for an example.

It's useful to me. Thanks.

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

You can read

https://www.kernel.org/doc/html/latest/process/submitting-patches.html

in the meantime, especially section

Quoted 9 lines
Quoted 5 lines
Quoted 3 lines

"9) Don't get discouraged - or impatient"

while waiting.

OK. Thanks.

And make sure to read that whole document and also have a look at the process document

I will read the above document carefully. But some of the rules in the document are still easy to be forgot, maybe need to practice repeatedly.

Quoted 4 lines

https://www.kernel.org/doc/html/latest/process/index.html

so that you can avoid such mistakes in the future.

Good suggestions. Thank you so much.

Lianbo

Quoted 2 lines

Thx.

#6 lore raw

PATCH RESEND v8 2/2 x86/kdump: clean up all the code related to the backup region

In reply to Lianbo Jiang

When the crashkernel kernel command line option is specified, the low 1M memory will always be reserved, which makes that the memory allocated later won't fall into the low 1M 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
index 5e7d6b46de97..6802c59e8252 100644
@@ -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
index 92c34e517da1..5528e9325049 100644
@@ -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
index 3b95410ff0f8..2961234d0795 100644
@@ -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 · 1 line
2.17.1