4:29 a.m.
The following series implements the kdump core analysis support
for PPC32. I have posted the KDUMP kernel support patches for PPC440x
here :
http://lists.ozlabs.org/pipermail/linuxppc-dev/2011-December/094994.html
You need upstream git snapshot of kexec-tools for kdump support on PPC440x.
These patches are based on crash-6.0.2
---
Suzuki K. Poulose (3):
[ppc] Enable stack trace display for KDUMP cores
[ppc][netdump] Read register set from ELF Note
[ppc] Support PPC32 Core analysis on PPC64 host
configure.c | 14 ++++++++
netdump.c | 77 +++++++++++++++++++++++++++++++++++++++++++++
ppc.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
3 files changed, 178 insertions(+), 14 deletions(-)
--
Suzuki Poulose
4:30 a.m.
New subject: [PATCH v2 1/3] [ppc] Support PPC32 Core analysis on PPC64 host
This patch enables crash on PPC64 to analyze the cores generated
on a PPC32 machine. I plan to look at adding support for PPC32 Kdump
core in the following patches. Running crash on a PPC32 board is not
a good thing to do. Hence using a PPC64 machine to do the same. There
is no support for analyzing target of a different endian-ness. I will
take a look at that later, once the PPC32 crash support is completed.
Note: The gdb-7.xx.patch hard codes the CFLAGS to include -m64 option
if we are building on a ppc64 host. So, we have to build from a 'ppc'
environment(Using setarch ppc).
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
configure.c | 14 +++++++++++++-
netdump.c | 6 ++++++
2 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/configure.c b/configure.c
index 00e7bb2..a1858a4 100755
--- a/configure.c
+++ b/configure.c
@@ -134,11 +134,13 @@ char *get_extra_flags(char *);
#define TARGET_CFLAGS_ARM_ON_X86 "TARGET_CFLAGS=-D_FILE_OFFSET_BITS=64"
#define TARGET_CFLAGS_ARM_ON_X86_64 "TARGET_CFLAGS=-m32
-D_FILE_OFFSET_BITS=64"
#define TARGET_CFLAGS_X86_ON_X86_64 "TARGET_CFLAGS=-m32
-D_FILE_OFFSET_BITS=64"
+#define TARGET_CFLAGS_PPC_ON_PPC64 "TARGET_CFLAGS=-m32 -D_FILE_OFFSET_BITS=64
-fPIC"
#define GDB_TARGET_DEFAULT "GDB_CONF_FLAGS="
#define GDB_TARGET_ARM_ON_X86 "GDB_CONF_FLAGS=--target=arm-elf-linux"
#define GDB_TARGET_ARM_ON_X86_64 "GDB_CONF_FLAGS=--target=arm-elf-linux
CFLAGS=-m32"
#define GDB_TARGET_X86_ON_X86_64 "GDB_CONF_FLAGS=--target=i686-pc-linux-gnu
CFLAGS=-m32"
+#define GDB_TARGET_PPC_ON_PPC64 "GDB_CONF_FLAGS=--target=ppc-elf-linux
CFLAGS=-m32"
/*
* The original plan was to allow the use of a particular version
@@ -361,6 +363,12 @@ get_current_configuration(struct supported_gdb_version *sp)
* Build an X86 crash binary on an X86_64 host.
*/
target_data.target = X86;
+ } else if ((target_data.target == PPC64) &&
+ (name_to_target((char *)target_data.target_as_param) == PPC)) {
+ /*
+ * Build an PPC crash binary on an PPC64 host.
+ */
+ target_data.target = PPC;
} else if (name_to_target((char *)target_data.target_as_param) ==
target_data.host) {
if ((target_data.initial_gdb_target != UNKNOWN) &&
@@ -556,7 +564,11 @@ build_configure(struct supported_gdb_version *sp)
break;
case PPC:
target = TARGET_PPC;
- target_CFLAGS = TARGET_CFLAGS_PPC;
+ if (target_data.host == PPC64) {
+ target_CFLAGS = TARGET_CFLAGS_PPC_ON_PPC64;
+ gdb_conf_flags = GDB_TARGET_PPC_ON_PPC64;
+ } else
+ target_CFLAGS = TARGET_CFLAGS_PPC;
break;
case IA64:
target = TARGET_IA64;
diff --git a/netdump.c b/netdump.c
index 4011f36..c0ee9ae 100644
--- a/netdump.c
+++ b/netdump.c
@@ -183,6 +183,12 @@ is_netdump(char *file, ulong source_query)
goto bailout;
break;
+ case EM_PPC:
+ if (machine_type_mismatch(file, "PPC", NULL,
+ source_query))
+ goto bailout;
+ break;
+
default:
if (machine_type_mismatch(file, "(unknown)", NULL,
source_query))
4:30 a.m.
New subject: [PATCH v2 2/3] [ppc][netdump] Read register set from ELF Note
This patch adds support for reading the register set on PPC32,
from the ELF note in a dump.
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
netdump.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/netdump.c b/netdump.c
index c0ee9ae..f7bf7d8 100644
--- a/netdump.c
+++ b/netdump.c
@@ -33,6 +33,7 @@ static size_t dump_Elf32_Nhdr(Elf32_Off offset, int);
static void dump_Elf64_Ehdr(Elf64_Ehdr *);
static void dump_Elf64_Phdr(Elf64_Phdr *, int);
static size_t dump_Elf64_Nhdr(Elf64_Off offset, int);
+static void get_netdump_regs_ppc(struct bt_info *, ulong *, ulong *);
static void get_netdump_regs_ppc64(struct bt_info *, ulong *, ulong *);
static void get_netdump_regs_arm(struct bt_info *, ulong *, ulong *);
static physaddr_t xen_kdump_p2m(physaddr_t);
@@ -2172,6 +2173,10 @@ get_netdump_regs(struct bt_info *bt, ulong *eip, ulong *esp)
machdep->get_stack_frame(bt, eip, esp);
break;
+ case EM_PPC:
+ return get_netdump_regs_ppc(bt, eip, esp);
+ break;
+
case EM_PPC64:
return get_netdump_regs_ppc64(bt, eip, esp);
break;
@@ -2551,6 +2556,40 @@ next_sysrq:
}
static void
+get_netdump_regs_ppc(struct bt_info *bt, ulong *eip, ulong *esp)
+{
+ Elf32_Nhdr *note;
+ size_t len;
+
+ if ((bt->task == tt->panic_task) ||
+ (is_task_active(bt->task) && nd->num_prstatus_notes > 1)) {
+ /*
+ * Registers are saved during the dump process for the
+ * panic task. Whereas in kdump, regs are captured for all
+ * CPUs if they responded to an IPI.
+ */
+ if (nd->num_prstatus_notes > 1) {
+ if (!nd->nt_prstatus_percpu[bt->tc->processor])
+ error(FATAL,
+ "cannot determine NT_PRSTATUS ELF note "
+ "for %s task: %lx\n",
+ (bt->task == tt->panic_task) ?
+ "panic" : "active", bt->task);
+ note = (Elf32_Nhdr *)
+ nd->nt_prstatus_percpu[bt->tc->processor];
+ } else
+ note = (Elf32_Nhdr *)nd->nt_prstatus;
+
+ 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_netdump_regs_ppc64(struct bt_info *bt, ulong *eip, ulong *esp)
{
Elf64_Nhdr *note;
@@ -2838,6 +2877,7 @@ xen_minor_version(void)
* Contributed by: Sharyathi Nagesh (sharyath(a)in.ibm.com)
*/
+static void *get_ppc_regs_from_elf_notes(struct task_context *);
static void *get_ppc64_regs_from_elf_notes(struct task_context *);
static void *get_x86_regs_from_elf_notes(struct task_context *);
static void *get_x86_64_regs_from_elf_notes(struct task_context *);
@@ -2876,6 +2916,7 @@ get_regs_from_elf_notes(struct task_context *tc)
switch (e_machine)
{
case EM_386:
+ case EM_PPC:
case EM_PPC64:
case EM_X86_64:
case EM_ARM:
@@ -2895,6 +2936,8 @@ get_regs_from_elf_notes(struct task_context *tc)
{
case EM_386:
return get_x86_regs_from_elf_notes(tc);
+ case EM_PPC:
+ return get_ppc_regs_from_elf_notes(tc);
case EM_PPC64:
return get_ppc64_regs_from_elf_notes(tc);
case EM_X86_64:
@@ -2964,6 +3007,34 @@ get_x86_64_regs_from_elf_notes(struct task_context *tc)
}
static void *
+get_ppc_regs_from_elf_notes(struct task_context *tc)
+{
+ Elf32_Nhdr *note;
+ size_t len;
+ void *pt_regs;
+ extern struct vmcore_data *nd;
+
+ pt_regs = NULL;
+
+ /*
+ * Registers are always saved during the dump process for the
+ * panic task. Kdump also captures registers for all CPUs if
+ * they responded to an IPI.
+ */
+ if (nd->num_prstatus_notes > 1) {
+ note = (Elf32_Nhdr *)nd->nt_prstatus_percpu[tc->processor];
+ } else
+ note = (Elf32_Nhdr *)nd->nt_prstatus;
+
+ len = sizeof(Elf32_Nhdr);
+ len = roundup(len + note->n_namesz, 4);
+ pt_regs = (void *)((char *)note + len +
+ MEMBER_OFFSET("elf_prstatus", "pr_reg"));
+
+ return pt_regs;
+}
+
+static void *
get_ppc64_regs_from_elf_notes(struct task_context *tc)
{
Elf64_Nhdr *note;
4:30 a.m.
New subject: [PATCH v2 3/3] [ppc] Enable stack trace display for KDUMP cores
Crash doesn't support displaying backtrace for ppc on KDUMP.
Before the patch :
crash> bt
PID: 482 TASK: c7af5380 CPU: 0 COMMAND: "bash"
bt: cannot resolve "crash_save_current_state"
This patch enables backtrace for PPC.
After the patch :
crash> bt
PID: 482 TASK: c7af5380 CPU: 0 COMMAND: "bash"
R0: 00000001 R1: c7acfea0 R2: c7af5380 R3: 00000063
R4: 00001c61 R5: ffffffff R6: c01e5234 R7: c05943f8
R8: c05948a8 R9: 00000000 R10: 00003fff R11: 00001c61
R12: 24242482 R13: 100ed8f4 R14: 00000000 R15: 100e0000
R16: 100e5db8 R17: 100cccf0 R18: 100e5f60 R19: 100e5ed0
R20: 100f8c08 R21: 100e5ce4 R22: 00000001 R23: 100e0000
R24: 100e0000 R25: 00000007 R26: c0560000 R27: 00029000
R28: 00000000 R29: 00000063 R30: c01e03a8 R31: c05800ac
NIP: c01e03bc MSR: 00021000 OR3: 00000000 CTR: c01e03a8
LR: c01e06a8 XER: 20000000 CCR: 24242484 MQ: c05948a8
DAR: 00000000 DSISR: 00800000 Syscall Result: 48026000
NIP [00000000c01e03bc] sysrq_handle_crash
LR [00000000c01e06a8] __handle_sysrq
#0 [c7acfea0] sysrq_handle_crash at c01e03bc
#1 [c7acfed0] write_sysrq_trigger at c01e0810
#2 [c7acfee0] proc_reg_write at c0139f48
#3 [c7acfef0] vfs_write at c00e4a10
#4 [c7acff10] sys_write at c00e4c3c
#5 [c7acff40] ret_from_syscall at c000d8c8
crash> bt 1
PID: 1 TASK: c782c000 CPU: 0 COMMAND: "init"
#0 [c782b9f0] __schedule at c0311774
#1 [c782ba30] schedule_hrtimeout_range_clock at c0312a18
#2 [c782bab0] poll_schedule_timeout at c00f7e38
#3 [c782bac0] do_select at c00f8f80
#4 [c782bdc0] core_sys_select at c00f931c
#5 [c782bf10] sys_select at c00f9758
#6 [c782bf40] ret_from_syscall at c000d8c8
Signed-off-by: Suzuki K. Poulose <suzuki(a)in.ibm.com>
---
ppc.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 88 insertions(+), 13 deletions(-)
diff --git a/ppc.c b/ppc.c
index a6e67fd..a001abe 100755
--- a/ppc.c
+++ b/ppc.c
@@ -1127,16 +1127,92 @@ ppc_print_eframe(char *efrm_str, struct ppc_pt_regs *regs, struct
bt_info *bt)
fprintf(fp, "\n");
}
+static void
+ppc_kdump_stack_frame(struct bt_info *bt, ulong *nip, ulong *ksp)
+{
+ struct ppc_pt_regs *pt_regs;
+ unsigned long ip, sp;
+
+ ip = sp = 0;
+
+ pt_regs = (struct ppc_pt_regs*)bt->machdep;
+
+ if (!pt_regs || !(pt_regs->gpr[1])) {
+ fprintf(fp, "0lx: GPR1 register value(SP) was not saved\n",
+ bt->task);
+ return;
+ }
+
+ sp = pt_regs->gpr[1];
+
+ if (!IS_KVADDR(sp)) {
+ if (IN_TASK_VMA(bt->task, *ksp))
+ fprintf(fp, "%0lx: Task is running in user space\n",
+ bt->task);
+ else
+ fprintf(fp, "%0lx: Invalid Stack Pointer %0lx\n",
+ bt->task, *ksp);
+ }
+
+ ip = pt_regs->nip;
+
+ if(nip)
+ *nip = ip;
+ if (ksp)
+ *ksp = sp;
+
+ if (bt->flags &&
+ ((BT_TEXT_SYMBOLS | BT_TEXT_SYMBOLS_PRINT |
+ BT_TEXT_SYMBOLS_NOPRINT)))
+ return TRUE;
+ /*
+ * Print the collected regs for the active task
+ */
+ ppc_print_regs(pt_regs);
+
+ if (!IS_KVADDR(sp))
+ return;
+
+ fprintf(fp, " NIP [%016lx] %s\n", pt_regs->nip,
+ closest_symbol(pt_regs->nip));
+ fprintf(fp, " LR [%016lx] %s\n", pt_regs->link,
+ closest_symbol(pt_regs->link));
+
+ fprintf(fp, "\n");
+
+ return;
+}
+
+static void
+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) {
+ ppc_kdump_stack_frame(bt, getpc, getsp);
+ return;
+ }
+
+ if (getpc) {
+ if (!(sp = next_symbol("crash_save_current_state", NULL)))
+ *getpc = (symbol_value("crash_save_current_state")+16);
+ else
+ *getpc = (sp->value - 4);
+ }
+}
+
/*
* Get a stack frame combination of pc and ra from the most relevent spot.
*/
static void
ppc_get_stack_frame(struct bt_info *bt, ulong *pcp, ulong *spp)
{
- if (pcp)
- *pcp = ppc_get_pc(bt);
- if (spp)
- *spp = ppc_get_sp(bt);
+ if (DUMPFILE() && is_task_active(bt->task))
+ ppc_dumpfile_stack_frame(bt, pcp, spp);
+ else
+ get_ppc_frame(bt, pcp, spp);
+
}
@@ -1148,7 +1224,10 @@ ppc_get_sp(struct bt_info *bt)
{
ulong sp;
- get_ppc_frame(bt, NULL, &sp);
+ if (DUMPFILE() && is_task_active(bt->task))
+ ppc_dumpfile_stack_frame(bt, NULL, &sp);
+ else
+ get_ppc_frame(bt, NULL, &sp);
return sp;
}
@@ -1159,16 +1238,12 @@ ppc_get_sp(struct bt_info *bt)
static ulong
ppc_get_pc(struct bt_info *bt)
{
- struct syment *sp;
ulong ip;
- if (DUMPFILE() && is_task_active(bt->task)) {
- if (!(sp = next_symbol("crash_save_current_state", NULL)))
- return (symbol_value("crash_save_current_state")+16);
- else
- return (sp->value - 4);
- }
- get_ppc_frame(bt, &ip, NULL);
+ if (DUMPFILE() && is_task_active(bt->task))
+ ppc_dumpfile_stack_frame(bt, &ip, NULL);
+ else
+ get_ppc_frame(bt, &ip, NULL);
return ip;
}
9:35 a.m.
----- Original Message -----
The following series implements the kdump core analysis support
for PPC32. I have posted the KDUMP kernel support patches for PPC440x
here :
http://lists.ozlabs.org/pipermail/linuxppc-dev/2011-December/094994.html
You need upstream git snapshot of kexec-tools for kdump support on
PPC440x.
These patches are based on crash-6.0.2
---
Suzuki K. Poulose (3):
[ppc] Enable stack trace display for KDUMP cores
[ppc][netdump] Read register set from ELF Note
[ppc] Support PPC32 Core analysis on PPC64 host
configure.c | 14 ++++++++
netdump.c | 77 +++++++++++++++++++++++++++++++++++++++++++++
ppc.c | 101
+++++++++++++++++++++++++++++++++++++++++++++++++++--------
3 files changed, 178 insertions(+), 14 deletions(-)
--
Suzuki Poulose
Hello Suzuki,
We're on company vacation this week -- I'll check this patch out
next Tuesday.
Thanks,
Dave
7:42 a.m.
----- Original Message -----
On 12/29/11 21:05, Dave Anderson wrote:
>
>
Dave,
In case you need a PPC32 vmcore and the corresponding vmlinux,
please let me know some place to dump the same.
Thanks
Suzuki
That would be good -- but I don't have public site to which you
can download it. Can you send me a URL (off-line) to where I
can access a vmlinux/vmcore pair?
Thanks,
Dave
2:10 p.m.
----- Original Message -----
The following series implements the kdump core analysis support
for PPC32. I have posted the KDUMP kernel support patches for PPC440x
here :
http://lists.ozlabs.org/pipermail/linuxppc-dev/2011-December/094994.html
You need upstream git snapshot of kexec-tools for kdump support on
PPC440x.
These patches are based on crash-6.0.2
---
Suzuki K. Poulose (3):
[ppc] Enable stack trace display for KDUMP cores
[ppc][netdump] Read register set from ELF Note
[ppc] Support PPC32 Core analysis on PPC64 host
configure.c | 14 ++++++++
netdump.c | 77 +++++++++++++++++++++++++++++++++++++++++++++
ppc.c | 101
+++++++++++++++++++++++++++++++++++++++++++++++++++--------
3 files changed, 178 insertions(+), 14 deletions(-)
--
Suzuki Poulose
Like the target=X86 and target=ARM builds on x86_64, I installed
several extra required libraries (glibc-devel.ppc, libgcc.ppc,
ncurses-libs.ppc, ncurses-devel.ppc and zlib-static.ppc), and
I finally got it to build OK with "setarch ppc make target=PPC".
However, I forgot the "setarch ppc" the first time I built it, and
it went ahead and built everything with both "-m64" and "-m32" set,
ending up with an (unwanted) 64-bit binary. So it might be worth
preventing that in configure.c? I'll leave that up to you.
But there are several compiler complaints (some are actual errors)
with the updated ppc.c file that need to be fixed:
...
cc -c -g -DPPC -m32 -D_FILE_OFFSET_BITS=64 -fPIC -DGDB_7_3_1 ppc.c -Wall -O2
-Wstrict-prototypes -Wmissing-prototypes -fstack-protector
ppc.c: In function ‘ppc_kdump_stack_frame’:
ppc.c:1142: warning: too many arguments for format
ppc.c:1167: warning: ‘return’ with a value, in function returning void
ppc.c: In function ‘get_ppc_frame’:
ppc.c:1259: warning: unused variable ‘offset’
ppc.c: In function ‘ppc_dump_irq’:
ppc.c:1354: warning: the address of ‘typename’ will always evaluate as ‘true’
ppc.c:1468: warning: the address of ‘typename’ will always evaluate as ‘true’
ppc.c: At top level:
ppc.c:1239: warning: ‘ppc_get_pc’ defined but not used
ppc.c:1223: warning: ‘ppc_get_sp’ defined but not used
...
Can you fix these so that "make warn" will compile it cleanly?
Thanks,
Dave
3:39 a.m.
On 01/04/12 01:40, Dave Anderson wrote:
----- Original Message -----
> The following series implements the kdump core analysis support
> for PPC32. I have posted the KDUMP kernel support patches for PPC440x
> here :
> http://lists.ozlabs.org/pipermail/linuxppc-dev/2011-December/094994.html
>
> You need upstream git snapshot of kexec-tools for kdump support on
> PPC440x.
>
> These patches are based on crash-6.0.2
>
> ---
>
> Suzuki K. Poulose (3):
> [ppc] Enable stack trace display for KDUMP cores
> [ppc][netdump] Read register set from ELF Note
> [ppc] Support PPC32 Core analysis on PPC64 host
>
>
> configure.c | 14 ++++++++
> netdump.c | 77 +++++++++++++++++++++++++++++++++++++++++++++
> ppc.c | 101
> +++++++++++++++++++++++++++++++++++++++++++++++++++--------
> 3 files changed, 178 insertions(+), 14 deletions(-)
>
> --
> Suzuki Poulose
Like the target=X86 and target=ARM builds on x86_64, I installed
several extra required libraries (glibc-devel.ppc, libgcc.ppc,
ncurses-libs.ppc, ncurses-devel.ppc and zlib-static.ppc), and
I finally got it to build OK with "setarch ppc make target=PPC".
However, I forgot the "setarch ppc" the first time I built
it, and
it went ahead and built everything with both "-m64" and "-m32" set,
ending up with an (unwanted) 64-bit binary. So it might be worth
preventing that in configure.c? I'll leave that up to you.
We have to fix this in gdb-7.3.1.patch and the Makefile, which hard codes
"-m64" based on the value of 'arch'. Have done this in the next
version.
But there are several compiler complaints (some are actual errors)
with the updated ppc.c file that need to be fixed:
...
cc -c -g -DPPC -m32 -D_FILE_OFFSET_BITS=64 -fPIC -DGDB_7_3_1 ppc.c -Wall -O2
-Wstrict-prototypes -Wmissing-prototypes -fstack-protector
ppc.c: In function ‘ppc_kdump_stack_frame’:
ppc.c:1142: warning: too many arguments for format
ppc.c:1167: warning: ‘return’ with a value, in function returning void
ppc.c: In function ‘get_ppc_frame’:
ppc.c:1259: warning: unused variable ‘offset’
ppc.c: In function ‘ppc_dump_irq’:
ppc.c:1354: warning: the address of ‘typename’ will always evaluate as ‘true’
ppc.c:1468: warning: the address of ‘typename’ will always evaluate as ‘true’
ppc.c: At top level:
ppc.c:1239: warning: ‘ppc_get_pc’ defined but not used
ppc.c:1223: warning: ‘ppc_get_sp’ defined but not used
...
Can you fix these so that "make warn" will compile it cleanly?
Yep, done. I will send the new version with the changes.
Thanks
Suzuki
4710
days inactive
4716
days old
devel@lists.crash-utility.osci.io
8 comments
2 participants
participants (2)
-
Dave Anderson -
Suzuki K. Poulose