Unverified Commit 9704beac authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

Merge patch series "Support VMCOREINFO export for RISCV64" 

Add arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES,
VMALLOC, VMEMMAP ranges and KERNEL_LINK_ADDR), va bits and ram base for
vmcore.

* b4-shazam-merge:
  Documentation: kdump: describe VMCOREINFO export for RISCV64
  RISC-V: Add arch_crash_save_vmcoreinfo support

Link: https://lore.kernel.org/r/20221026144208.373504-1-xianting.tian@linux.alibaba.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parents b57c2f12 c5b42169

Documentation/admin-guide/kdump/vmcoreinfo.rst

+29 −0
Original line number Diff line number Diff line
@@ -595,3 +595,32 @@ X2TLB 
-----



Indicates whether the crashed kernel enabled SH extended mode.



RISCV64

=======



VA_BITS

-------



The maximum number of bits for virtual addresses. Used to compute the

virtual memory ranges.



PAGE_OFFSET

-----------



Indicates the virtual kernel start address of the direct-mapped RAM region.



phys_ram_base

-------------



Indicates the start physical RAM address.



MODULES_VADDR|MODULES_END|VMALLOC_START|VMALLOC_END|VMEMMAP_START|VMEMMAP_END|KERNEL_LINK_ADDR

----------------------------------------------------------------------------------------------



Used to get the correct ranges:



  * MODULES_VADDR ~ MODULES_END : Kernel module space.

  * VMALLOC_START ~ VMALLOC_END : vmalloc() / ioremap() space.

  * VMEMMAP_START ~ VMEMMAP_END : vmemmap space, used for struct page array.

  * KERNEL_LINK_ADDR : start address of Kernel link and BPF

arch/riscv/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o 
obj-$(CONFIG_KEXEC_CORE)	+= kexec_relocate.o crash_save_regs.o machine_kexec.o

obj-$(CONFIG_KEXEC_FILE)	+= elf_kexec.o machine_kexec_file.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_CRASH_CORE)	+= crash_core.o



obj-$(CONFIG_JUMP_LABEL)	+= jump_label.o

arch/riscv/kernel/crash_core.c

0 → 100644
+21 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



#include <linux/crash_core.h>

#include <linux/pagemap.h>



void arch_crash_save_vmcoreinfo(void)

{

	VMCOREINFO_NUMBER(VA_BITS);

	VMCOREINFO_NUMBER(phys_ram_base);



	vmcoreinfo_append_str("NUMBER(PAGE_OFFSET)=0x%lx\n", PAGE_OFFSET);

	vmcoreinfo_append_str("NUMBER(VMALLOC_START)=0x%lx\n", VMALLOC_START);

	vmcoreinfo_append_str("NUMBER(VMALLOC_END)=0x%lx\n", VMALLOC_END);

	vmcoreinfo_append_str("NUMBER(VMEMMAP_START)=0x%lx\n", VMEMMAP_START);

	vmcoreinfo_append_str("NUMBER(VMEMMAP_END)=0x%lx\n", VMEMMAP_END);

#ifdef CONFIG_64BIT

	vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR);

	vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END);

#endif

	vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR);

}