The coreimage generated by kmemdump requires some kernel information
in order to be successfully loaded by `crash` or gdb.
Register all this information through vmcoreinfo once vmcoreinfo is setup.
Signed-off-by: Eugen Hristev <eugen.hristev@xxxxxxxxxx>
---
kernel/vmcore_info.c | 141 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 141 insertions(+)
diff --git a/kernel/vmcore_info.c b/kernel/vmcore_info.c
index 3e2e846ba9c8..1d83e95cf9be 100644
--- a/kernel/vmcore_info.c
+++ b/kernel/vmcore_info.c
@@ -15,6 +15,7 @@
#include <linux/memblock.h>
#include <linux/kmemleak.h>
#include <linux/kmemdump.h>
+#include <linux/sched/stat.h>
#include <asm/page.h>
#include <asm/sections.h>
@@ -24,6 +25,17 @@
#include "kallsyms_internal.h"
#include "kexec_internal.h"
+void sched_get_runqueues_area(void **start, size_t *size);
+
+extern unsigned int nr_irqs;
+extern unsigned long tainted_mask;
+extern unsigned int nr_swapfiles;
+
+#ifdef CONFIG_IKCONFIG_PROC
+extern char kernel_config_data;
+extern char kernel_config_data_end;
+#endif
+
/* vmcoreinfo stuff */
unsigned char *vmcoreinfo_data;
size_t vmcoreinfo_size;
@@ -121,8 +133,137 @@ EXPORT_SYMBOL(paddr_vmcoreinfo_note);
static void vmcoreinfo_kmemdump(void)
{
+ void *start;
+ size_t size;
+ int i;
+
kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_VMCOREINFO,
(void *)vmcoreinfo_data, vmcoreinfo_size);
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_linux_banner,
+ (void *)&linux_banner, banner_len);
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_init_uts_ns,
+ (void *)&init_uts_ns, sizeof(init_uts_ns));
+
+ sched_get_runqueues_area(&start, &size);
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_runqueues,
+ (void *)start, size);
+
+#ifdef CONFIG_IKCONFIG_PROC
+ /* Register 8 bytes before and after, to catch the marker too */
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_CONFIG,
+ (void *)&kernel_config_data - 8,
+ &kernel_config_data_end - &kernel_config_data + 16);
+#endif
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE___cpu_possible_mask,
+ (void *)&__cpu_possible_mask,
+ sizeof(__cpu_possible_mask));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE___cpu_active_mask,
+ (void *)&__cpu_active_mask,
+ sizeof(__cpu_active_mask));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE___cpu_online_mask,
+ (void *)&__cpu_online_mask,
+ sizeof(__cpu_online_mask));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE___cpu_present_mask,
+ (void *)&__cpu_present_mask,
+ sizeof(__cpu_present_mask));
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_nr_irqs,
+ (void *)&nr_irqs, sizeof(nr_irqs));
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_tainted_mask,
+ (void *)&tainted_mask, sizeof(tainted_mask));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_taint_flags,
+ (void *)&taint_flags, sizeof(taint_flags));
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_jiffies_64,
+ (void *)&jiffies_64, sizeof(jiffies_64));
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_nr_threads,
+ (void *)&nr_threads, sizeof(nr_threads));
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_node_states,
+ (void *)&node_states, sizeof(node_states));
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_init_mm,
+ (void *)&init_mm, sizeof(init_mm));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_init_mm_pgd,
+ (void *)&init_mm.pgd, sizeof(*init_mm.pgd));
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE__totalram_pages,
+ (void *)&_totalram_pages, sizeof(_totalram_pages));
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_nr_swapfiles,
+ (void *)&nr_swapfiles, sizeof(nr_swapfiles));
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE___per_cpu_offset,
+ (void *)&__per_cpu_offset, sizeof(__per_cpu_offset));
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_high_memory,
+ (void *)&high_memory, sizeof(high_memory));
+#ifdef CONFIG_NUMA
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_node_data,
+ (void *)&node_data,
+ MAX_NUMNODES * sizeof(struct pglist_data));
+
+ for (i = 0; i < MAX_NUMNODES; i++) {
+ if (!NODE_DATA(i))
+ continue;
+ kmemdump_register((void *)NODE_DATA(i),
+ roundup(sizeof(pg_data_t), SMP_CACHE_BYTES));
+ }
+#endif
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_mem_section,
+ (void *)&mem_section, sizeof(mem_section));
+ for (i = 0; i < NR_SECTION_ROOTS; i++) {
+ if (!mem_section[i])
+ continue;
+ kmemdump_register((void *)mem_section[i],
+ SECTIONS_PER_ROOT * sizeof(struct mem_section));
+ }
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_MEMSECT,
+ (void *)mem_section,
+ sizeof(struct mem_section *) * NR_SECTION_ROOTS);
+
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_kallsyms_num_syms,
+ (void *)&kallsyms_num_syms,
+ sizeof(kallsyms_num_syms));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_kallsyms_relative_base,
+ (void *)&kallsyms_relative_base,
+ sizeof(kallsyms_relative_base));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_kallsyms_offsets,
+ (void *)&kallsyms_offsets,
+ sizeof(&kallsyms_offsets));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_kallsyms_names,
+ (void *)&kallsyms_names,
+ sizeof(&kallsyms_names));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_kallsyms_token_table,
+ (void *)&kallsyms_token_table,
+ sizeof(&kallsyms_token_table));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_kallsyms_token_index,
+ (void *)&kallsyms_token_index,
+ sizeof(&kallsyms_token_index));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_kallsyms_markers,
+ (void *)&kallsyms_markers,
+ sizeof(&kallsyms_markers));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_kallsyms_seqs_of_names,
+ (void *)&kallsyms_seqs_of_names,
+ sizeof(&kallsyms_seqs_of_names));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE__sinittext,
+ (void *)&_sinittext, sizeof(&_sinittext));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE__einittext,
+ (void *)&_einittext, sizeof(&_einittext));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE__end,
+ (void *)&_end, sizeof(&_end));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE__text,
+ (void *)&_text, sizeof(&_text));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE__stext,
+ (void *)&_stext, sizeof(&_stext));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE__etext,
+ (void *)&_etext, sizeof(&_etext));
+ kmemdump_register_id(KMEMDUMP_ID_COREIMAGE_swapper_pg_dir,
+ (void *)&swapper_pg_dir, sizeof(&swapper_pg_dir));
}
static int __init crash_save_vmcoreinfo_init(void)
--
2.43.0
