Thanks to kernel commit 9d372c9fab34 "arm64: Add page size to the kernel image header", we don't need a heuristic to determine the pagesize on arm64. Keep the heuristic for older kernels, but try reading the header first. --- arm64.c | 30 ++++++++++++++++++++++++++++++ defs.h | 1 + 2 files changed, 31 insertions(+) diff --git a/arm64.c b/arm64.c index 5f8e2f6852434..d85ad7214dd39 100644 --- a/arm64.c +++ b/arm64.c @@ -19,6 +19,7 @@ #include "defs.h" #include <elf.h> +#include <endian.h> #define NOT_IMPLEMENTED(X) error((X), "%s: function not implemented\n", __func__) @@ -97,6 +98,32 @@ arm64_init(int when) break; case PRE_GDB: + if (!machdep->pagesize) { + /* + * Kerneldoc Documentation/arm64/booting.txt describes + * the kernel image header flags field. + */ + value = machdep->machspec->kernel_flags; + value = (value >> 1) & 3; + + switch(value) + { + case 0: + break; + case 1: + machdep->pagesize = 4096; + break; + case 2: + /* TODO: machdep->pagesize = 16384; */ + error(FATAL, "16K pages not supported."); + break; + case 3: + machdep->pagesize = 65536; + break; + } + + } + if (!machdep->pagesize && kernel_symbol_exists("swapper_pg_dir") && kernel_symbol_exists("idmap_pg_dir")) { @@ -305,6 +332,9 @@ arm64_verify_symbol(const char *name, ulong value, char type) if (!name || !strlen(name)) return FALSE; + if (STREQ(name, "_kernel_flags_le")) + machdep->machspec->kernel_flags = le64toh(value); + if (((type == 'A') || (type == 'a')) && (highest_bit_long(value) != 63)) return FALSE; diff --git a/defs.h b/defs.h index 7004619017e41..3e5dbd99942b2 100644 --- a/defs.h +++ b/defs.h @@ -2944,6 +2944,7 @@ struct machine_specific { ulong crash_kexec_end; ulong crash_save_cpu_start; ulong crash_save_cpu_end; + ulong kernel_flags; }; struct arm64_stackframe { -- 2.4.3

QEMU can generate both non-makedumpfile (just elf) and makedumpfile formatted kdumps. In neither case will crash_notes have prstatus, as crash_kexec doesn't run in the kernel, however the elf notes will contain the prstatus, and we can dig them out of there. --- arm.c | 22 ++++++++++++++++++++++ arm64.c | 22 ++++++++++++++++++++++ defs.h | 1 + netdump.c | 21 +++++++++++++++++++++ 4 files changed, 66 insertions(+) diff --git a/arm.c b/arm.c index ffc7c06d0f42c..8fc3d48a8ac89 100644 --- a/arm.c +++ b/arm.c @@ -597,6 +597,28 @@ arm_get_crash_notes(void) note = (Elf32_Nhdr *)buf; p = buf + sizeof(Elf32_Nhdr); + /* + * dumpfiles created with qemu won't have crash_notes, but there will + * be elf notes. + */ + if (note->n_namesz == 0 && (DISKDUMP_DUMPFILE() || KDUMP_DUMPFILE())) { + if (DISKDUMP_DUMPFILE()) + note = diskdump_get_prstatus_percpu(i); + else if (KDUMP_DUMPFILE()) + note = netdump_get_prstatus_percpu(i); + if (note) { + /* + * SIZE(note_buf) accounts for a "final note", which is a + * trailing empty elf note header. + */ + long notesz = SIZE(note_buf) - sizeof(Elf32_Nhdr); + + if (sizeof(Elf32_Nhdr) + roundup(note->n_namesz, 4) + + note->n_descsz == notesz) + BCOPY((char *)note, buf, notesz); + } + } + if (note->n_type != NT_PRSTATUS) { error(WARNING, "invalid note (n_type != NT_PRSTATUS)\n"); goto fail; diff --git a/arm64.c b/arm64.c index d85ad7214dd39..6278a993217c1 100644 --- a/arm64.c +++ b/arm64.c @@ -1827,6 +1827,28 @@ arm64_get_crash_notes(void) note = (Elf64_Nhdr *)buf; p = buf + sizeof(Elf64_Nhdr); + /* + * dumpfiles created with qemu won't have crash_notes, but there will + * be elf notes. + */ + if (note->n_namesz == 0 && (DISKDUMP_DUMPFILE() || KDUMP_DUMPFILE())) { + if (DISKDUMP_DUMPFILE()) + note = diskdump_get_prstatus_percpu(i); + else if (KDUMP_DUMPFILE()) + note = netdump_get_prstatus_percpu(i); + if (note) { + /* + * SIZE(note_buf) accounts for a "final note", which is a + * trailing empty elf note header. + */ + long notesz = SIZE(note_buf) - sizeof(Elf64_Nhdr); + + if (sizeof(Elf64_Nhdr) + roundup(note->n_namesz, 4) + + note->n_descsz == notesz) + BCOPY((char *)note, buf, notesz); + } + } + if (note->n_type != NT_PRSTATUS) { error(WARNING, "invalid note (n_type != NT_PRSTATUS)\n"); goto fail; diff --git a/defs.h b/defs.h index 3e5dbd99942b2..8a4045ec78c37 100644 --- a/defs.h +++ b/defs.h @@ -5720,6 +5720,7 @@ void dump_registers_for_qemu_mem_dump(void); void kdump_backup_region_init(void); void display_regs_from_elf_notes(int, FILE *); void display_ELF_note(int, int, void *, FILE *); +void *netdump_get_prstatus_percpu(int); #define PRSTATUS_NOTE (1) #define QEMU_NOTE (2) diff --git a/netdump.c b/netdump.c index bfa818fdef8e1..3ff49f0577c23 100644 --- a/netdump.c +++ b/netdump.c @@ -2345,6 +2345,27 @@ dump_Elf64_Nhdr(Elf64_Off offset, int store) return len; } +void * +netdump_get_prstatus_percpu(int cpu) +{ + int online; + + if ((cpu < 0) || (cpu >= nd->num_prstatus_notes)) + return NULL; + + /* + * If no cpu mapping was done, then there must be + * a one-to-one relationship between the number + * of online cpus and the number of notes. + */ + if ((online = get_cpus_online()) && + (online == kt->cpus) && + (online != nd->num_prstatus_notes)) + return NULL; + + return nd->nt_prstatus_percpu[cpu]; +} + /* * Send the request to the proper architecture hander. */ -- 2.4.3