12:12 a.m.
Changes since V1:
* Introduced generic routines to parse the ELF Notes, which could be
reused for different architectures.
* Better logical split of the patches.
I have tested the build for warnings using 'make Warn' with gcc version 4.3.4.
---
Suzuki K. Poulose (4):
[ppc] Enable stack trace analysis for compressed Kdump
[netdump] Update the flags when ELF Notes are processed
[ppc] Support for compressed KDUMP
Generic routines for processing elf notes
diskdump.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++--------------
netdump.c | 3 ++
ppc.c | 14 ++++++--
3 files changed, 101 insertions(+), 27 deletions(-)
--
Suzuki K. Poulose
12:12 a.m.
New subject: [PATCH v2 1/4] Generic routines for processing elf notes
Rearranges the x86_process_elf_notes() to make it more reusable,
by making it more generic. Splits the code for handling Elf32 and
Elf64 PT_NOTE headers to separate functions.
This may be reused by other architectures, e.g, ppc32.
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
diskdump.c | 73 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/diskdump.c b/diskdump.c
index 5519af7..9f4b228 100644
--- a/diskdump.c
+++ b/diskdump.c
@@ -85,6 +85,9 @@ static struct diskdump_data **dd_list = NULL;
static int num_dd = 0;
static int num_dumpfiles = 0;
+void process_elf32_notes(void *, ulong);
+void process_elf64_notes(void *, ulong);
+
int dumpfile_is_split(void)
{
return KDUMP_SPLIT();
@@ -232,44 +235,66 @@ open_dump_file(char *file)
return TRUE;
}
-void
-x86_process_elf_notes(void *note_ptr, unsigned long size_note)
+void
+process_elf32_notes(void *note_buf, unsigned long size_note)
{
- Elf32_Nhdr *note32 = NULL;
- Elf64_Nhdr *note64 = NULL;
- size_t tot, len = 0;
+ Elf32_Nhdr *nt;
+ size_t index, len = 0;
int num = 0;
- for (tot = 0; tot < size_note; tot += len) {
- if (machine_type("X86_64")) {
- note64 = note_ptr + tot;
- if (note64->n_type == NT_PRSTATUS) {
- dd->nt_prstatus_percpu[num] = note64;
- num++;
- }
+ for (index = 0; index < size_note; index += len) {
+ nt = note_buf + index;
- len = sizeof(Elf64_Nhdr);
- len = roundup(len + note64->n_namesz, 4);
- len = roundup(len + note64->n_descsz, 4);
- } else if (machine_type("X86")) {
- note32 = note_ptr + tot;
+ if(nt->n_type == NT_PRSTATUS) {
+ dd->nt_prstatus_percpu[num] = nt;
+ num++;
+ }
+ len = sizeof(Elf32_Nhdr);
+ len = roundup(len + nt->n_namesz, 4);
+ len = roundup(len + nt->n_descsz, 4);
+ }
- if (note32->n_type == NT_PRSTATUS) {
- dd->nt_prstatus_percpu[num] = note32;
- num++;
- }
+ if (num > 0) {
+ pc->flags2 |= ELF_NOTES;
+ dd->num_prstatus_notes = num;
+ }
+ return;
+}
+
+void
+process_elf64_notes(void *note_buf, unsigned long size_note)
+{
+ Elf64_Nhdr *nt;
+ size_t index, len = 0;
+ int num = 0;
- len = sizeof(Elf32_Nhdr);
- len = roundup(len + note32->n_namesz, 4);
- len = roundup(len + note32->n_descsz, 4);
+ for (index = 0; index < size_note; index += len) {
+ nt = note_buf + index;
+
+ if(nt->n_type == NT_PRSTATUS) {
+ dd->nt_prstatus_percpu[num] = nt;
+ num++;
}
+ len = sizeof(Elf64_Nhdr);
+ len = roundup(len + nt->n_namesz, 4);
+ len = roundup(len + nt->n_descsz, 4);
}
if (num > 0) {
pc->flags2 |= ELF_NOTES;
dd->num_prstatus_notes = num;
}
+ return;
+}
+
+void
+x86_process_elf_notes(void *note_ptr, unsigned long size_note)
+{
+ if (machine_type("X86_64"))
+ process_elf64_notes(note_ptr, size_note);
+ else if (machine_type("X86"))
+ process_elf32_notes(note_ptr, size_note);
}
static int
12:13 a.m.
New subject: [PATCH v2 2/4] [ppc] Support for compressed KDUMP
This patch introduces support for analysing compressed KDUMP
cores for PPC32.
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
diskdump.c | 38 +++++++++++++++++++++++++++++++++++++-
ppc.c | 7 +++++++
2 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/diskdump.c b/diskdump.c
index 9f4b228..dc4baf3 100644
--- a/diskdump.c
+++ b/diskdump.c
@@ -367,6 +367,9 @@ restart:
else if (STRNEQ(header->utsname.machine, "ia64") &&
machine_type_mismatch(file, "IA64", NULL, 0))
goto err;
+ else if (STRNEQ(header->utsname.machine, "ppc") &&
+ machine_type_mismatch(file, "PPC", NULL, 0))
+ goto err;
else if (STRNEQ(header->utsname.machine, "ppc64") &&
machine_type_mismatch(file, "PPC64", NULL, 0))
goto err;
@@ -496,6 +499,8 @@ restart:
dd->machine_type = EM_X86_64;
else if (machine_type("IA64"))
dd->machine_type = EM_IA_64;
+ else if (machine_type("PPC"))
+ dd->machine_type = EM_PPC;
else if (machine_type("PPC64"))
dd->machine_type = EM_PPC64;
else if (machine_type("S390X"))
@@ -937,6 +942,31 @@ extern void get_netdump_regs_x86(struct bt_info *, ulong *, ulong
*);
extern void get_netdump_regs_x86_64(struct bt_info *, ulong *, ulong *);
static void
+get_diskdump_regs_ppc(struct bt_info *bt, ulong *eip, ulong *esp)
+{
+ Elf32_Nhdr *note;
+ int len;
+
+ if (KDUMP_CMPRS_VALID() &&
+ (bt->task == tt->panic_task ||
+ (is_task_active(bt->task) && dd->num_prstatus_notes > 1))) {
+ note = (Elf32_Nhdr*) dd->nt_prstatus_percpu[bt->tc->processor];
+ if (!note)
+ error(FATAL,
+ "cannot determine NT_PRSTATUS ELF note "
+ "for %s task: %lx\n",
+ (bt->task == tt->panic_task) ?
+ "panic" : "active", bt->task);
+ len = sizeof(Elf32_Nhdr);
+ len = roundup(len + note->n_namesz, 4);
+ bt->machdep = (void *)((char *)note + len +
+ MEMBER_OFFSET("elf_prstatus", "pr_reg"));
+ }
+
+ machdep->get_stack_frame(bt, eip, esp);
+}
+
+static void
get_diskdump_regs_ppc64(struct bt_info *bt, ulong *eip, ulong *esp)
{
if ((bt->task == tt->panic_task) && DISKDUMP_VALID())
@@ -977,6 +1007,10 @@ get_diskdump_regs(struct bt_info *bt, ulong *eip, ulong *esp)
machdep->get_stack_frame(bt, eip, esp);
break;
+ case EM_PPC:
+ return get_diskdump_regs_ppc(bt, eip, esp);
+ break;
+
case EM_PPC64:
return get_diskdump_regs_ppc64(bt, eip, esp);
break;
@@ -1142,7 +1176,7 @@ dump_nt_prstatus_offset(FILE *fp)
(tot == 0) ? "" : " ",
(ulong)(offset + tot));
- } else if (machine_type("X86")) {
+ } else if (machine_type("X86") || machine_type("PPC")) {
note32 = (void *)dd->notes_buf + tot;
len = sizeof(Elf32_Nhdr);
len = roundup(len + note32->n_namesz, 4);
@@ -1202,6 +1236,8 @@ __diskdump_memory_dump(FILE *fp)
fprintf(fp, "(EM_X86_64)\n"); break;
case EM_IA_64:
fprintf(fp, "(EM_IA_64)\n"); break;
+ case EM_PPC:
+ fprintf(fp, "(EM_PPC)\n"); break;
case EM_PPC64:
fprintf(fp, "(EM_PPC64)\n"); break;
case EM_S390:
diff --git a/ppc.c b/ppc.c
index 2a10fac..78c9178 100755
--- a/ppc.c
+++ b/ppc.c
@@ -67,6 +67,9 @@ static void ppc_display_machine_stats(void);
static void ppc_dump_line_number(ulong);
static struct line_number_hook ppc_line_number_hooks[];
+/* Defined in diskdump.c */
+extern void process_elf32_notes(void *, ulong);
+
/*
* Do all necessary machine-specific setup here. This is called twice,
* before and after GDB has been initialized.
@@ -79,6 +82,10 @@ ppc_init(int when)
switch (when)
{
+ case SETUP_ENV:
+ machdep->process_elf_notes = process_elf32_notes;
+ break;
+
case PRE_SYMTAB:
machdep->verify_symbol = ppc_verify_symbol;
if (pc->flags & KERNEL_DEBUG_QUERY)
12:15 a.m.
New subject: [PATCH v2 3/4] [netdump] Update the flags when ELF Notes are processed
This patch updates the pc->flags2 with ELF_NOTES flag for netdump, when
we have NT_PRSTATUS notes available from the core. Currently this flags is set
only in the case of diskdump. This change would allow us to generalize
the routines for obtaining stack frame for active tasks, where the GPRS
are stored in the notes.
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
netdump.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/netdump.c b/netdump.c
index d23e45c..177bc5c 100644
--- a/netdump.c
+++ b/netdump.c
@@ -1696,6 +1696,9 @@ dump_Elf32_Nhdr(Elf32_Off offset, int store)
}
}
}
+ /* Set the flags to indicate that we have NT_PRSTATUS notes */
+ if (nd->num_prstatus_notes > 0)
+ pc->flags2 |= ELF_NOTES;
break;
case NT_PRPSINFO:
netdump_print("(NT_PRPSINFO)\n");
8:39 a.m.
New subject: [PATCH v2 3/4] [netdump] Update the flags when ELF Notes are processed
----- Original Message -----
This patch updates the pc->flags2 with ELF_NOTES flag for netdump,
when
we have NT_PRSTATUS notes available from the core. Currently this flags is set
only in the case of diskdump. This change would allow us to generalize
the routines for obtaining stack frame for active tasks, where the GPRS
are stored in the notes.
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
netdump.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/netdump.c b/netdump.c
index d23e45c..177bc5c 100644
--- a/netdump.c
+++ b/netdump.c
@@ -1696,6 +1696,9 @@ dump_Elf32_Nhdr(Elf32_Off offset, int store)
}
}
}
+ /* Set the flags to indicate that we have NT_PRSTATUS notes */
+ if (nd->num_prstatus_notes > 0)
+ pc->flags2 |= ELF_NOTES;
break;
case NT_PRPSINFO:
netdump_print("(NT_PRPSINFO)\n");
As we discussed during the first patch-set, I'm not interested in
changing 32-bit x86 behavior as you've done above. You said that
you were going to re-spin it with #ifdef PPC.
Dave
1:44 a.m.
New subject: [UPDATED PATCH] [ppc] Enable stack trace analysis for compressed Kdump
Dave,
I have updated the patch below as per your suggestion.
---
In both Kdump and Compressed Kdump cores, we have the NT_PRSTATUS
notes available for the active tasks and we use them for getting the
stack trace. So reuse the function for compressed Kdump.
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
netdump.c | 5 +++++
ppc.c | 7 +++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/netdump.c b/netdump.c
index d23e45c..fe09734 100644
--- a/netdump.c
+++ b/netdump.c
@@ -1696,6 +1696,11 @@ dump_Elf32_Nhdr(Elf32_Off offset, int store)
}
}
}
+#ifdef PPC
+ /* Set the flags to indicate that we have NT_PRSTATUS notes */
+ if (nd->num_prstatus_notes > 0)
+ pc->flags2 |= ELF_NOTES;
+#endif
break;
case NT_PRPSINFO:
netdump_print("(NT_PRPSINFO)\n");
diff --git a/ppc.c b/ppc.c
index 78c9178..9e704d0 100755
--- a/ppc.c
+++ b/ppc.c
@@ -1193,8 +1193,11 @@ ppc_dumpfile_stack_frame(struct bt_info *bt, ulong *getpc, ulong
*getsp)
{
struct syment *sp;
- /* For KDUMP get the SP, PC from pt_regs stored in the core */
- if (pc->flags & KDUMP) {
+ /*
+ * For KDUMP and compressed KDUMP get the SP, PC from pt_regs
+ * read from the Elf Note.
+ */
+ if (ELF_NOTES_VALID()) {
ppc_kdump_stack_frame(bt, getpc, getsp);
return;
}
8:30 a.m.
New subject: [UPDATED PATCH] [ppc] Enable stack trace analysis for compressed Kdump
----- Original Message -----
Dave,
I have updated the patch below as per your suggestion.
No problem -- I had already modified that part with machine_type("PPC")
prior to my x86/x86_64 testing, which went fine.
The patch is queued for crash-6.0.3.
Thanks,
Dave
---
In both Kdump and Compressed Kdump cores, we have the NT_PRSTATUS
notes available for the active tasks and we use them for getting the
stack trace. So reuse the function for compressed Kdump.
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
netdump.c | 5 +++++
ppc.c | 7 +++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/netdump.c b/netdump.c
index d23e45c..fe09734 100644
--- a/netdump.c
+++ b/netdump.c
@@ -1696,6 +1696,11 @@ dump_Elf32_Nhdr(Elf32_Off offset, int store)
}
}
}
+#ifdef PPC
+ /* Set the flags to indicate that we have NT_PRSTATUS notes */
+ if (nd->num_prstatus_notes > 0)
+ pc->flags2 |= ELF_NOTES;
+#endif
break;
case NT_PRPSINFO:
netdump_print("(NT_PRPSINFO)\n");
diff --git a/ppc.c b/ppc.c
index 78c9178..9e704d0 100755
--- a/ppc.c
+++ b/ppc.c
@@ -1193,8 +1193,11 @@ ppc_dumpfile_stack_frame(struct bt_info *bt,
ulong *getpc, ulong *getsp)
{
struct syment *sp;
- /* For KDUMP get the SP, PC from pt_regs stored in the core */
- if (pc->flags & KDUMP) {
+ /*
+ * For KDUMP and compressed KDUMP get the SP, PC from pt_regs
+ * read from the Elf Note.
+ */
+ if (ELF_NOTES_VALID()) {
ppc_kdump_stack_frame(bt, getpc, getsp);
return;
}
12:15 a.m.
New subject: [PATCH v2 4/4] [ppc] Enable stack trace analysis for compressed Kdump
In both Kdump and Compressed Kdump cores, we have the NT_PRSTATUS
notes available for the active tasks and we use them for getting the
stack trace. So reuse the function for compressed Kdump.
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
ppc.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ppc.c b/ppc.c
index 78c9178..9e704d0 100755
--- a/ppc.c
+++ b/ppc.c
@@ -1193,8 +1193,11 @@ ppc_dumpfile_stack_frame(struct bt_info *bt, ulong *getpc, ulong
*getsp)
{
struct syment *sp;
- /* For KDUMP get the SP, PC from pt_regs stored in the core */
- if (pc->flags & KDUMP) {
+ /*
+ * For KDUMP and compressed KDUMP get the SP, PC from pt_regs
+ * read from the Elf Note.
+ */
+ if (ELF_NOTES_VALID()) {
ppc_kdump_stack_frame(bt, getpc, getsp);
return;
}
3:01 p.m.
Hi Suzuki,
Aside from making the dump_Elf32_Nhdr() change PPC-only, this patch
looks OK.
Because of the non-PPC changes you made in diskdump.c, I'm going to
have to test a set of x86 and x86_64 dumpfiles, which I'll set to run
overnight. But can you give me a sample compressed kdump vmcore
and its vmlinux so I can actually see this patch work? (through the
same channel that we used for the other two dumpfiles)
Thanks,
Dave
----- Original Message -----
Changes since V1:
* Introduced generic routines to parse the ELF Notes, which could
be
reused for different architectures.
* Better logical split of the patches.
I have tested the build for warnings using 'make Warn' with gcc
version 4.3.4.
---
Suzuki K. Poulose (4):
[ppc] Enable stack trace analysis for compressed Kdump
[netdump] Update the flags when ELF Notes are processed
[ppc] Support for compressed KDUMP
Generic routines for processing elf notes
diskdump.c | 111
++++++++++++++++++++++++++++++++++++++++++++++--------------
netdump.c | 3 ++
ppc.c | 14 ++++++--
3 files changed, 101 insertions(+), 27 deletions(-)
--
Suzuki K. Poulose
4533
days inactive
4534
days old
devel@lists.crash-utility.osci.io
8 comments
2 participants
participants (2)
-
Dave Anderson -
Suzuki K. Poulose