Support VMCOREINFO export for RISCV64
Subsystems (5)
v4 cover Support VMCOREINFO export for RISCV64
As disscussed in below patch set, the patch of 'describe VMCOREINFO export in Documentation' need to update according to Bagas's comments.
https://lore.kernel.org/linux-riscv/[email protected]/
As others patches in above patch set already applied, so this patch set only contains below two patches.
------
Changes:
Fix commit message in patch 2: use "Document these RISCV64 exports above" instead of "This patch just add the description of VMCOREINFO export for RISCV64."
V1 -> V2:
Remove unnecessary overline above header text in patch 2.
V2 -> V3:
Fix commit message in patch 1,2;
Use 'space' instead of 'region' for vmemmap description in patch 2.
V3 -> V4:
Remove unnecessary kernel space export:
KASAN_SHADOW_START ~ KASAN_SHADOW_END,
ADDRESS_SPACE_END
Xianting Tian (2):
RISC-V: Add arch_crash_save_vmcoreinfo support
Documentation: kdump: describe VMCOREINFO export for RISCV64
.../admin-guide/kdump/vmcoreinfo.rst | 30 ++++++++++++++++++ arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 29 +++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 arch/riscv/kernel/crash_core.c
Signature · 7 lines
2.17.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
PATCH v4 1/2 RISC-V: Add arch_crash_save_vmcoreinfo support
Add arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC, VMEMMAP ranges and KERNEL_LINK_ADDR), va bits and ram base for vmcore.
Default pagetable levels and PAGE_OFFSET aren't same for different kernel version as below. For pagetable levels, it sets sv57 by default and falls back to setting sv48 at boot time if sv57 is not supported by the hardware.
For ram base, the default value is 0x80200000 for qemu riscv64 env and, for example, is 0x200000 on the XuanTie 910 CPU.
* Linux Kernel 5.18 ~
* PGTABLE_LEVELS = 5
* PAGE_OFFSET = 0xff60000000000000
* Linux Kernel 5.17 ~
* PGTABLE_LEVELS = 4
* PAGE_OFFSET = 0xffffaf8000000000
* Linux Kernel 4.19 ~
* PGTABLE_LEVELS = 3
* PAGE_OFFSET = 0xffffffe000000000
Since these configurations change from time to time and version to version, it is preferable to export them via vmcoreinfo than to change the crash's code frequently, it can simplify the development of crash tool.
--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 arch/riscv/kernel/crash_core.c
arch/riscv/kernel/Makefile +1 -0
@@ -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 new file +23 -0
@@ -0,0 +1,23 @@ +// 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 + +if (IS_ENABLED (CONFIG_64BIT )) +vmcoreinfo_append_str ("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n" ,KERNEL_LINK_ADDR ); +}
Signature · 7 lines
2.17.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Quoted 61 lines · Xianting Tian
Add
arch_crash_save_vmcoreinfo(), which exports VMlayout(MODULES, VMALLOC, VMEMMAP ranges and KERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel version as below. For pagetable levels, it sets sv57 by default and falls back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and, for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version, it is preferable to export them via vmcoreinfo than to change the crash's code frequently, it can simplify the development of crash tool.
Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +1
-0@@ -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.oarch/riscv/kernel/crash_core.c new file +12
-0@@ -0,0 +1,23 @@ +// 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 );
arch/riscv/kernel/crash_core.c line 22
Quoted 10 lines
arch/riscv/kernel/crash_core.c new file +10
-0+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 + +if (IS_ENABLED (CONFIG_64BIT )) +vmcoreinfo_append_str ("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n" ,KERNEL_LINK_ADDR );
Wondering why you don't put KERNEL_LINK_ADDR exporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Quoted 66 lines · Baoquan He
Quoted 65 lines · Xianting Tian
Add
arch_crash_save_vmcoreinfo(), which exports VMlayout(MODULES, VMALLOC, VMEMMAP ranges and KERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel version as below. For pagetable levels, it sets sv57 by default and falls back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and, for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version, it is preferable to export them via vmcoreinfo than to change the crash's code frequently, it can simplify the development of crash tool.
Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +1
-0@@ -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.oarch/riscv/kernel/crash_core.c new file +16
-0@@ -0,0 +1,23 @@ +// 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
Quoted 8 lines
arch/riscv/kernel/crash_core.c line 22
Quoted 6 lines
arch/riscv/kernel/crash_core.c new file +6
-0+vmcoreinfo_append_str ("NUMBER(MODULES_VADDR)=0x%lx\n" ,MODULES_VADDR ); +vmcoreinfo_append_str ("NUMBER(MODULES_END)=0x%lx\n" ,MODULES_END ); +#endif + +if (IS_ENABLED (CONFIG_64BIT )) +vmcoreinfo_append_str ("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n" ,KERNEL_LINK_ADDR );Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".
I followed the rule in print_vm_layout() of arch/riscv/mm/init.c, which used IS_ENABLED when print the value of KERNEL_LINK_ADDR.
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Quoted 74 lines · Xianting Tian
Quoted 64 lines · Baoquan He
Quoted 63 lines · Xianting Tian
Add
arch_crash_save_vmcoreinfo(), which exports VMlayout(MODULES, VMALLOC, VMEMMAP ranges and KERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel version as below. For pagetable levels, it sets sv57 by default and falls back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and, for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version, it is preferable to export them via vmcoreinfo than to change the crash's code frequently, it can simplify the development of crash tool.
Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +1
-0@@ -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.oarch/riscv/kernel/crash_core.c new file +16
-0@@ -0,0 +1,23 @@ +// 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 Quoted 8 lines
arch/riscv/kernel/crash_core.c line 22
Quoted 6 lines
arch/riscv/kernel/crash_core.c new file +6
-0+vmcoreinfo_append_str ("NUMBER(MODULES_VADDR)=0x%lx\n" ,MODULES_VADDR ); +vmcoreinfo_append_str ("NUMBER(MODULES_END)=0x%lx\n" ,MODULES_END ); +#endif + +if (IS_ENABLED (CONFIG_64BIT )) +vmcoreinfo_append_str ("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n" ,KERNEL_LINK_ADDR );Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".
Quoted 3 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.
I see. There's PAGE_OFFSET in the middle. Thanks.
print_ml("lowmem", (unsigned long)PAGE_OFFSET,
(unsigned long)high_memory)
So now, do you think if it's necessary to have another IS_ENABLED(CONFIG_64BIT) in the current arch_crash_save_vmcoreinfo()?
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Quoted 77 lines · Baoquan He
Quoted 73 lines · Xianting Tian
Quoted 64 lines · Baoquan He
Quoted 63 lines · Xianting Tian
Add
arch_crash_save_vmcoreinfo(), which exports VMlayout(MODULES, VMALLOC, VMEMMAP ranges and KERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel version as below. For pagetable levels, it sets sv57 by default and falls back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and, for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version, it is preferable to export them via vmcoreinfo than to change the crash's code frequently, it can simplify the development of crash tool.
Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +1
-0@@ -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.oarch/riscv/kernel/crash_core.c new file +16
-0@@ -0,0 +1,23 @@ +// 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 Quoted 8 lines
arch/riscv/kernel/crash_core.c line 22
Quoted 6 lines
arch/riscv/kernel/crash_core.c new file +6
-0+vmcoreinfo_append_str ("NUMBER(MODULES_VADDR)=0x%lx\n" ,MODULES_VADDR ); +vmcoreinfo_append_str ("NUMBER(MODULES_END)=0x%lx\n" ,MODULES_END ); +#endif + +if (IS_ENABLED (CONFIG_64BIT )) +vmcoreinfo_append_str ("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n" ,KERNEL_LINK_ADDR );Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".Quoted 3 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.
Quoted 7 lines
I see. There's
PAGE_OFFSETin the middle. Thanks.print_ml("lowmem", (unsigned long)PAGE_OFFSET,
(unsigned long)high_memory)So now, do you think if it's necessary to have another
IS_ENABLED(CONFIG_64BIT)in the currentarch_crash_save_vmcoreinfo()?
For which MACRO? I think current code for PAGE_OFFSET is OK.
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Hi Palmer, Conor
Is this version OK for you? Do you plan to apply this patch set? thanks
Quoted 97 lines · Xianting Tian
Quoted 85 lines · Baoquan He
Quoted 81 lines · Xianting Tian
Quoted 72 lines · Baoquan He
Quoted 71 lines · Xianting Tian
Add
arch_crash_save_vmcoreinfo(), which exports VMlayout(MODULES, VMALLOC, VMEMMAP ranges and KERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel version as below. For pagetable levels, it sets sv57 by default and falls back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and, for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version, it is preferable to export them via vmcoreinfo than to change the crash's code frequently, it can simplify the development of crash tool.
Signed-off-by Xianting Tian <[email protected]>---
arch/riscv/kernel/Makefile | 1 +arch/riscv/kernel/crash_core.c| 23 +++++++++++++++++++++++2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +0
-0@@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.oobj-$(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.oarch/riscv/kernel/crash_core.c new file +11
-0@@ -0,0 +1,23 @@ +// 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);
+#ifdefCONFIG_64BIT
+vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR);
+ vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n",Quoted 8 lines
Quoted 6 lines
MODULES_END);arch/riscv/kernel/crash_core.c new file +4
-0+#endif + + if (IS_ENABLED(CONFIG_64BIT)) + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n",
KERNEL_LINK_ADDR);Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".Quoted 3 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.Quoted 7 lines
I see. There's
PAGE_OFFSETin the middle. Thanks.
print_ml("lowmem", (unsigned long)PAGE_OFFSET, (unsigned long)high_memory)So now, do you think if it's necessary to have another
IS_ENABLED(CONFIG_64BIT)in the currentarch_crash_save_vmcoreinfo()?For which MACRO? I think current code for
PAGE_OFFSETis OK.
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Quoted 3 lines · Xianting Tian
Hi Palmer, Conor
Is this version OK for you?
The weird ifdef/IS_ENABLED thing was the only comment I had. It's a bit odd & I notice Baoquan brought it up too. I didn't (and won't) give you a reviewed by on these patches because I don't understand the area well enough. The general nitpickery seems to be sorted though.
Thanks,
Conor.
Quoted 108 lines · Xianting Tian
Quoted 106 lines · Baoquan He
Quoted 104 lines · Xianting Tian
Quoted 97 lines · Baoquan He
Quoted 88 lines · Xianting Tian
Quoted 87 lines
Add
arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC,
VMEMMAP ranges andKERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel
version as below. For pagetable levels, it sets sv57 by default and falls
back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and,
for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version,
it is preferable to export them via vmcoreinfo than to change the crash's
code frequently, it can simplify the development of crash tool.Signed-off-by Xianting Tian <[email protected]>---
arch/riscv/kernel/Makefile | 1 +arch/riscv/kernel/crash_core.c| 23 +++++++++++++++++++++++2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +0
-0@@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.oobj-$(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 new file +11
-0@@ -0,0 +1,23 @@ +// 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);
+#ifdefCONFIG_64BIT
+vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR);
+vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END);
+#endifQuoted 8 lines
Quoted 5 lines
arch/riscv/kernel/crash_core.c new file +3
-0+ + if (IS_ENABLED(CONFIG_64BIT)) +
vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR);Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".Quoted 4 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.I see. There's
PAGE_OFFSETin the middle. Thanks.
Quoted 8 lines
Quoted 8 lines
Quoted 5 lines
print_ml("lowmem", (unsigned long)PAGE_OFFSET, (unsigned long)high_memory)So now, do you think if it's necessary to have another
IS_ENABLED(CONFIG_64BIT)in the currentarch_crash_save_vmcoreinfo()?For which MACRO? I think current code for
PAGE_OFFSETis OK.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Quoted 8 lines · Conor Dooley
Quoted 3 lines · Xianting Tian
Hi Palmer, Conor
Is this version OK for you?
The weird ifdef/IS_ENABLED thing was the only comment I had. It's a bit odd & I notice Baoquan brought it up too. I didn't (and won't) give you a reviewed by on these patches because I don't understand the area well enough. The general nitpickery seems to be sorted though.
I checked the KERNEL_LINK_ADDR definition of riscv, it is valid for CONFIG_64BIT and !CONFIG_64BIT.
Maybe we can remove IS_ENABLED(CONFIG_64BIT)
arch/riscv/include/asm/pgtable.h
#define ADDRESS_SPACE_END (UL(-1))
#ifdef CONFIG_64BIT
/* Leave 2GB for kernel and BPF at the end of the address space */ #define KERNEL_LINK_ADDR (ADDRESS_SPACE_END - SZ_2G + 1) #else
#define KERNEL_LINK_ADDR PAGE_OFFSET
#endif
arch/riscv/include/asm/page.h
#ifdef CONFIG_64BIT
#ifdef CONFIG_MMU
#define PAGE_OFFSET kernel_map.page_offset
#else
#define PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) #endif
/*
* By default, CONFIG_PAGE_OFFSET value corresponds to SV48 address space so
* define the PAGE_OFFSET value for SV39.
*/
#define PAGE_OFFSET_L4 _AC(0xffffaf8000000000, UL) #define PAGE_OFFSET_L3 _AC(0xffffffd800000000, UL) #else
#define PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) #endif /* CONFIG_64BIT */
Quoted 117 lines
Thanks,
Conor.Quoted 113 lines · Xianting Tian
Quoted 112 lines · Baoquan He
Quoted 102 lines · Xianting Tian
Quoted 97 lines · Baoquan He
Quoted 88 lines · Xianting Tian
Quoted 87 lines
Add
arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC,
VMEMMAP ranges andKERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel
version as below. For pagetable levels, it sets sv57 by default and falls
back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and,
for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version,
it is preferable to export them via vmcoreinfo than to change the crash's
code frequently, it can simplify the development of crash tool.Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +0
-0@@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.ocrash_save_regs.o machine_kexec.o
obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.oarch/riscv/kernel/Makefile +1
-0+obj-$(CONFIG_CRASH_CORE) += crash_core.o obj-$(CONFIG_JUMP_LABEL) += jump_label.oarch/riscv/kernel/crash_core.c new file +11
-0@@ -0,0 +1,23 @@ +// 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);
+#ifdefCONFIG_64BIT
+vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR);
+vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END);
+#endifQuoted 8 lines
Quoted 5 lines
arch/riscv/kernel/crash_core.c new file +3
-0+ + if (IS_ENABLED(CONFIG_64BIT)) +
vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR);Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".Quoted 4 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.Quoted 7 lines
I see. There's
PAGE_OFFSETin the middle. Thanks.
print_ml("lowmem", (unsigned long)PAGE_OFFSET, (unsigned long)high_memory)So now, do you think if it's necessary to have another
IS_ENABLED(CONFIG_64BIT)in the currentarch_crash_save_vmcoreinfo()?For which MACRO? I think current code for
PAGE_OFFSETis OK.
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Hi Xianting,
Quoted 5 lines · Xianting Tian
Quoted 3 lines · Conor Dooley
Quoted 2 lines · Xianting Tian
Hi Palmer, Conor
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Is this version OK for you?
The weird ifdef/IS_ENABLED thing was the only comment I had. It's a bit odd & I notice Baoquan brought it up too. I didn't (and won't) give you a reviewed by on these patches because I don't understand the area well enough. The general nitpickery seems to be sorted though.
I checked the
KERNEL_LINK_ADDRdefinition of riscv, it is valid forCONFIG_64BITand !CONFIG_64BIT.
This series looks good to me. My only minor concern is if we can make the arch_crash_save_vmcoreinfo() as below. I don't understand why we have to have the CONFIG_64BIT ifdeffery and the IS_ENABLED(CONFIG_64BIT) between two adjacent code blocks. Not sure if we are saying the same thing.
+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);
+ vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR);
+#endif
+}
Quoted 147 lines
Maybe we can remove
IS_ENABLED(CONFIG_64BIT)
arch/riscv/include/asm/pgtable.h
#define ADDRESS_SPACE_END (UL(-1))
#ifdefCONFIG_64BIT
/* Leave 2GB for kernel and BPF at the end of the address space */ #define KERNEL_LINK_ADDR (ADDRESS_SPACE_END-SZ_2G+ 1) #else
#define KERNEL_LINK_ADDRPAGE_OFFSET
#endif
arch/riscv/include/asm/page.h
#ifdefCONFIG_64BIT
#ifdefCONFIG_MMU
#define PAGE_OFFSET kernel_map.page_offset
#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif
/*
* By default,CONFIG_PAGE_OFFSETvalue corresponds to SV48 address space so
* define thePAGE_OFFSETvalue for SV39.
*/
#define PAGE_OFFSET_L4_AC(0xffffaf8000000000, UL)#define PAGE_OFFSET_L3_AC(0xffffffd800000000, UL)#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif /*CONFIG_64BIT*/Quoted 117 lines
Thanks,
Conor.Quoted 113 lines · Xianting Tian
Quoted 112 lines · Baoquan He
Quoted 102 lines · Xianting Tian
Quoted 97 lines · Baoquan He
Quoted 88 lines · Xianting Tian
Quoted 87 lines
Add
arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC,
VMEMMAP ranges andKERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel
version as below. For pagetable levels, it sets sv57 by default and falls
back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and,
for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version,
it is preferable to export them via vmcoreinfo than to change the crash's
code frequently, it can simplify the development of crash tool.Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +0
-0@@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.ocrash_save_regs.o machine_kexec.o
obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.oarch/riscv/kernel/Makefile +1
-0+obj-$(CONFIG_CRASH_CORE) += crash_core.o obj-$(CONFIG_JUMP_LABEL) += jump_label.oarch/riscv/kernel/crash_core.c new file +11
-0@@ -0,0 +1,23 @@ +// 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);
+#ifdefCONFIG_64BIT
+vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR);
+vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END);
+#endifQuoted 8 lines
Quoted 5 lines
arch/riscv/kernel/crash_core.c new file +3
-0+ + if (IS_ENABLED(CONFIG_64BIT)) +
vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR);Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".Quoted 4 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.Quoted 7 lines
I see. There's
PAGE_OFFSETin the middle. Thanks.
print_ml("lowmem", (unsigned long)PAGE_OFFSET, (unsigned long)high_memory)So now, do you think if it's necessary to have another
IS_ENABLED(CONFIG_64BIT)in the currentarch_crash_save_vmcoreinfo()?For which MACRO? I think current code for
PAGE_OFFSETis OK.
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Quoted 14 lines · Baoquan He
Hi Xianting,
Quoted 11 lines · Xianting Tian
Quoted 8 lines · Conor Dooley
Quoted 3 lines · Xianting Tian
Hi Palmer, Conor
Is this version OK for you?
The weird ifdef/IS_ENABLED thing was the only comment I had. It's a bit odd & I notice Baoquan brought it up too. I didn't (and won't) give you a reviewed by on these patches because I don't understand the area well enough. The general nitpickery seems to be sorted though.
Quoted 8 lines
Quoted 2 lines
I checked the
KERNEL_LINK_ADDRdefinition of riscv, it is valid forCONFIG_64BITand !CONFIG_64BIT.This series looks good to me. My only minor concern is if we can make the
arch_crash_save_vmcoreinfo()as below. I don't understand why we have to have theCONFIG_64BITifdeffery and theIS_ENABLED(CONFIG_64BIT)between two adjacent code blocks. Not sure if we are saying the same thing.
I think we can just go and drop the IS_ENABLED(). From looking at it last time, one bit is compileable (but not usable) for !64BIT and the other isn't hence the IS_ENABLED(). I think it would make sense to drop the IS_ENABLED() - I don't think we're too likely to hit some compile testing edge cases that IS_ENABLED() would help with & only having one makes the code look a lot less odd and a lot more intentional.
Quoted 157 lines
(quoted diff) +16
-0+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); + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); +#endif +}Quoted 140 lines
Maybe we can remove
IS_ENABLED(CONFIG_64BIT)
arch/riscv/include/asm/pgtable.h
#define ADDRESS_SPACE_END (UL(-1))
#ifdefCONFIG_64BIT
/* Leave 2GB for kernel and BPF at the end of the address space */ #define KERNEL_LINK_ADDR (ADDRESS_SPACE_END-SZ_2G+ 1) #else
#define KERNEL_LINK_ADDRPAGE_OFFSET
#endif
arch/riscv/include/asm/page.h
#ifdefCONFIG_64BIT
#ifdefCONFIG_MMU
#define PAGE_OFFSET kernel_map.page_offset
#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif
/*
* By default,CONFIG_PAGE_OFFSETvalue corresponds to SV48 address space so
* define thePAGE_OFFSETvalue for SV39.
*/
#define PAGE_OFFSET_L4_AC(0xffffaf8000000000, UL)#define PAGE_OFFSET_L3_AC(0xffffffd800000000, UL)#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif /*CONFIG_64BIT*/Quoted 110 lines
Thanks,
Conor.Quoted 106 lines · Xianting Tian
Quoted 105 lines · Baoquan He
Quoted 104 lines · Xianting Tian
Quoted 97 lines · Baoquan He
Quoted 88 lines · Xianting Tian
Quoted 87 lines
Add
arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC,
VMEMMAP ranges andKERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel
version as below. For pagetable levels, it sets sv57 by default and falls
back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and,
for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version,
it is preferable to export them via vmcoreinfo than to change the crash's
code frequently, it can simplify the development of crash tool.Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +0
-0@@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.ocrash_save_regs.o machine_kexec.o
obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.oarch/riscv/kernel/Makefile +1
-0+obj-$(CONFIG_CRASH_CORE) += crash_core.o obj-$(CONFIG_JUMP_LABEL) += jump_label.oarch/riscv/kernel/crash_core.c new file +11
-0@@ -0,0 +1,23 @@ +// 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);
+#ifdefCONFIG_64BIT
+vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR);
+vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END);
+#endifQuoted 8 lines
Quoted 5 lines
arch/riscv/kernel/crash_core.c new file +3
-0+ + if (IS_ENABLED(CONFIG_64BIT)) +
vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR);Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".Quoted 4 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.I see. There's
PAGE_OFFSETin the middle. Thanks.
Quoted 9 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
print_ml("lowmem", (unsigned long)PAGE_OFFSET, (unsigned long)high_memory)So now, do you think if it's necessary to have another
IS_ENABLED(CONFIG_64BIT)in the currentarch_crash_save_vmcoreinfo()?For which MACRO? I think current code for
PAGE_OFFSETis OK.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Quoted 20 lines · Conor Dooley
Quoted 12 lines · Baoquan He
Hi Xianting,
Quoted 9 lines · Xianting Tian
Quoted 8 lines · Conor Dooley
Quoted 3 lines · Xianting Tian
Hi Palmer, Conor
Is this version OK for you?
The weird ifdef/IS_ENABLED thing was the only comment I had. It's a bit odd & I notice Baoquan brought it up too. I didn't (and won't) give you a reviewed by on these patches because I don't understand the area well enough. The general nitpickery seems to be sorted though.
Quoted 7 lines
Quoted 2 lines
I checked the
KERNEL_LINK_ADDRdefinition of riscv, it is valid forCONFIG_64BITand !CONFIG_64BIT.This series looks good to me. My only minor concern is if we can make the
arch_crash_save_vmcoreinfo()as below. I don't understand why we have to have theCONFIG_64BITifdeffery and theIS_ENABLED(CONFIG_64BIT)between two adjacent code blocks. Not sure if we are saying the same thing.
Quoted 6 lines
I think we can just go and drop the
IS_ENABLED(). From looking at it last time, one bit is compileable (but not usable) for !64BIT and the other isn't hence theIS_ENABLED(). I think it would make sense to drop theIS_ENABLED()- I don't think we're too likely to hit some compile testing edge cases thatIS_ENABLED()would help with & only having one makes the code look a lot less odd and a lot more intentional.
thanks, I will send V5 patch for review.
Quoted 162 lines
Quoted 162 lines
(quoted diff) +16
-0+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); + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); +#endif +}Quoted 145 lines
Maybe we can remove
IS_ENABLED(CONFIG_64BIT)
arch/riscv/include/asm/pgtable.h
#define ADDRESS_SPACE_END (UL(-1))
#ifdefCONFIG_64BIT
/* Leave 2GB for kernel and BPF at the end of the address space */ #define KERNEL_LINK_ADDR (ADDRESS_SPACE_END-SZ_2G+ 1) #else
#define KERNEL_LINK_ADDRPAGE_OFFSET
#endif
arch/riscv/include/asm/page.h
#ifdefCONFIG_64BIT
#ifdefCONFIG_MMU
#define PAGE_OFFSET kernel_map.page_offset
#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif
/*
* By default,CONFIG_PAGE_OFFSETvalue corresponds to SV48 address space so
* define thePAGE_OFFSETvalue for SV39.
*/
#define PAGE_OFFSET_L4_AC(0xffffaf8000000000, UL)#define PAGE_OFFSET_L3_AC(0xffffffd800000000, UL)
#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif /*CONFIG_64BIT*/Quoted 116 lines
Thanks,
Conor.Quoted 113 lines · Xianting Tian
Quoted 112 lines · Baoquan He
Quoted 102 lines · Xianting Tian
Quoted 97 lines · Baoquan He
Quoted 88 lines · Xianting Tian
Quoted 87 lines
Add
arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC,
VMEMMAP ranges andKERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel
version as below. For pagetable levels, it sets sv57 by default and falls
back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and,
for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version,
it is preferable to export them via vmcoreinfo than to change the crash's
code frequently, it can simplify the development of crash tool.Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +0
-0@@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.ocrash_save_regs.o machine_kexec.o
obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.oarch/riscv/kernel/Makefile +1
-0+obj-$(CONFIG_CRASH_CORE) += crash_core.o obj-$(CONFIG_JUMP_LABEL) += jump_label.oarch/riscv/kernel/crash_core.c new file +11
-0@@ -0,0 +1,23 @@ +// 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);
+#ifdefCONFIG_64BIT
+vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR);
+vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END);
+#endifQuoted 8 lines
Quoted 5 lines
arch/riscv/kernel/crash_core.c new file +3
-0+ + if (IS_ENABLED(CONFIG_64BIT)) +
vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR);Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".Quoted 4 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.Quoted 7 lines
I see. There's
PAGE_OFFSETin the middle. Thanks.
print_ml("lowmem", (unsigned long)PAGE_OFFSET, (unsigned long)high_memory)So now, do you think if it's necessary to have another
IS_ENABLED(CONFIG_64BIT)in the currentarch_crash_save_vmcoreinfo()?For which MACRO? I think current code for
PAGE_OFFSETis OK.
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
In reply to Conor DooleyQuoted 24 lines · Conor Dooley
Quoted 14 lines · Baoquan He
Hi Xianting,
Quoted 11 lines · Xianting Tian
Quoted 8 lines · Conor Dooley
Quoted 3 lines · Xianting Tian
Hi Palmer, Conor
Is this version OK for you?
The weird ifdef/IS_ENABLED thing was the only comment I had. It's a bit odd & I notice Baoquan brought it up too. I didn't (and won't) give you a reviewed by on these patches because I don't understand the area well enough. The general nitpickery seems to be sorted though.
Quoted 8 lines
Quoted 2 lines
I checked the
KERNEL_LINK_ADDRdefinition of riscv, it is valid forCONFIG_64BITand !CONFIG_64BIT.This series looks good to me. My only minor concern is if we can make the
arch_crash_save_vmcoreinfo()as below. I don't understand why we have to have theCONFIG_64BITifdeffery and theIS_ENABLED(CONFIG_64BIT)between two adjacent code blocks. Not sure if we are saying the same thing.
Quoted 6 lines
I think we can just go and drop the
IS_ENABLED(). From looking at it last time, one bit is compileable (but not usable) for !64BIT and the other isn't hence theIS_ENABLED(). I think it would make sense to drop theIS_ENABLED()- I don't think we're too likely to hit some compile testing edge cases thatIS_ENABLED()would help with & only having one makes the code look a lot less odd and a lot more intentional.
I check risc-v code again, and agree we can drop the IS_ENABLED checking to export KERNEL_LINK_ADDR anyway. We can surely deduce KERNEL_LINK_ADDR in userspace e.g makedumpfile/Crash, while it seems no harm to get it from the vmcoreinfo directly.
As for the difference between "#ifdef CONFIG_64BIT" and "if (IS_ENABLED(CONFIG_64BIT))", I haven't got what's the Xianting's point. Below is the IS_ENABLED definition in include/linux/kconfig.h, it's truly different than #ifdef, while the change we are discussing here is not related.
/*
* IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
* 0 otherwise. Note that CONFIG_FOO=y results in "#define CONFIG_FOO 1" in
* autoconf.h, while CONFIG_FOO=m results in "#define CONFIG_FOO_MODULE 1". */
#define IS_ENABLED(option) __or(IS_BUILTIN(option), IS_MODULE(option))
Quoted 161 lines
Quoted 161 lines
(quoted diff) +16
-0+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); + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); +#endif +}Quoted 143 lines
Maybe we can remove
IS_ENABLED(CONFIG_64BIT)
arch/riscv/include/asm/pgtable.h
#define ADDRESS_SPACE_END (UL(-1))
#ifdefCONFIG_64BIT
/* Leave 2GB for kernel and BPF at the end of the address space */ #define KERNEL_LINK_ADDR (ADDRESS_SPACE_END-SZ_2G+ 1) #else
#define KERNEL_LINK_ADDRPAGE_OFFSET
#endif
arch/riscv/include/asm/page.h
#ifdefCONFIG_64BIT
#ifdefCONFIG_MMU
#define PAGE_OFFSET kernel_map.page_offset
#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif
/*
* By default,CONFIG_PAGE_OFFSETvalue corresponds to SV48 address space so
* define thePAGE_OFFSETvalue for SV39.
*/
#define PAGE_OFFSET_L4_AC(0xffffaf8000000000, UL)#define PAGE_OFFSET_L3_AC(0xffffffd800000000, UL)#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif /*CONFIG_64BIT*/Quoted 113 lines
Thanks,
Conor.Quoted 109 lines · Xianting Tian
Quoted 108 lines · Baoquan He
Quoted 107 lines · Xianting Tian
Quoted 97 lines · Baoquan He
Quoted 88 lines · Xianting Tian
Quoted 87 lines
Add
arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC,
VMEMMAP ranges andKERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel
version as below. For pagetable levels, it sets sv57 by default and falls
back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and,
for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version,
it is preferable to export them via vmcoreinfo than to change the crash's
code frequently, it can simplify the development of crash tool.Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +0
-0@@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.ocrash_save_regs.o machine_kexec.o
obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.oarch/riscv/kernel/Makefile +1
-0+obj-$(CONFIG_CRASH_CORE) += crash_core.o obj-$(CONFIG_JUMP_LABEL) += jump_label.oarch/riscv/kernel/crash_core.c new file +11
-0@@ -0,0 +1,23 @@ +// 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);
+#ifdefCONFIG_64BIT
+vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR);
+vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END);
+#endifQuoted 8 lines
Quoted 5 lines
arch/riscv/kernel/crash_core.c new file +3
-0+ + if (IS_ENABLED(CONFIG_64BIT)) +
vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR);Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".Quoted 4 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.I see. There's
PAGE_OFFSETin the middle. Thanks.
print_ml("lowmem", (unsigned long)PAGE_OFFSET, (unsigned long)high_memory)
Quoted 7 lines
Quoted 6 lines
Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
So now, do you think if it's necessary to have another
IS_ENABLED(CONFIG_64BIT)in the currentarch_crash_save_vmcoreinfo()?For which MACRO? I think current code for
PAGE_OFFSETis OK.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
Quoted 27 lines · Baoquan He
Quoted 20 lines · Conor Dooley
Quoted 12 lines · Baoquan He
Hi Xianting,
Quoted 9 lines · Xianting Tian
Quoted 8 lines · Conor Dooley
Quoted 3 lines · Xianting Tian
Hi Palmer, Conor
Is this version OK for you?
The weird ifdef/IS_ENABLED thing was the only comment I had. It's a bit odd & I notice Baoquan brought it up too. I didn't (and won't) give you a reviewed by on these patches because I don't understand the area well enough. The general nitpickery seems to be sorted though.
Quoted 7 lines
Quoted 2 lines
I checked the
KERNEL_LINK_ADDRdefinition of riscv, it is valid forCONFIG_64BITand !CONFIG_64BIT.This series looks good to me. My only minor concern is if we can make the
arch_crash_save_vmcoreinfo()as below. I don't understand why we have to have theCONFIG_64BITifdeffery and theIS_ENABLED(CONFIG_64BIT)between two adjacent code blocks. Not sure if we are saying the same thing.Quoted 6 lines
I think we can just go and drop the
IS_ENABLED(). From looking at it last time, one bit is compileable (but not usable) for !64BIT and the other isn't hence theIS_ENABLED(). I think it would make sense to drop theIS_ENABLED()- I don't think we're too likely to hit some compile testing edge cases thatIS_ENABLED()would help with & only having one makes the code look a lot less odd and a lot more intentional.
Quoted 4 lines
I check risc-v code again, and agree we can drop the
IS_ENABLEDchecking to exportKERNEL_LINK_ADDRanyway. We can surely deduceKERNEL_LINK_ADDRin userspace e.g makedumpfile/Crash, while it seems no harm to get it from the vmcoreinfo directly.
thanks Baoquan for the confirm,
please help give the Revied-by and promote the patch set to be applied to Linux 6.1 :)
Quoted 7 lines
As for the difference between "#ifdef
CONFIG_64BIT" and "if (IS_ENABLED(CONFIG_64BIT))", I haven't got what's the Xianting's point. Below is theIS_ENABLEDdefinition ininclude/linux/kconfig.h, it's truly different than #ifdef, while the change we are discussing here is not related.
Quoted 168 lines
/*
*IS_ENABLED(CONFIG_FOO)evaluates to 1 ifCONFIG_FOOis set to 'y' or 'm',
* 0 otherwise. Note thatCONFIG_FOO=yresults in "#defineCONFIG_FOO1" in
*autoconf.h, whileCONFIG_FOO=mresults in "#defineCONFIG_FOO_MODULE1". */
#defineIS_ENABLED(option)__or(IS_BUILTIN(option), IS_MODULE(option))Quoted 161 lines
Quoted 161 lines
(quoted diff) +16
-0+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); + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); +#endif +}Quoted 145 lines
Maybe we can remove
IS_ENABLED(CONFIG_64BIT)
arch/riscv/include/asm/pgtable.h
#define ADDRESS_SPACE_END (UL(-1))
#ifdefCONFIG_64BIT
/* Leave 2GB for kernel and BPF at the end of the address space */ #define KERNEL_LINK_ADDR (ADDRESS_SPACE_END-SZ_2G+ 1) #else
#define KERNEL_LINK_ADDRPAGE_OFFSET
#endif
arch/riscv/include/asm/page.h
#ifdefCONFIG_64BIT
#ifdefCONFIG_MMU
#define PAGE_OFFSET kernel_map.page_offset
#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif
/*
* By default,CONFIG_PAGE_OFFSETvalue corresponds to SV48 address space so
* define thePAGE_OFFSETvalue for SV39.
*/
#define PAGE_OFFSET_L4_AC(0xffffaf8000000000, UL)#define PAGE_OFFSET_L3_AC(0xffffffd800000000, UL)
#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif /*CONFIG_64BIT*/Quoted 116 lines
Thanks,
Conor.Quoted 113 lines · Xianting Tian
Quoted 112 lines · Baoquan He
Quoted 102 lines · Xianting Tian
Quoted 97 lines · Baoquan He
Quoted 88 lines · Xianting Tian
Quoted 87 lines
Add
arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC,
VMEMMAP ranges andKERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel
version as below. For pagetable levels, it sets sv57 by default and falls
back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and,
for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version,
it is preferable to export them via vmcoreinfo than to change the crash's
code frequently, it can simplify the development of crash tool.Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +0
-0@@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.ocrash_save_regs.o machine_kexec.o
obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.oarch/riscv/kernel/Makefile +1
-0+obj-$(CONFIG_CRASH_CORE) += crash_core.o obj-$(CONFIG_JUMP_LABEL) += jump_label.oarch/riscv/kernel/crash_core.c new file +11
-0@@ -0,0 +1,23 @@ +// 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);
+#ifdefCONFIG_64BIT
+vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR);
+vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END);
+#endifQuoted 8 lines
Quoted 5 lines
arch/riscv/kernel/crash_core.c new file +3
-0+ + if (IS_ENABLED(CONFIG_64BIT)) +
vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR);Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".Quoted 4 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.Quoted 7 lines
I see. There's
PAGE_OFFSETin the middle. Thanks.
print_ml("lowmem", (unsigned long)PAGE_OFFSET, (unsigned long)high_memory)So now, do you think if it's necessary to have another
IS_ENABLED(CONFIG_64BIT)in the currentarch_crash_save_vmcoreinfo()?For which MACRO? I think current code for
PAGE_OFFSETis OK.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
In reply to Baoquan HeQuoted 12 lines · Baoquan He
Hi Xianting,
Quoted 9 lines · Xianting Tian
Quoted 8 lines · Conor Dooley
Quoted 3 lines · Xianting Tian
Hi Palmer, Conor
Is this version OK for you?
The weird ifdef/IS_ENABLED thing was the only comment I had. It's a bit odd & I notice Baoquan brought it up too. I didn't (and won't) give you a reviewed by on these patches because I don't understand the area well enough. The general nitpickery seems to be sorted though.
Quoted 7 lines
Quoted 2 lines
I checked the
KERNEL_LINK_ADDRdefinition of riscv, it is valid forCONFIG_64BITand !CONFIG_64BIT.This series looks good to me. My only minor concern is if we can make the
arch_crash_save_vmcoreinfo()as below. I don't understand why we have to have theCONFIG_64BITifdeffery and theIS_ENABLED(CONFIG_64BIT)between two adjacent code blocks. Not sure if we are saying the same thing.
KERNEL_LINK_ADDR is valid for both CONFIG_64BIT and !CONFIG_64BIT, but MODULES_VADDR is only defined when CONFIG_64BIT.
I tend to agree only remove IS_ENABLED, thanks
For riscv:
#ifdef CONFIG_64BIT
/* Leave 2GB for kernel and BPF at the end of the address space */ #define KERNEL_LINK_ADDR (ADDRESS_SPACE_END - SZ_2G + 1) #else
#define KERNEL_LINK_ADDR PAGE_OFFSET
#endif
Quoted 162 lines
(quoted diff) +16
-0+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); + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); +#endif +}Quoted 145 lines
Maybe we can remove
IS_ENABLED(CONFIG_64BIT)
arch/riscv/include/asm/pgtable.h
#define ADDRESS_SPACE_END (UL(-1))
#ifdefCONFIG_64BIT
/* Leave 2GB for kernel and BPF at the end of the address space */ #define KERNEL_LINK_ADDR (ADDRESS_SPACE_END-SZ_2G+ 1) #else
#define KERNEL_LINK_ADDRPAGE_OFFSET
#endif
arch/riscv/include/asm/page.h
#ifdefCONFIG_64BIT
#ifdefCONFIG_MMU
#define PAGE_OFFSET kernel_map.page_offset
#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif
/*
* By default,CONFIG_PAGE_OFFSETvalue corresponds to SV48 address space so
* define thePAGE_OFFSETvalue for SV39.
*/
#define PAGE_OFFSET_L4_AC(0xffffaf8000000000, UL)#define PAGE_OFFSET_L3_AC(0xffffffd800000000, UL)
#else
#define PAGE_OFFSET_AC(CONFIG_PAGE_OFFSET, UL)#endif /*CONFIG_64BIT*/Quoted 116 lines
Thanks,
Conor.Quoted 113 lines · Xianting Tian
Quoted 112 lines · Baoquan He
Quoted 102 lines · Xianting Tian
Quoted 97 lines · Baoquan He
Quoted 88 lines · Xianting Tian
Quoted 87 lines
Add
arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC,
VMEMMAP ranges andKERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel
version as below. For pagetable levels, it sets sv57 by default and falls
back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and,
for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version,
it is preferable to export them via vmcoreinfo than to change the crash's
code frequently, it can simplify the development of crash tool.Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+)create mode 100644
arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +0
-0@@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.ocrash_save_regs.o machine_kexec.o
obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.oarch/riscv/kernel/Makefile +1
-0+obj-$(CONFIG_CRASH_CORE) += crash_core.o obj-$(CONFIG_JUMP_LABEL) += jump_label.oarch/riscv/kernel/crash_core.c new file +11
-0@@ -0,0 +1,23 @@ +// 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);
+#ifdefCONFIG_64BIT
+vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR);
+vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END);
+#endifQuoted 8 lines
Quoted 5 lines
arch/riscv/kernel/crash_core.c new file +3
-0+ + if (IS_ENABLED(CONFIG_64BIT)) +
vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR);Wondering why you don't put
KERNEL_LINK_ADDRexporting into the above ifdeffery scope, with that you can save one line of "IS_ENABLED(CONFIG_64BIT)".Quoted 4 lines
I followed the rule in
print_vm_layout()ofarch/riscv/mm/init.c, which usedIS_ENABLEDwhen print the value ofKERNEL_LINK_ADDR.Quoted 7 lines
I see. There's
PAGE_OFFSETin the middle. Thanks.
print_ml("lowmem", (unsigned long)PAGE_OFFSET, (unsigned long)high_memory)So now, do you think if it's necessary to have another
IS_ENABLED(CONFIG_64BIT)in the currentarch_crash_save_vmcoreinfo()?For which MACRO? I think current code for
PAGE_OFFSETis OK.
Re: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support
In reply to Xianting TianDon't forget the another two kdump fixups [1]
[1] https://lore.kernel.org/all/[email protected]/
Only the patch without [1]:
crash> help -r
CPU 0: [OFFLINE]
CPU 1:
epc : ffffffff80009ff0 ra : ffffffff800b789a sp : ff2000001098bb40
gp : ffffffff815fca60 tp : ff60000004680000 t0 : 6666666666663c5b
t1 : 0000000000000000 t2 : 666666666666663c s0 : ff2000001098bc90
s1 : ffffffff81600798 a0 : ff2000001098bb48 a1 : 0000000000000000
a2 : 0000000000000000 a3 : 0000000000000001 a4 : 0000000000000000
a5 : ff60000004690800 a6 : 0000000000000000 a7 : 0000000000000000
s2 : ff2000001098bb48 s3 : ffffffff81093ec8 s4 : ffffffff816004ac
s5 : 0000000000000000 s6 : 0000000000000007 s7 : ffffffff80e7f720
s8 : 00fffffffffff3f0 s9 : 0000000000000007 s10: 00aaaaaaaab98700
s11: 0000000000000001 t3 : ffffffff819a8097 t4 : ffffffff819a8097
t5 : ffffffff819a8098 t6 : ff2000001098b9a8
CPU 2: [OFFLINE]
CPU 3: [OFFLINE]
The patch with [1]:
crash> help -r
CPU 0:
epc : ffffffff80003f34 ra : ffffffff808caa7c sp : ffffffff81403eb0
gp : ffffffff815fcb48 tp : ffffffff81413400 t0 : 0000000000000000
t1 : 0000000000000000 t2 : 0000000000000000 s0 : ffffffff81403ec0
s1 : 0000000000000000 a0 : 0000000000000000 a1 : 0000000000000000
a2 : 0000000000000000 a3 : 0000000000000000 a4 : 0000000000000000
a5 : 0000000000000000 a6 : 0000000000000000 a7 : 0000000000000000
s2 : ffffffff816001c8 s3 : ffffffff81600370 s4 : ffffffff80c32e18
s5 : ffffffff819d3018 s6 : ffffffff810e2110 s7 : 0000000000000000
s8 : 0000000000000000 s9 : 0000000080039eac s10: 0000000000000000
s11: 0000000000000000 t3 : 0000000000000000 t4 : 0000000000000000
t5 : 0000000000000000 t6 : 0000000000000000
CPU 1:
epc : ffffffff80003f34 ra : ffffffff808caa7c sp : ff2000000068bf30
gp : ffffffff815fcb48 tp : ff6000000240d400 t0 : 0000000000000000
t1 : 0000000000000000 t2 : 0000000000000000 s0 : ff2000000068bf40
s1 : 0000000000000001 a0 : 0000000000000000 a1 : 0000000000000000
a2 : 0000000000000000 a3 : 0000000000000000 a4 : 0000000000000000
a5 : 0000000000000000 a6 : 0000000000000000 a7 : 0000000000000000
s2 : ffffffff816001c8 s3 : ffffffff81600370 s4 : ffffffff80c32e18
s5 : ffffffff819d3018 s6 : ffffffff810e2110 s7 : 0000000000000000
s8 : 0000000000000000 s9 : 0000000080039ea8 s10: 0000000000000000
s11: 0000000000000000 t3 : 0000000000000000 t4 : 0000000000000000
t5 : 0000000000000000 t6 : 0000000000000000
CPU 2:
epc : ffffffff80003f34 ra : ffffffff808caa7c sp : ff20000000693f30
gp : ffffffff815fcb48 tp : ff6000000240e900 t0 : 0000000000000000
t1 : 0000000000000000 t2 : 0000000000000000 s0 : ff20000000693f40
s1 : 0000000000000002 a0 : 0000000000000000 a1 : 0000000000000000
a2 : 0000000000000000 a3 : 0000000000000000 a4 : 0000000000000000
a5 : 0000000000000000 a6 : 0000000000000000 a7 : 0000000000000000
s2 : ffffffff816001c8 s3 : ffffffff81600370 s4 : ffffffff80c32e18
s5 : ffffffff819d3018 s6 : ffffffff810e2110 s7 : 0000000000000000
s8 : 0000000000000000 s9 : 0000000080039eb0 s10: 0000000000000000
s11: 0000000000000000 t3 : 0000000000000000 t4 : 0000000000000000
t5 : 0000000000000000 t6 : 0000000000000000
CPU 3:
epc : ffffffff8000a1e4 ra : ffffffff800b7bba sp : ff200000109bbb40
gp : ffffffff815fcb48 tp : ff6000000373aa00 t0 : 6666666666663c5b
t1 : 0000000000000000 t2 : 666666666666663c s0 : ff200000109bbc90
s1 : ffffffff816007a0 a0 : ff200000109bbb48 a1 : 0000000000000000
a2 : 0000000000000000 a3 : 0000000000000001 a4 : 0000000000000000
a5 : ff60000002c61c00 a6 : 0000000000000000 a7 : 0000000000000000
s2 : ff200000109bbb48 s3 : ffffffff810941a8 s4 : ffffffff816004b4
s5 : 0000000000000000 s6 : 0000000000000007 s7 : ffffffff80e7f7a0
s8 : 00fffffffffff3f0 s9 : 0000000000000007 s10: 00aaaaaaaab98700
s11: 0000000000000001 t3 : ffffffff819a8097 t4 : ffffffff819a8097
t5 : ffffffff819a8098 t6 : ff200000109bb9a8Quoted 76 lines · Xianting Tian
Add
arch_crash_save_vmcoreinfo(), which exports VMlayout(MODULES, VMALLOC, VMEMMAP ranges and KERNEL_LINK_ADDR), va bits and ram base for vmcore.Default pagetable levels and
PAGE_OFFSETaren't same for different kernel version as below. For pagetable levels, it sets sv57 by default and falls back to setting sv48 at boot time if sv57 is not supported by the hardware.For ram base, the default value is
0x80200000for qemu riscv64 env and, for example, is0x200000on the XuanTie 910 CPU.* Linux Kernel 5.18 ~
*PGTABLE_LEVELS= 5
*PAGE_OFFSET=0xff60000000000000
* Linux Kernel 5.17 ~
*PGTABLE_LEVELS= 4
*PAGE_OFFSET=0xffffaf8000000000
* Linux Kernel 4.19 ~
*PGTABLE_LEVELS= 3
*PAGE_OFFSET=0xffffffe000000000Since these configurations change from time to time and version to version, it is preferable to export them via vmcoreinfo than to change the crash's code frequently, it can simplify the development of crash tool.
Signed-off-by Xianting Tian <[email protected]>--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 arch/riscv/kernel/crash_core.carch/riscv/kernel/Makefile +1
-0@@ -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.oarch/riscv/kernel/crash_core.c new file +23
-1@@ -0,0 +1,23 @@ +// 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 + +if (IS_ENABLED (CONFIG_64BIT )) +vmcoreinfo_append_str ("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n" ,KERNEL_LINK_ADDR ); +} --2.17.1
Signature · 2 lines
Best Regards Guo Ren
PATCH v4 2/2 Documentation: kdump: describe VMCOREINFO export for RISCV64
In reply to Xianting TianThe following interrelated definitions and ranges are needed by the kdump crash tool, which are exported by "arch/riscv/kernel/crash_core.c":
VA_BITS,
PAGE_OFFSET,
phys_ram_base,
KERNEL_LINK_ADDR,
MODULES_VADDR ~ MODULES_END,
VMALLOC_START ~ VMALLOC_END,
VMEMMAP_START ~ VMEMMAP_END,
Document these RISCV64 exports above.
--- .../admin-guide/kdump/vmcoreinfo.rst | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+)
Documentation/admin-guide/kdump/vmcoreinfo.rst +29 -0
@@ -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
Signature · 7 lines
2.17.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH V4 2/2] Documentation: kdump: describe VMCOREINFO export for RISCV64
Quoted 10 lines · Xianting Tian
The following interrelated definitions and ranges are needed by the kdump crash tool, which are exported by "
arch/riscv/kernel/crash_core.c":
VA_BITS,
PAGE_OFFSET,
phys_ram_base,
KERNEL_LINK_ADDR,
MODULES_VADDR~MODULES_END,
VMALLOC_START~VMALLOC_END,
VMEMMAP_START~VMEMMAP_END,
Quoted 3 lines
Document these RISCV64 exports above.
Signed-off-by Xianting Tian <[email protected]>
Hi Xianting,
Seems like you forgot to keep carrying my Reviewed-by from v3 [1]. Anyway, here it goes...
Thanks.
[1]: https://lore.kernel.org/linux-doc/[email protected]/
Signature · 1 line
An old man doll... just what I always wanted! - Clara
Re: [PATCH V4 2/2] Documentation: kdump: describe VMCOREINFO export for RISCV64
Quoted 13 lines · Bagas Sanjaya
Quoted 12 lines · Xianting Tian
The following interrelated definitions and ranges are needed by the kdump crash tool, which are exported by "
arch/riscv/kernel/crash_core.c":
VA_BITS,
PAGE_OFFSET,
phys_ram_base,
KERNEL_LINK_ADDR,
MODULES_VADDR~MODULES_END,
VMALLOC_START~VMALLOC_END,
VMEMMAP_START~VMEMMAP_END,Document these RISCV64 exports above.
Quoted 7 lines
Quoted 1 line
Signed-off-by Xianting Tian <[email protected]>Hi Xianting,
Seems like you forgot to keep carrying my Reviewed-by from v3 [1]. Anyway, here it goes...
Reviewed-by Bagas Sanjaya <[email protected]>
Sorry, I forgot... :(
Quoted 5 lines
Thanks.
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec