9:09 a.m.
The MIPS general purpose registers in the elf_gregset_t don't start at
index 0 but at index 6.
(Note that the example dump files I provided earlier use the wrong
offsets; I'll make new ones).
---
mips.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/mips.c b/mips.c
index c181074..e5567f0 100644
--- a/mips.c
+++ b/mips.c
@@ -47,6 +47,11 @@ typedef ulong pte_t;
#define MIPS_CPU_RIXI 0x00800000llu
+#define MIPS32_EF_R0 6
+#define MIPS32_EF_R29 35
+#define MIPS32_EF_R31 37
+#define MIPS32_EF_CPU0_EPC 40
+
static struct machine_specific mips_machine_specific = { 0 };
static void
@@ -520,7 +525,7 @@ mips_back_trace_cmd(struct bt_info *bt)
if (bt->machdep) {
struct mips_regset *regs = bt->machdep;
- previous.pc = current.ra = regs->regs[31];
+ previous.pc = current.ra = regs->regs[MIPS32_EF_R31];
}
while (INSTACK(current.sp, bt)) {
@@ -614,9 +619,9 @@ mips_dumpfile_stack_frame(struct bt_info *bt, ulong *nip, ulong *ksp)
}
if (nip)
- *nip = regs->regs[40];
+ *nip = regs->regs[MIPS32_EF_CPU0_EPC];
if (ksp)
- *ksp = regs->regs[29];
+ *ksp = regs->regs[MIPS32_EF_R29];
}
static int
--
1.7.10.4
9:09 a.m.
New subject: [PATCH 2/6] MIPS: make pt_regs dynamic
The MIPS kernel's pt_regs structure changes between kernel versions.
For example, fields are inserted into the middle based on build time
options, and the amount of padding at the head of the structure was
changed relatively recently.
To handle this, split the structure definition into two parts and get
the offsets of these two parts dynamically.
---
defs.h | 8 ++++++--
mips.c | 57 +++++++++++++++++++++++++++++++++++++--------------------
symbols.c | 4 ++++
3 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/defs.h b/defs.h
index 853fa62..d2a8215 100644
--- a/defs.h
+++ b/defs.h
@@ -1938,6 +1938,8 @@ struct offset_table { /* stash of commonly-used
offsets */
long mm_struct_mm_count;
long task_struct_thread_reg29;
long task_struct_thread_reg31;
+ long pt_regs_regs;
+ long pt_regs_cp0_badvaddr;
};
struct size_table { /* stash of commonly-used sizes */
@@ -5612,12 +5614,14 @@ struct mips_regset {
ulong regs[45];
};
-struct mips_pt_regs {
- ulong pad0[8];
+struct mips_pt_regs_main {
ulong regs[32];
ulong cp0_status;
ulong hi;
ulong lo;
+};
+
+struct mips_pt_regs_cp0 {
ulong cp0_badvaddr;
ulong cp0_cause;
ulong cp0_epc;
diff --git a/mips.c b/mips.c
index e5567f0..bf81115 100644
--- a/mips.c
+++ b/mips.c
@@ -320,28 +320,34 @@ mips_kvtop(struct task_context *tc, ulong kvaddr, physaddr_t *paddr,
int verbose
}
static void
-mips_dump_exception_stack(struct bt_info *bt, struct mips_pt_regs *regs)
+mips_dump_exception_stack(struct bt_info *bt, char *pt_regs)
{
+ struct mips_pt_regs_main *mains;
+ struct mips_pt_regs_cp0 *cp0;
int i;
char buf[BUFSIZE];
+ mains = (struct mips_pt_regs_main *) (pt_regs + OFFSET(pt_regs_regs));
+ cp0 = (struct mips_pt_regs_cp0 *) \
+ (pt_regs + OFFSET(pt_regs_cp0_badvaddr));
+
for (i = 0; i < 32; i += 4) {
fprintf(fp, " $%2d : %08lx %08lx %08lx %08lx\n",
- i, regs->regs[i], regs->regs[i+1],
- regs->regs[i+2], regs->regs[i+3]);
+ i, mains->regs[i], mains->regs[i+1],
+ mains->regs[i+2], mains->regs[i+3]);
}
- fprintf(fp, " Hi : %08lx\n", regs->hi);
- fprintf(fp, " Lo : %08lx\n", regs->lo);
+ fprintf(fp, " Hi : %08lx\n", mains->hi);
+ fprintf(fp, " Lo : %08lx\n", mains->lo);
- value_to_symstr(regs->cp0_epc, buf, 16);
- fprintf(fp, " epc : %08lx %s\n", regs->cp0_epc, buf);
+ value_to_symstr(cp0->cp0_epc, buf, 16);
+ fprintf(fp, " epc : %08lx %s\n", cp0->cp0_epc, buf);
- value_to_symstr(regs->regs[31], buf, 16);
- fprintf(fp, " ra : %08lx %s\n", regs->regs[31], buf);
+ value_to_symstr(mains->regs[31], buf, 16);
+ fprintf(fp, " ra : %08lx %s\n", mains->regs[31], buf);
- fprintf(fp, " Status: %08lx\n", regs->cp0_status);
- fprintf(fp, " Cause : %08lx\n", regs->cp0_cause);
- fprintf(fp, " BadVA : %08lx\n", regs->cp0_badvaddr);
+ fprintf(fp, " Status: %08lx\n", mains->cp0_status);
+ fprintf(fp, " Cause : %08lx\n", cp0->cp0_cause);
+ fprintf(fp, " BadVA : %08lx\n", cp0->cp0_badvaddr);
}
struct mips_unwind_frame {
@@ -431,10 +437,10 @@ mips_dump_backtrace_entry(struct bt_info *bt, struct syment *sym,
}
if (mips_is_exception_entry(sym)) {
- struct mips_pt_regs ptregs;
+ char pt_regs[SIZE(pt_regs)];
- GET_STACK_DATA(current->sp, &ptregs, sizeof(ptregs));
- mips_dump_exception_stack(bt, &ptregs);
+ GET_STACK_DATA(current->sp, &pt_regs, SIZE(pt_regs));
+ mips_dump_exception_stack(bt, pt_regs);
}
if (bt->flags & BT_FULL) {
@@ -579,13 +585,20 @@ mips_back_trace_cmd(struct bt_info *bt)
}
if (mips_is_exception_entry(symbol)) {
- struct mips_pt_regs ptregs;
+ struct mips_pt_regs_main *mains;
+ struct mips_pt_regs_cp0 *cp0;
+ char pt_regs[SIZE(pt_regs)];
+
+ mains = (struct mips_pt_regs_main *) \
+ (pt_regs + OFFSET(pt_regs_regs));
+ cp0 = (struct mips_pt_regs_cp0 *) \
+ (pt_regs + OFFSET(pt_regs_cp0_badvaddr));
- GET_STACK_DATA(current.sp, &ptregs, sizeof(ptregs));
+ GET_STACK_DATA(current.sp, pt_regs, sizeof(pt_regs));
- previous.ra = ptregs.regs[31];
- previous.sp = ptregs.regs[29];
- current.ra = ptregs.cp0_epc;
+ previous.ra = mains->regs[31];
+ previous.sp = mains->regs[29];
+ current.ra = cp0->cp0_epc;
if (CRASHDEBUG(8))
fprintf(fp, "exception pc %#lx ra %#lx sp %lx\n",
@@ -666,6 +679,10 @@ mips_stackframe_init(void)
task_struct_thread + thread_reg29;
ASSIGN_OFFSET(task_struct_thread_reg31) =
task_struct_thread + thread_reg31;
+
+ STRUCT_SIZE_INIT(pt_regs, "pt_regs");
+ MEMBER_OFFSET_INIT(pt_regs_regs, "pt_regs", "regs");
+ MEMBER_OFFSET_INIT(pt_regs_cp0_badvaddr, "pt_regs",
"cp0_badvaddr");
}
static void
diff --git a/symbols.c b/symbols.c
index dd87cbc..48d9f58 100644
--- a/symbols.c
+++ b/symbols.c
@@ -8993,6 +8993,10 @@ dump_offset_table(char *spec, ulong makestruct)
OFFSET(rt_prio_array_queue));
fprintf(fp, " prio_array_nr_active: %ld\n",
OFFSET(prio_array_nr_active));
+ fprintf(fp, " pt_regs_regs: %ld\n",
+ OFFSET(pt_regs_regs));
+ fprintf(fp, " pt_regs_cp0_badvaddr: %ld\n",
+ OFFSET(pt_regs_cp0_badvaddr));
fprintf(fp, " user_regs_struct_ebp: %ld\n",
OFFSET(user_regs_struct_ebp));
fprintf(fp, " user_regs_struct_eip: %ld\n",
--
1.7.10.4
9:09 a.m.
New subject: [PATCH 3/6] MIPS: remove symbol debug
Almost everytime I use crash -d 8 I end up commenting out this line
because it simply prints too much information. There are other ways of
obtaining the symbol table, and the print can be easily restored to
debug symbol table issues, so remove it by default.
---
mips.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/mips.c b/mips.c
index bf81115..77077fb 100644
--- a/mips.c
+++ b/mips.c
@@ -740,9 +740,6 @@ mips_vmalloc_start(void)
static int
mips_verify_symbol(const char *name, ulong value, char type)
{
- if (CRASHDEBUG(8) && name && strlen(name))
- fprintf(fp, "%08lx %s\n", value, name);
-
if (STREQ(name, "_text"))
machdep->flags |= KSYMS_START;
--
1.7.10.4
9:09 a.m.
New subject: [PATCH 4/6] MIPS: ramdump support
Add support for loading raw MIPS ramdumps. The netdump change is to
handle the 64-bit ELFs created by the ramdump code.
---
netdump.c | 6 ++++++
ramdump.c | 2 ++
2 files changed, 8 insertions(+)
diff --git a/netdump.c b/netdump.c
index 3262451..283213e 100644
--- a/netdump.c
+++ b/netdump.c
@@ -274,6 +274,12 @@ is_netdump(char *file, ulong source_query)
goto bailout;
break;
+ case EM_MIPS:
+ if (machine_type_mismatch(file, "MIPS", NULL,
+ source_query))
+ goto bailout;
+ break;
+
default:
if (machine_type_mismatch(file, "(unknown)", NULL,
source_query))
diff --git a/ramdump.c b/ramdump.c
index 73a76be..ab93767 100644
--- a/ramdump.c
+++ b/ramdump.c
@@ -194,6 +194,8 @@ char *ramdump_to_elf(void)
e_machine = EM_ARM;
else if (machine_type("ARM64"))
e_machine = EM_AARCH64;
+ else if (machine_type("MIPS"))
+ e_machine = EM_MIPS;
else
error(FATAL, "ramdump: unsupported machine type: %s\n",
MACHINE_TYPE);
--
1.7.10.4
9:09 a.m.
New subject: [PATCH 5/6] MIPS: add kdump support
Allow kdump-style dumps to be loaded for MIPS.
---
diskdump.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/diskdump.c b/diskdump.c
index a9b9a15..585aaa9 100644
--- a/diskdump.c
+++ b/diskdump.c
@@ -345,7 +345,7 @@ x86_process_elf_notes(void *note_ptr, unsigned long size_note)
process_elf32_notes(note_ptr, size_note);
}
-#if defined(__i386__) && defined(ARM)
+#if defined(__i386__) && (defined(ARM) || defined(MIPS))
/*
* The kdump_sub_header member offsets are different when the crash
* binary is built natively on an ARM host vs. when built with
@@ -448,7 +448,7 @@ arm_kdump_header_adjust(int header_version)
kdsh->max_mapnr_64 = dd->max_mapnr;
}
}
-#endif /* __i386__ && ARM */
+#endif /* __i386__ && (ARM || MIPS) */
static int
read_dump_header(char *file)
@@ -532,6 +532,9 @@ restart:
else if (STRNEQ(header->utsname.machine, "arm") &&
machine_type_mismatch(file, "ARM", NULL, 0))
goto err;
+ else if (STRNEQ(header->utsname.machine, "mips") &&
+ machine_type_mismatch(file, "MIPS", NULL, 0))
+ goto err;
else if (STRNEQ(header->utsname.machine, "s390x") &&
machine_type_mismatch(file, "S390X", NULL, 0))
goto err;
@@ -614,7 +617,7 @@ restart:
}
dd->sub_header_kdump = sub_header_kdump;
-#if defined(__i386__) && defined(ARM)
+#if defined(__i386__) && (defined(ARM) || defined(MIPS))
arm_kdump_header_adjust(header->header_version);
#endif
/* use 64bit max_mapnr in compressed kdump file sub-header */
@@ -689,6 +692,8 @@ restart:
if (machine_type("ARM"))
dd->machine_type = EM_ARM;
+ else if (machine_type("MIPS"))
+ dd->machine_type = EM_MIPS;
else if (machine_type("X86"))
dd->machine_type = EM_386;
else if (machine_type("X86_64"))
@@ -1610,6 +1615,8 @@ __diskdump_memory_dump(FILE *fp)
{
case EM_ARM:
fprintf(fp, "(EM_ARM)\n"); break;
+ case EM_MIPS:
+ fprintf(fp, "(EM_MIPS)\n"); break;
case EM_386:
fprintf(fp, "(EM_386)\n"); break;
case EM_X86_64:
--
1.7.10.4
9:09 a.m.
New subject: [PATCH 6/6] Build extensions with -g
We already build crash with -g, let's build extensions with that too, so
that we can debug them with gdb.
---
extensions/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/extensions/Makefile b/extensions/Makefile
index 1e42805..551c54d 100644
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -38,12 +38,12 @@ $(CONTRIB_SO): %.so: %.c defs.h
else \
grep '((constructor))' $*.c > .constructor; \
if [ -s .constructor ]; then \
- echo "gcc -Wall -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET) $(TARGET_CFLAGS)
$(GDB_FLAGS)"; \
- gcc -Wall -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET) $(TARGET_CFLAGS)
$(GDB_FLAGS); \
+ echo "gcc -Wall -g -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET)
$(TARGET_CFLAGS) $(GDB_FLAGS)"; \
+ gcc -Wall -g -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET) $(TARGET_CFLAGS)
$(GDB_FLAGS); \
fi; \
if [ ! -s .constructor ]; then \
- echo "gcc -Wall -nostartfiles -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET)
$(TARGET_CFLAGS) $(GDB_FLAGS)"; \
- gcc -Wall -nostartfiles -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET)
$(TARGET_CFLAGS) $(GDB_FLAGS); \
+ echo "gcc -Wall -g -nostartfiles -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET)
$(TARGET_CFLAGS) $(GDB_FLAGS)"; \
+ gcc -Wall -g -nostartfiles -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET)
$(TARGET_CFLAGS) $(GDB_FLAGS); \
fi; \
fi
--
1.7.10.4
9:45 a.m.
New subject: [PATCH 6/6] Build extensions with -g
----- Original Message -----
We already build crash with -g, let's build extensions with that
too, so
that we can debug them with gdb.
---
extensions/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
I also added -g to snap.mk to cover all of the built-in extension modules.
Queued for crash-7.1.1:
https://github.com/crash-utility/crash/commit/407ce33ed0035269dcd788f0e98...
Thanks,
Dave
diff --git a/extensions/Makefile b/extensions/Makefile
index 1e42805..551c54d 100644
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -38,12 +38,12 @@ $(CONTRIB_SO): %.so: %.c defs.h
else \
grep '((constructor))' $*.c > .constructor; \
if [ -s .constructor ]; then \
- echo "gcc -Wall -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET)
$(TARGET_CFLAGS) $(GDB_FLAGS)"; \
- gcc -Wall -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET) $(TARGET_CFLAGS)
$(GDB_FLAGS); \
+ echo "gcc -Wall -g -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET)
$(TARGET_CFLAGS) $(GDB_FLAGS)"; \
+ gcc -Wall -g -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET)
$(TARGET_CFLAGS) $(GDB_FLAGS); \
fi; \
if [ ! -s .constructor ]; then \
- echo "gcc -Wall -nostartfiles -shared -rdynamic -o $@ $*.c -fPIC
-D$(TARGET) $(TARGET_CFLAGS) $(GDB_FLAGS)"; \
- gcc -Wall -nostartfiles -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET)
$(TARGET_CFLAGS) $(GDB_FLAGS); \
+ echo "gcc -Wall -g -nostartfiles -shared -rdynamic -o $@ $*.c -fPIC
-D$(TARGET) $(TARGET_CFLAGS) $(GDB_FLAGS)"; \
+ gcc -Wall -g -nostartfiles -shared -rdynamic -o $@ $*.c -fPIC -D$(TARGET)
$(TARGET_CFLAGS) $(GDB_FLAGS); \
fi; \
fi
--
1.7.10.4
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
11:12 a.m.
New subject: [PATCH 1/6] - [PATCH 5/6] MIPS:
Hi Rabin,
All 5 patches look good -- queued for crash-7.1.1:
https://github.com/crash-utility/crash/commit/def93c22f96f4af1990db8114ae...
Thanks,
Dave
3:11 p.m.
On Fri, Apr 24, 2015 at 04:09:13PM +0200, Rabin Vincent wrote:
The MIPS general purpose registers in the elf_gregset_t don't
start at
index 0 but at index 6.
(Note that the example dump files I provided earlier use the wrong
offsets; I'll make new ones).
I've now patched the example MIPS dumps to use the correct register
offsets. They're available at the same location:
https://drive.google.com/folderview?id=0B4tMLbMvJ-l6R3J4LWJFc1k0eFU
Rabin
3485
days inactive
3504
days old
devel@lists.crash-utility.osci.io
8 comments
3 participants
participants (3)
-
Dave Anderson -
Rabin Vincent -
Rabin Vincent