kexec: Move vmcoreinfo out of the kernel's .bss section
Subsystems (9)
PATCH v5 1/3 kexec: Move vmcoreinfo out of the kernel's .bss section
As Eric said,
"what we need to do is move the variable vmcoreinfo_note out of the kernel's .bss section. And modify the code to regenerate and keep this information in something like the control page.
Definitely something like this needs a page all to itself, and ideally far away from any other kernel data structures. I clearly was not watching closely the data someone decided to keep this silly thing in the kernel's .bss section."
This patch allocates extra pages for these vmcoreinfo_XXX variables, one advantage is that it enhances some safety of vmcoreinfo, because vmcoreinfo now is kept far away from other kernel data structures.
---v4->v5:
Changed VMCOREINFO_BYTES definition to PAGE_SIZE according to Dave's comment
v3->v4:
-Rebased on the latest linux-next
-Handle S390 vmcoreinfo_note properly
-Handle the newly-added xen/mmu_pv.c
arch/ia64/kernel/machine_kexec.c | 5 ----- arch/s390/kernel/machine_kexec.c | 1 + arch/s390/kernel/setup.c | 6 ------ arch/x86/kernel/crash.c | 2 +- arch/x86/xen/mmu_pv.c | 4 ++-- include/linux/crash_core.h | 4 ++-- kernel/crash_core.c | 26 ++++++++++++++++++++++---- kernel/ksysfs.c | 2 +- 8 files changed, 29 insertions(+), 21 deletions(-)
arch/ia64/kernel/machine_kexec.c +0 -5
@@ -163,8 +163,3 @@ void arch_crash_save_vmcoreinfo(void)#endif } -phys_addr_t paddr_vmcoreinfo_note (void ) -{ -return ia64_tpa ((unsigned long )(char *)&vmcoreinfo_note); -} -
arch/s390/kernel/machine_kexec.c +1 -0
@@ -246,6 +246,7 @@ void arch_crash_save_vmcoreinfo(void)VMCOREINFO_SYMBOL (lowcore_ptr);VMCOREINFO_SYMBOL (high_memory);VMCOREINFO_LENGTH (lowcore_ptr,NR_CPUS ); +mem_assign_absolute (S390_lowcore.vmcore_info,paddr_vmcoreinfo_note ()); }void machine_shutdown (void )
arch/s390/kernel/setup.c +0 -6
@@ -496,11 +496,6 @@ static void __init setup_memory_end(void)pr_notice ("The maximum memory size is %luMB\n" , memory_end >>20 ); } -static void __init setup_vmcoreinfo (void ) -{ -mem_assign_absolute (S390_lowcore.vmcore_info,paddr_vmcoreinfo_note ()); -} -#ifdef CONFIG_CRASH_DUMP /*
@@ -939,7 +934,6 @@ void __init setup_arch(char **cmdline_p)#endif setup_resources (); -setup_vmcoreinfo ();setup_lowcore ();smp_fill_possible_mask ();cpu_detect_mhz_feature ();
arch/x86/kernel/crash.c +1 -1
@@ -457,7 +457,7 @@ static int prepare_elf64_headers(struct crash_elf_data *ced, bufp +=sizeof (Elf64_Phdr); phdr->p_type =PT_NOTE ; phdr->p_offset = phdr->p_paddr =paddr_vmcoreinfo_note (); - phdr->p_filesz = phdr->p_memsz =sizeof (vmcoreinfo_note); + phdr->p_filesz = phdr->p_memsz =VMCOREINFO_NOTE_SIZE ; (ehdr->e_phnum)++;#ifdef CONFIG_X86_64
arch/x86/xen/mmu_pv.c +2 -2
@@ -2723,8 +2723,8 @@ void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order)phys_addr_t paddr_vmcoreinfo_note (void ) {if (xen_pv_domain ()) -return virt_to_machine (&vmcoreinfo_note).maddr; +return virt_to_machine (vmcoreinfo_note).maddr;else -return __pa_symbol (&vmcoreinfo_note); +return __pa (vmcoreinfo_note); }#endif /* CONFIG_KEXEC_CORE */
include/linux/crash_core.h +2 -2
@@ -14,7 +14,7 @@ CRASH_CORE_NOTE_NAME_BYTES + \ CRASH_CORE_NOTE_DESC_BYTES) -#define VMCOREINFO_BYTES (4096) +#define VMCOREINFO_BYTES PAGE_SIZE#define VMCOREINFO_NOTE_NAME "VMCOREINFO"#define VMCOREINFO_NOTE_NAME_BYTES ALIGN(sizeof(VMCOREINFO_NOTE_NAME), 4)#define VMCOREINFO_NOTE_SIZE ((CRASH_CORE_NOTE_HEAD_BYTES * 2) + \
@@ -53,7 +53,7 @@#define VMCOREINFO_PHYS_BASE (value) \ vmcoreinfo_append_str("PHYS_BASE=%lx\n", (unsigned long)value) -extern u32 vmcoreinfo_note[VMCOREINFO_NOTE_SIZE /4 ]; +extern u32 *vmcoreinfo_note;extern size_t vmcoreinfo_size;extern size_t vmcoreinfo_max_size;
kernel/crash_core.c +22 -4
@@ -14,10 +14,10 @@#include <asm/sections.h> /* vmcoreinfo stuff */ -static unsigned char vmcoreinfo_data[VMCOREINFO_BYTES ]; -u32 vmcoreinfo_note[VMCOREINFO_NOTE_SIZE /4 ]; +static unsigned char *vmcoreinfo_data;size_t vmcoreinfo_size; -size_t vmcoreinfo_max_size =sizeof (vmcoreinfo_data); +size_t vmcoreinfo_max_size =VMCOREINFO_BYTES ; +u32 *vmcoreinfo_note;/* * parsing the "crashkernel" commandline
@@ -326,6 +326,9 @@ static void update_vmcoreinfo_note(void)void crash_save_vmcoreinfo (void ) { +if (!vmcoreinfo_note) +return ; +vmcoreinfo_append_str ("CRASHTIME=%ld\n" ,get_seconds ());update_vmcoreinfo_note (); }
@@ -356,11 +359,26 @@ void __weak arch_crash_save_vmcoreinfo(void)phys_addr_t __weak paddr_vmcoreinfo_note (void ) { -return __pa_symbol ((unsigned long )(char *)&vmcoreinfo_note); +return __pa (vmcoreinfo_note); }static int __init crash_save_vmcoreinfo_init (void ) { + vmcoreinfo_data = (unsigned char *)get_zeroed_page (GFP_KERNEL ); +if (!vmcoreinfo_data) { +pr_warn ("Memory allocation for vmcoreinfo_data failed\n" ); +return -ENOMEM ; + } + + vmcoreinfo_note =alloc_pages_exact (VMCOREINFO_NOTE_SIZE , +GFP_KERNEL | __GFP_ZERO); +if (!vmcoreinfo_note) { +free_page ((unsigned long )vmcoreinfo_data); + vmcoreinfo_data =NULL ; +pr_warn ("Memory allocation for vmcoreinfo_note failed\n" ); +return -ENOMEM ; + } +VMCOREINFO_OSRELEASE (init_uts_ns.name.release);VMCOREINFO_PAGESIZE (PAGE_SIZE );
kernel/ksysfs.c +1 -1
@@ -134,7 +134,7 @@ static ssize_t vmcoreinfo_show(struct kobject *kobj, {phys_addr_t vmcore_base =paddr_vmcoreinfo_note ();return sprintf (buf,"%pa %x\n" , &vmcore_base, - (unsigned int )sizeof (vmcoreinfo_note)); + (unsigned int )VMCOREINFO_NOTE_SIZE ); }KERNEL_ATTR_RO (vmcoreinfo);
Signature · 1 line
1.8.3.1
PATCH v5 2/3 powerpc/fadump: Use the correct VMCOREINFO_NOTE_SIZE for phdr
vmcoreinfo_max_size stands for the vmcoreinfo_data, the correct one we should use is vmcoreinfo_note whose total size is VMCOREINFO_NOTE_SIZE.
Like explained in commit 77019967f06b ("kdump: fix exported size of vmcoreinfo note"), it should not affect the actual function, but we better fix it, also this change should be safe and backward compatible.
After this, we can get rid of variable vmcoreinfo_max_size, let's use the corresponding macros directly, fewer variables means more safety for vmcoreinfo operation.
---v4->v5:
No change.
v3->v4:
-Rebased on the latest linux-next
arch/powerpc/kernel/fadump.c | 3 +-- include/linux/crash_core.h | 1 - kernel/crash_core.c | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-)
arch/powerpc/kernel/fadump.c +1 -2
@@ -893,8 +893,7 @@ static int fadump_create_elfcore_headers(char *bufp) phdr->p_paddr =fadump_relocate (paddr_vmcoreinfo_note ()); phdr->p_offset = phdr->p_paddr; - phdr->p_memsz = vmcoreinfo_max_size; - phdr->p_filesz = vmcoreinfo_max_size; + phdr->p_memsz = phdr->p_filesz =VMCOREINFO_NOTE_SIZE ;/* Increment number of program headers. */ (elf->e_phnum)++;
include/linux/crash_core.h +0 -1
@@ -55,7 +55,6 @@extern u32 *vmcoreinfo_note;extern size_t vmcoreinfo_size; -extern size_t vmcoreinfo_max_size;Elf_Word *append_elf_note (Elf_Word *buf,char *name,unsigned int type,void *data,size_t data_len);
kernel/crash_core.c +1 -2
@@ -16,7 +16,6 @@/* vmcoreinfo stuff */ static unsigned char *vmcoreinfo_data;size_t vmcoreinfo_size; -size_t vmcoreinfo_max_size =VMCOREINFO_BYTES ;u32 *vmcoreinfo_note;/*
@@ -343,7 +342,7 @@ void vmcoreinfo_append_str(const char *fmt, ...) r =vscnprintf (buf,sizeof (buf), fmt, args);va_end (args); - r =min (r, vmcoreinfo_max_size - vmcoreinfo_size); + r =min (r,VMCOREINFO_BYTES - vmcoreinfo_size);memcpy (&vmcoreinfo_data[vmcoreinfo_size], buf, r);
Signature · 1 line
1.8.3.1
PATCH v5 3/3 kdump: Protect vmcoreinfo data under the crash memory
In reply to Xunlei PangCurrently vmcoreinfo data is updated at boot time subsys_initcall(), it has the risk of being modified by some wrong code during system is running.
As a result, vmcore dumped may contain the wrong vmcoreinfo. Later on, when using "crash", "makedumpfile", etc utility to parse this vmcore, we probably will get "Segmentation fault" or other unexpected errors.
E.g. 1) wrong code overwrites vmcoreinfo_data; 2) further crashes the system; 3) trigger kdump, then we obviously will fail to recognize the crash context correctly due to the corrupted vmcoreinfo.
Now except for vmcoreinfo, all the crash data is well protected(including the cpu note which is fully updated in the crash path, thus its correctness is guaranteed). Given that vmcoreinfo data is a large chunk prepared for kdump, we better protect it as well.
To solve this, we relocate and copy vmcoreinfo_data to the crash memory when kdump is loading via kexec syscalls. Because the whole crash memory will be protected by existing arch_kexec_protect_crashkres() mechanism, we naturally protect vmcoreinfo_data from write(even read) access under kernel direct mapping after kdump is loaded.
Since kdump is usually loaded at the very early stage after boot, we can trust the correctness of the vmcoreinfo data copied.
On the other hand, we still need to operate the vmcoreinfo safe copy when crash happens to generate vmcoreinfo_note again, we rely on vmap() to map out a new kernel virtual address and update to use this new one instead in the following crash_save_vmcoreinfo().
BTW, we do not touch vmcoreinfo_note, because it will be fully updated using the protected vmcoreinfo_data after crash which is surely correct just like the cpu crash note.
---v4->v5:
- Moved vunmap(image->vmcoreinfo_data_copy) above to avoid confusion.
- No functional change.
v3->v4:
-Rebased on the latest linux-next
-Copy vmcoreinfo after machine_kexec_prepare()
include/linux/crash_core.h | 2 +- include/linux/kexec.h | 2 ++ kernel/crash_core.c | 17 ++++++++++++++++- kernel/kexec.c | 8 ++++++++ kernel/kexec_core.c | 39 +++++++++++++++++++++++++++++++++++++++ kernel/kexec_file.c | 8 ++++++++ 6 files changed, 74 insertions(+), 2 deletions(-)
include/linux/crash_core.h +1 -1
@@ -23,6 +23,7 @@typedef u32 note_buf_t [CRASH_CORE_NOTE_BYTES /4 ]; +void crash_update_vmcoreinfo_safecopy (void *ptr);void crash_save_vmcoreinfo (void );void arch_crash_save_vmcoreinfo (void );__printf (1 ,2 )
@@ -54,7 +55,6 @@ vmcoreinfo_append_str("PHYS_BASE=%lx\n", (unsigned long)value)extern u32 *vmcoreinfo_note; -extern size_t vmcoreinfo_size;Elf_Word *append_elf_note (Elf_Word *buf,char *name,unsigned int type,void *data,size_t data_len);
include/linux/kexec.h +2 -0
@@ -181,6 +181,7 @@ struct kimage {unsigned long start;struct page *control_code_page;struct page *swap_page; +void *vmcoreinfo_data_copy;/* locates in the crash memory */ unsigned long nr_segments;struct kexec_segment segment[KEXEC_SEGMENT_MAX ];
@@ -250,6 +251,7 @@ extern void *kexec_purgatory_get_symbol_addr(struct kimage *image,int kexec_should_crash (struct task_struct *);int kexec_crash_loaded (void );void crash_save_cpu (struct pt_regs *regs,int cpu); +extern int kimage_crash_copy_vmcoreinfo (struct kimage *image);extern struct kimage *kexec_image;extern struct kimage *kexec_crash_image;
kernel/crash_core.c +16 -1
@@ -15,9 +15,12 @@/* vmcoreinfo stuff */ static unsigned char *vmcoreinfo_data; -size_t vmcoreinfo_size; +static size_t vmcoreinfo_size;u32 *vmcoreinfo_note; +/* trusted vmcoreinfo, e.g. we can make a copy in the crash memory */ +static unsigned char *vmcoreinfo_data_safecopy; +/* * parsing the "crashkernel" commandline *
@@ -323,11 +326,23 @@ static void update_vmcoreinfo_note(void)final_note (buf); } +void crash_update_vmcoreinfo_safecopy (void *ptr) +{ +if (ptr) +memcpy (ptr, vmcoreinfo_data, vmcoreinfo_size); + + vmcoreinfo_data_safecopy = ptr; +} +void crash_save_vmcoreinfo (void ) {if (!vmcoreinfo_note)return ; +/* Use the safe copy to generate vmcoreinfo note if have */ +if (vmcoreinfo_data_safecopy) + vmcoreinfo_data = vmcoreinfo_data_safecopy; +vmcoreinfo_append_str ("CRASHTIME=%ld\n" ,get_seconds ());update_vmcoreinfo_note (); }
kernel/kexec.c +8 -0
@@ -144,6 +144,14 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments,if (ret) goto out; +/* +* Some architecture(like S390) may touch the crash memory before +* machine_kexec_prepare(), we must copy vmcoreinfo data after it. +*/ + ret =kimage_crash_copy_vmcoreinfo (image); +if (ret) + goto out; +for (i =0 ; i < nr_segments; i++) { ret =kimage_load_segment (image, &image->segment[i]);if (ret)
kernel/kexec_core.c +39 -0
@@ -481,6 +481,40 @@ struct page *kimage_alloc_control_pages(struct kimage *image,return pages; } +int kimage_crash_copy_vmcoreinfo (struct kimage *image) +{ +struct page *vmcoreinfo_page; +void *safecopy; + +if (image->type !=KEXEC_TYPE_CRASH ) +return 0 ; + +/* +* For kdump, allocate one vmcoreinfo safe copy from the +* crash memory. as we have arch_kexec_protect_crashkres() +* after kexec syscall, we naturally protect it from write +* (even read) access under kernel direct mapping. But on +* the other hand, we still need to operate it when crash +* happens to generate vmcoreinfo note, hereby we rely on +* vmap for this purpose. +*/ + vmcoreinfo_page =kimage_alloc_control_pages (image,0 ); +if (!vmcoreinfo_page) { +pr_warn ("Could not allocate vmcoreinfo buffer\n" ); +return -ENOMEM ; + } + safecopy =vmap (&vmcoreinfo_page,1 ,VM_MAP ,PAGE_KERNEL ); +if (!safecopy) { +pr_warn ("Could not vmap vmcoreinfo buffer\n" ); +return -ENOMEM ; + } + + image->vmcoreinfo_data_copy = safecopy; +crash_update_vmcoreinfo_safecopy (safecopy); + +return 0 ; +} +static int kimage_add_entry (struct kimage *image,kimage_entry_t entry) {if (*image->entry !=0 )
@@ -568,6 +602,11 @@ void kimage_free(struct kimage *image)if (!image)return ; +if (image->vmcoreinfo_data_copy) { +crash_update_vmcoreinfo_safecopy (NULL ); +vunmap (image->vmcoreinfo_data_copy); + } +kimage_free_extra_pages (image);for_each_kimage_entry (image, ptr, entry) {if (entry &IND_INDIRECTION ) {
kernel/kexec_file.c +8 -0
@@ -304,6 +304,14 @@ void kimage_file_post_load_cleanup(struct kimage *image)if (ret) goto out; +/* +* Some architecture(like S390) may touch the crash memory before +* machine_kexec_prepare(), we must copy vmcoreinfo data after it. +*/ + ret =kimage_crash_copy_vmcoreinfo (image); +if (ret) + goto out; + ret =kexec_calculate_store_digests (image);if (ret) goto out;
Signature · 1 line
1.8.3.1