12:35 p.m.
Hi Dave,
Based on your comments, please see the interdiff below.
Changes:
- s/LIVEDUMP/LIVE_RAMDUMP/
- redefine LOCAL_ACTIVE() using LIVE_RAMDUMP
- change pc->dumpfile to be the name of the first ramdump file
- remove the stale label in ramdump_to_elf()
Oleg.
---
diff --git a/defs.h b/defs.h
index d3a03c1..61497a5 100644
--- a/defs.h
+++ b/defs.h
@@ -212,7 +212,7 @@ struct number_option {
#define DEVMEM (0x2000000ULL)
#define REM_LIVE_SYSTEM (0x4000000ULL)
#define NAMELIST_LOCAL (0x8000000ULL)
-#define LIVEDUMP (0x10000000ULL)
+#define LIVE_RAMDUMP (0x10000000ULL)
#define NAMELIST_SAVED (0x20000000ULL)
#define DUMPFILE_SAVED (0x40000000ULL)
#define UNLINK_NAMELIST (0x80000000ULL)
@@ -251,11 +251,11 @@ struct number_option {
#define PROC_KCORE (0x8000000000000000ULL)
#define ACTIVE() (pc->flags & LIVE_SYSTEM)
-#define LOCAL_ACTIVE() ((pc->flags & LIVE_SYSTEM) && (pc->flags2
& MEMSRC_LOCAL))
+#define LOCAL_ACTIVE() ((pc->flags & (LIVE_SYSTEM|LIVE_RAMDUMP)) ==
LIVE_SYSTEM)
#define DUMPFILE() (!(pc->flags & LIVE_SYSTEM))
#define LIVE() (pc->flags2 & LIVE_DUMP || pc->flags &
LIVE_SYSTEM)
-#define MEMORY_SOURCES
(NETDUMP|KDUMP|MCLXCD|LKCD|DEVMEM|S390D|MEMMOD|DISKDUMP|XENDUMP|CRASHBUILTIN|KVMDUMP|PROC_KCORE|SADUMP|VMWARE_VMSS|LIVEDUMP)
-#define DUMPFILE_TYPES
(DISKDUMP|NETDUMP|KDUMP|MCLXCD|LKCD|S390D|XENDUMP|KVMDUMP|SADUMP|VMWARE_VMSS|LIVEDUMP)
+#define MEMORY_SOURCES
(NETDUMP|KDUMP|MCLXCD|LKCD|DEVMEM|S390D|MEMMOD|DISKDUMP|XENDUMP|CRASHBUILTIN|KVMDUMP|PROC_KCORE|SADUMP|VMWARE_VMSS|LIVE_RAMDUMP)
+#define DUMPFILE_TYPES
(DISKDUMP|NETDUMP|KDUMP|MCLXCD|LKCD|S390D|XENDUMP|KVMDUMP|SADUMP|VMWARE_VMSS|LIVE_RAMDUMP)
#define REMOTE() (pc->flags2 & REMOTE_DAEMON)
#define REMOTE_ACTIVE() (pc->flags & REM_LIVE_SYSTEM)
#define REMOTE_DUMPFILE() \
diff --git a/filesys.c b/filesys.c
index 2779b2f..c291298 100644
--- a/filesys.c
+++ b/filesys.c
@@ -124,7 +124,6 @@ fd_init(void)
if (!pc->dumpfile) {
pc->flags |= LIVE_SYSTEM;
- pc->flags2 |= MEMSRC_LOCAL;
get_live_memory_source();
}
@@ -209,8 +208,7 @@ memory_source_init(void)
}
if (pc->dumpfile) {
- if (!(pc->flags & LIVEDUMP) &&
- !file_exists(pc->dumpfile, NULL))
+ if (!file_exists(pc->dumpfile, NULL))
error(FATAL, "%s: %s\n", pc->dumpfile,
strerror(ENOENT));
diff --git a/main.c b/main.c
index 0fbd10a..075a1e8 100644
--- a/main.c
+++ b/main.c
@@ -430,9 +430,7 @@ main(int argc, char **argv)
}
if (ACTIVE()) {
- pc->flags |= LIVEDUMP;
- /* disable get_live_memory_source() logic in fd_init() */
- pc->dumpfile = "livedump";
+ pc->flags |= LIVE_RAMDUMP;
pc->readmem = read_ramdump;
pc->writemem = NULL;
optind++;
diff --git a/memory.c b/memory.c
index 3339aa2..aa8be87 100644
--- a/memory.c
+++ b/memory.c
@@ -16463,7 +16463,7 @@ memory_page_size(void)
case CRASHBUILTIN:
case KVMDUMP:
case PROC_KCORE:
- case LIVEDUMP:
+ case LIVE_RAMDUMP:
psz = (uint)getpagesize();
break;
diff --git a/ramdump.c b/ramdump.c
index 12bfe05..941851c 100644
--- a/ramdump.c
+++ b/ramdump.c
@@ -227,7 +227,7 @@ char *ramdump_to_elf(void)
}
e_file = write_elf(load, e_head, data_offset);
-end:
+
free(e_head);
return e_file;
}
@@ -242,7 +242,7 @@ int is_ramdump(char *p)
size_t len;
char *pattern;
struct stat64 st;
- int is_live = 0;
+ int is_live;
int err = 0;
is_live = PREFIX(p, "live:");
@@ -283,9 +283,11 @@ int is_ramdump(char *p)
pat = NULL;
}
- if (nodes && is_live)
+ if (nodes && is_live) {
pc->flags |= LIVE_SYSTEM;
-
+ pc->dumpfile = ramdump[0].path;
+ pc->live_memsrc = pc->dumpfile;
+ }
return nodes;
}
12:36 p.m.
New subject: [PATCH v3 1/9] move MEMSRC_LOCAL from pc->flags to pc->flags2
We need a room for the new flag (introduced later) in pc->flags.
Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---
defs.h | 2 +-
filesys.c | 2 +-
main.c | 2 +-
remote.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/defs.h b/defs.h
index 56ae06c..cc5db51 100644
--- a/defs.h
+++ b/defs.h
@@ -212,7 +212,6 @@ struct number_option {
#define DEVMEM (0x2000000ULL)
#define REM_LIVE_SYSTEM (0x4000000ULL)
#define NAMELIST_LOCAL (0x8000000ULL)
-#define MEMSRC_LOCAL (0x10000000ULL)
#define NAMELIST_SAVED (0x20000000ULL)
#define DUMPFILE_SAVED (0x40000000ULL)
#define UNLINK_NAMELIST (0x80000000ULL)
@@ -523,6 +522,7 @@ struct program_context {
#define SNAP (0x20000ULL)
#define EXCLUDED_VMEMMAP (0x40000ULL)
#define is_excluded_vmemmap() (pc->flags2 & EXCLUDED_VMEMMAP)
+#define MEMSRC_LOCAL (0x80000ULL)
char *cleanup;
char *namelist_orig;
char *namelist_debug_orig;
diff --git a/filesys.c b/filesys.c
index 9b59998..f05a8cd 100644
--- a/filesys.c
+++ b/filesys.c
@@ -162,7 +162,7 @@ fd_init(void)
static void
memory_source_init(void)
{
- if (REMOTE() && !(pc->flags & MEMSRC_LOCAL))
+ if (REMOTE() && !(pc->flags2 & MEMSRC_LOCAL))
return;
if (pc->flags & KERNEL_DEBUG_QUERY)
diff --git a/main.c b/main.c
index 821bb4e..a4db88d 100644
--- a/main.c
+++ b/main.c
@@ -1294,7 +1294,7 @@ dump_program_context(void)
if (pc->flags & REM_LIVE_SYSTEM)
sprintf(&buf[strlen(buf)],
"%sREM_LIVE_SYSTEM", others++ ? "|" :
"");
- if (pc->flags & MEMSRC_LOCAL)
+ if (pc->flags2 & MEMSRC_LOCAL)
sprintf(&buf[strlen(buf)],
"%sMEMSRC_LOCAL", others++ ? "|" :
"");
if (pc->flags & NAMELIST_LOCAL)
diff --git a/remote.c b/remote.c
index 2938669..88a326b 100644
--- a/remote.c
+++ b/remote.c
@@ -2537,7 +2537,7 @@ remote_fd_init(void)
error(INFO, "too many dumpfile/memory arguments\n");
program_usage(SHORT_FORM);
}
- pc->flags |= MEMSRC_LOCAL;
+ pc->flags2 |= MEMSRC_LOCAL;
if (pc->flags & (DEVMEM|MEMMOD)) {
if (!get_proc_version())
error(INFO, "/proc/version: %s\n",
@@ -3025,7 +3025,7 @@ dumpfile_save:
return FALSE;
}
- if (pc->flags & MEMSRC_LOCAL) {
+ if (pc->flags2 & MEMSRC_LOCAL) {
error(INFO, "%s is a local file\n", pc->dumpfile);
return FALSE;
}
--
2.5.0
12:36 p.m.
New subject: [PATCH v3 2/9] introduce the LOCAL_ACTIVE() helper
Add the new simple helper, LOCAL_ACTIVE(). Ignoring the deprecated REMOTE()
code it is true if /bin/crash examines the live kernel on the same machine
using /dev/crash or similar device as live_memsrc.
Change fd_init() and memory_source_init() to check LOCAL_ACTIVE() instead
of ACTIVE(), both assume exactly this case when they check ACTIVE().
Currently it is equivalent to ACTIVE(), this will be changed later.
Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---
defs.h | 1 +
filesys.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/defs.h b/defs.h
index cc5db51..1c78c38 100644
--- a/defs.h
+++ b/defs.h
@@ -250,6 +250,7 @@ struct number_option {
#define PROC_KCORE (0x8000000000000000ULL)
#define ACTIVE() (pc->flags & LIVE_SYSTEM)
+#define LOCAL_ACTIVE() ACTIVE()
#define DUMPFILE() (!(pc->flags & LIVE_SYSTEM))
#define LIVE() (pc->flags2 & LIVE_DUMP || pc->flags &
LIVE_SYSTEM)
#define MEMORY_SOURCES
(NETDUMP|KDUMP|MCLXCD|LKCD|DEVMEM|S390D|MEMMOD|DISKDUMP|XENDUMP|CRASHBUILTIN|KVMDUMP|PROC_KCORE|SADUMP|VMWARE_VMSS)
diff --git a/filesys.c b/filesys.c
index f05a8cd..c291298 100644
--- a/filesys.c
+++ b/filesys.c
@@ -134,7 +134,7 @@ fd_init(void)
pc->nfd = -1;
}
- if (ACTIVE() && !(pc->namelist_debug || pc->system_map)) {
+ if (LOCAL_ACTIVE() && !(pc->namelist_debug || pc->system_map)) {
memory_source_init();
match_proc_version();
}
@@ -168,7 +168,7 @@ memory_source_init(void)
if (pc->flags & KERNEL_DEBUG_QUERY)
return;
- if (ACTIVE()) {
+ if (LOCAL_ACTIVE()) {
if (pc->mfd != -1) /* already been here */
return;
--
2.5.0
12:36 p.m.
New subject: [PATCH v3 3/9] back_trace: don't check /proc if !LOCAL_ACTIVE()
Obviously the /proc/$tc->pid check can only make sense if LOCAL_ACTIVE().
Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---
kernel.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel.c b/kernel.c
index a6fa7a6..c82b854 100644
--- a/kernel.c
+++ b/kernel.c
@@ -2901,6 +2901,10 @@ back_trace(struct bt_info *bt)
}
if (ACTIVE() && !INSTACK(esp, bt)) {
+ if (!LOCAL_ACTIVE()) {
+ error(INFO, "task no longer exists\n");
+ return;
+ }
sprintf(buf, "/proc/%ld", bt->tc->pid);
if (!file_exists(buf, NULL))
error(INFO, "task no longer exists\n");
--
2.5.0
12:36 p.m.
New subject: [PATCH v3 4/9] task_init: don't abuse pc->program_pid if !LOCAL_ACTIVE()
Use pid == 1 and /sbin/init as tt->this_task instead, pc->program_pid can't
be used.
We could probably leave tt->this_task = NO_TASK, but we need to initialize
CURRENT_CONTEXT() anyway and we need something for refresh_context(), to me
"init" looks better than (say) FIRST_CONTEXT() == swapper/0.
However, this means that /init/sbin will be always reported as "active", see
the next patch.
Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---
task.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/task.c b/task.c
index 7b01951..fd4b700 100644
--- a/task.c
+++ b/task.c
@@ -124,7 +124,6 @@ task_init(void)
long tss_offset, thread_offset;
long eip_offset, esp_offset, ksp_offset;
struct gnu_request req;
- ulong active_pid;
if (!(tt->idle_threads = (ulong *)calloc(NR_CPUS, sizeof(ulong))))
error(FATAL, "cannot malloc idle_threads array");
@@ -493,7 +492,9 @@ task_init(void)
tt->flags &= ~(TASK_REFRESH|TASK_REFRESH_OFF);
if (ACTIVE()) {
- active_pid = REMOTE() ? pc->server_pid : pc->program_pid;
+ ulong active_pid = REMOTE() ? pc->server_pid :
+ LOCAL_ACTIVE() ? pc->program_pid :
+ 1;
set_context(NO_TASK, active_pid);
tt->this_task = pid_to_task(active_pid);
}
--
2.5.0
12:36 p.m.
New subject: [PATCH v3 5/9] simplify the "tt->this_task should be active" logic
After the previous patch the "task == tt->this_task" checks in back_trace()
and
is_task_active() lead to falsely "active" state if ACTIVE() &&
!LOCAL_ACTIVE().
This is easy to fix, but it seems to me that we can just simplify this logic and
remove the tt->this_task check from back_trace(), although I'm afraid I missed
something.
It look really simple: if LOCAL_ACTIVE() than "this_task" is /usr/bin/crash and
it is obviously running, otherwise we can never assume this if !task_has_cpu().
Not to mention that "deprecation of usage of has_cpu on non-SMP systems" looks
confusing, task_has_cpu() can work without VALID_MEMBER(task_struct_has_cpu).
BTW, I think that task_init() should use "on_cpu" if
MEMBER_OFFSET_INIT(has_cpu)
fails, but this is off-topic.
Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---
kernel.c | 3 +--
task.c | 8 +++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/kernel.c b/kernel.c
index c82b854..5a392fc 100644
--- a/kernel.c
+++ b/kernel.c
@@ -2800,8 +2800,7 @@ back_trace(struct bt_info *bt)
return;
}
- if (LIVE() && !(bt->flags & BT_EFRAME_SEARCH) &&
- ((bt->task == tt->this_task) || is_task_active(bt->task))) {
+ if (LIVE() && !(bt->flags & BT_EFRAME_SEARCH) &&
is_task_active(bt->task)) {
if (BT_REFERENCE_CHECK(bt) ||
bt->flags & (BT_TEXT_SYMBOLS_PRINT|BT_TEXT_SYMBOLS_NOPRINT))
diff --git a/task.c b/task.c
index fd4b700..a6bc9e7 100644
--- a/task.c
+++ b/task.c
@@ -5359,18 +5359,16 @@ is_task_active(ulong task)
{
int has_cpu;
+ if (LOCAL_ACTIVE() && (task == tt->this_task))
+ return TRUE;
if (DUMPFILE() && is_panic_thread(task))
return TRUE;
fill_task_struct(task);
- has_cpu = tt->last_task_read ?
+ has_cpu = tt->last_task_read ?
task_has_cpu(task, tt->task_struct) : 0;
- if (!(kt->flags & SMP) && !has_cpu && ACTIVE() &&
- (task == tt->this_task))
- has_cpu = TRUE;
-
return(has_cpu);
}
--
2.5.0
12:36 p.m.
New subject: [PATCH v3 6/9] panic_this_kernel: check LOCAL_ACTIVE() rather than DUMPFILE()
Obviously it can only work if LOCAL_ACTIVE() == T.
Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---
kernel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel.c b/kernel.c
index 5a392fc..d53249b 100644
--- a/kernel.c
+++ b/kernel.c
@@ -8452,7 +8452,7 @@ panic_this_kernel(void)
{
pid_t zero_pid = 0;
- if (DUMPFILE())
+ if (!LOCAL_ACTIVE())
error(FATAL, "cannot panic a dumpfile!\n");
if (!(pc->flags & MFD_RDWR) || (pc->flags & MEMMOD))
--
2.5.0
12:36 p.m.
New subject: [PATCH v3 7/9] cmd_set: use tt->this_task rather than pc->program_pid
pc->program_pid is only correct if LOCAL_ACTIVE(), tt->this_task is always
fine even if REMOTE().
Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---
tools.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools.c b/tools.c
index afc6cb3..fef262d 100644
--- a/tools.c
+++ b/tools.c
@@ -1787,7 +1787,7 @@ cmd_set(void)
return;
if (ACTIVE()) {
- set_context(NO_TASK, pc->program_pid);
+ set_context(tt->this_task, NO_PID);
show_context(CURRENT_CONTEXT());
return;
}
--
2.5.0
12:36 p.m.
New subject: [PATCH v3 8/9] shift ramdump_def.end_paddr calculation from alloc_program_headers() to is_ramdump()
Preparation. This way "ramdump" array is ready for use right after
is_ramdump(), and this also simplifies the code a little bit.
Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---
ramdump.c | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/ramdump.c b/ramdump.c
index ab93767..1922c1b 100644
--- a/ramdump.c
+++ b/ramdump.c
@@ -59,29 +59,19 @@ static void alloc_elf_header(Elf64_Ehdr *ehdr, ushort e_machine)
ehdr->e_shstrndx = 0;
}
-static int alloc_program_headers(Elf64_Phdr *phdr)
+static void alloc_program_headers(Elf64_Phdr *phdr)
{
unsigned int i;
- struct stat64 st;
for (i = 0; i < nodes; i++) {
phdr[i].p_type = PT_LOAD;
-
- if (0 > stat64(ramdump[i].path, &st)) {
- error(INFO, "ramdump stat failed\n");
- return -1;
- }
-
- phdr[i].p_filesz = st.st_size;
+ phdr[i].p_filesz = ramdump[i].end_paddr + 1 - ramdump[i].start_paddr;
phdr[i].p_memsz = phdr[i].p_filesz;
phdr[i].p_vaddr = 0;
phdr[i].p_paddr = ramdump[i].start_paddr;
- ramdump[i].end_paddr = ramdump[i].start_paddr + st.st_size - 1;
phdr[i].p_flags = PF_R | PF_W | PF_X;
phdr[i].p_align = 0;
}
-
- return 0;
}
static char *write_elf(Elf64_Phdr *load, Elf64_Ehdr *e_head, size_t data_offset)
@@ -219,8 +209,7 @@ char *ramdump_to_elf(void)
load = (Elf64_Phdr *)ptr;
- if (alloc_program_headers(load))
- goto end;
+ alloc_program_headers(load);
offset += sizeof(Elf64_Phdr) * nodes;
ptr += sizeof(Elf64_Phdr) * nodes;
@@ -238,7 +227,7 @@ char *ramdump_to_elf(void)
}
e_file = write_elf(load, e_head, data_offset);
-end:
+
free(e_head);
return e_file;
}
@@ -248,6 +237,7 @@ int is_ramdump(char *p)
char *x = NULL, *y = NULL, *pat;
size_t len;
char *pattern;
+ struct stat64 st;
int err = 0;
if (nodes || !strchr(p, '@'))
@@ -277,6 +267,10 @@ int is_ramdump(char *p)
"ramdump %s open failed:%s\n",
ramdump[nodes - 1].path,
strerror(errno));
+ if (fstat64(ramdump[nodes - 1].rfd, &st) < 0)
+ error(FATAL, "ramdump stat failed\n");
+ ramdump[nodes - 1].end_paddr =
+ ramdump[nodes - 1].start_paddr + st.st_size - 1;
}
pat = NULL;
--
2.5.0
12:36 p.m.
New subject: [PATCH v3 9/9] teach crash to accept live:MEMORY-IMAGE[@ADDRESS]
Now I can run qemu with the memory-backend-file option and use /usr/bin/crash
in "live" mode using the file(s) specified by mem-path argument as a RAM dump.
For example,
$ qemu-kmv ...other-options... \
-object memory-backend-file,id=MEM,size=128m,mem-path=/tmp/MEM,share=on \
-numa node,memdev=MEM -m 128
and
$ crash path-to-guests-vmlinux live:/tmp/MEM@0
NOTE: in this particular (and simple) case the offset is always zero. In more
complex situations the ram-to-file mapping used by qemu can be nontrivial, but
it is very simple to add the support for MEMORY-IMAGE@ADDRESS-LENGTH syntax.
Signed-off-by: Oleg Nesterov <oleg(a)redhat.com>
---
defs.h | 7 ++++---
main.c | 9 +++++++++
memory.c | 1 +
ramdump.c | 12 ++++++++++++
4 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/defs.h b/defs.h
index 1c78c38..61497a5 100644
--- a/defs.h
+++ b/defs.h
@@ -212,6 +212,7 @@ struct number_option {
#define DEVMEM (0x2000000ULL)
#define REM_LIVE_SYSTEM (0x4000000ULL)
#define NAMELIST_LOCAL (0x8000000ULL)
+#define LIVE_RAMDUMP (0x10000000ULL)
#define NAMELIST_SAVED (0x20000000ULL)
#define DUMPFILE_SAVED (0x40000000ULL)
#define UNLINK_NAMELIST (0x80000000ULL)
@@ -250,11 +251,11 @@ struct number_option {
#define PROC_KCORE (0x8000000000000000ULL)
#define ACTIVE() (pc->flags & LIVE_SYSTEM)
-#define LOCAL_ACTIVE() ACTIVE()
+#define LOCAL_ACTIVE() ((pc->flags & (LIVE_SYSTEM|LIVE_RAMDUMP)) ==
LIVE_SYSTEM)
#define DUMPFILE() (!(pc->flags & LIVE_SYSTEM))
#define LIVE() (pc->flags2 & LIVE_DUMP || pc->flags &
LIVE_SYSTEM)
-#define MEMORY_SOURCES
(NETDUMP|KDUMP|MCLXCD|LKCD|DEVMEM|S390D|MEMMOD|DISKDUMP|XENDUMP|CRASHBUILTIN|KVMDUMP|PROC_KCORE|SADUMP|VMWARE_VMSS)
-#define DUMPFILE_TYPES
(DISKDUMP|NETDUMP|KDUMP|MCLXCD|LKCD|S390D|XENDUMP|KVMDUMP|SADUMP|VMWARE_VMSS)
+#define MEMORY_SOURCES
(NETDUMP|KDUMP|MCLXCD|LKCD|DEVMEM|S390D|MEMMOD|DISKDUMP|XENDUMP|CRASHBUILTIN|KVMDUMP|PROC_KCORE|SADUMP|VMWARE_VMSS|LIVE_RAMDUMP)
+#define DUMPFILE_TYPES
(DISKDUMP|NETDUMP|KDUMP|MCLXCD|LKCD|S390D|XENDUMP|KVMDUMP|SADUMP|VMWARE_VMSS|LIVE_RAMDUMP)
#define REMOTE() (pc->flags2 & REMOTE_DAEMON)
#define REMOTE_ACTIVE() (pc->flags & REM_LIVE_SYSTEM)
#define REMOTE_DUMPFILE() \
diff --git a/main.c b/main.c
index a4db88d..075a1e8 100644
--- a/main.c
+++ b/main.c
@@ -428,6 +428,15 @@ main(int argc, char **argv)
"too many dumpfile arguments\n");
program_usage(SHORT_FORM);
}
+
+ if (ACTIVE()) {
+ pc->flags |= LIVE_RAMDUMP;
+ pc->readmem = read_ramdump;
+ pc->writemem = NULL;
+ optind++;
+ continue;
+ }
+
pc->dumpfile = ramdump_to_elf();
if (is_kdump(pc->dumpfile, KDUMP_LOCAL)) {
pc->flags |= KDUMP;
diff --git a/memory.c b/memory.c
index 693516e..aa8be87 100644
--- a/memory.c
+++ b/memory.c
@@ -16463,6 +16463,7 @@ memory_page_size(void)
case CRASHBUILTIN:
case KVMDUMP:
case PROC_KCORE:
+ case LIVE_RAMDUMP:
psz = (uint)getpagesize();
break;
diff --git a/ramdump.c b/ramdump.c
index 1922c1b..941851c 100644
--- a/ramdump.c
+++ b/ramdump.c
@@ -232,14 +232,21 @@ char *ramdump_to_elf(void)
return e_file;
}
+#define PREFIX(ptr, pat) \
+ (strncmp((ptr), (pat), sizeof(pat)-1) ? 0 : \
+ ((ptr) += sizeof(pat)-1, 1))
+
int is_ramdump(char *p)
{
char *x = NULL, *y = NULL, *pat;
size_t len;
char *pattern;
struct stat64 st;
+ int is_live;
int err = 0;
+ is_live = PREFIX(p, "live:");
+
if (nodes || !strchr(p, '@'))
return 0;
@@ -276,6 +283,11 @@ int is_ramdump(char *p)
pat = NULL;
}
+ if (nodes && is_live) {
+ pc->flags |= LIVE_SYSTEM;
+ pc->dumpfile = ramdump[0].path;
+ pc->live_memsrc = pc->dumpfile;
+ }
return nodes;
}
--
2.5.0
2:22 p.m.
----- Original Message -----
Hi Dave,
Based on your comments, please see the interdiff below.
Oleg,
Can you just give me a fresh patchset based upon the upstream git repo?
Thanks,
Dave
Changes:
- s/LIVEDUMP/LIVE_RAMDUMP/
- redefine LOCAL_ACTIVE() using LIVE_RAMDUMP
- change pc->dumpfile to be the name of the first ramdump file
- remove the stale label in ramdump_to_elf()
Oleg.
---
diff --git a/defs.h b/defs.h
index d3a03c1..61497a5 100644
--- a/defs.h
+++ b/defs.h
@@ -212,7 +212,7 @@ struct number_option {
#define DEVMEM (0x2000000ULL)
#define REM_LIVE_SYSTEM (0x4000000ULL)
#define NAMELIST_LOCAL (0x8000000ULL)
-#define LIVEDUMP (0x10000000ULL)
+#define LIVE_RAMDUMP (0x10000000ULL)
#define NAMELIST_SAVED (0x20000000ULL)
#define DUMPFILE_SAVED (0x40000000ULL)
#define UNLINK_NAMELIST (0x80000000ULL)
@@ -251,11 +251,11 @@ struct number_option {
#define PROC_KCORE (0x8000000000000000ULL)
#define ACTIVE() (pc->flags & LIVE_SYSTEM)
-#define LOCAL_ACTIVE() ((pc->flags & LIVE_SYSTEM) && (pc->flags2
&
MEMSRC_LOCAL))
+#define LOCAL_ACTIVE() ((pc->flags & (LIVE_SYSTEM|LIVE_RAMDUMP)) ==
LIVE_SYSTEM)
#define DUMPFILE() (!(pc->flags & LIVE_SYSTEM))
#define LIVE() (pc->flags2 & LIVE_DUMP || pc->flags &
LIVE_SYSTEM)
-#define MEMORY_SOURCES
(NETDUMP|KDUMP|MCLXCD|LKCD|DEVMEM|S390D|MEMMOD|DISKDUMP|XENDUMP|CRASHBUILTIN|KVMDUMP|PROC_KCORE|SADUMP|VMWARE_VMSS|LIVEDUMP)
-#define DUMPFILE_TYPES
(DISKDUMP|NETDUMP|KDUMP|MCLXCD|LKCD|S390D|XENDUMP|KVMDUMP|SADUMP|VMWARE_VMSS|LIVEDUMP)
+#define MEMORY_SOURCES
(NETDUMP|KDUMP|MCLXCD|LKCD|DEVMEM|S390D|MEMMOD|DISKDUMP|XENDUMP|CRASHBUILTIN|KVMDUMP|PROC_KCORE|SADUMP|VMWARE_VMSS|LIVE_RAMDUMP)
+#define DUMPFILE_TYPES
(DISKDUMP|NETDUMP|KDUMP|MCLXCD|LKCD|S390D|XENDUMP|KVMDUMP|SADUMP|VMWARE_VMSS|LIVE_RAMDUMP)
#define REMOTE() (pc->flags2 & REMOTE_DAEMON)
#define REMOTE_ACTIVE() (pc->flags & REM_LIVE_SYSTEM)
#define REMOTE_DUMPFILE() \
diff --git a/filesys.c b/filesys.c
index 2779b2f..c291298 100644
--- a/filesys.c
+++ b/filesys.c
@@ -124,7 +124,6 @@ fd_init(void)
if (!pc->dumpfile) {
pc->flags |= LIVE_SYSTEM;
- pc->flags2 |= MEMSRC_LOCAL;
get_live_memory_source();
}
@@ -209,8 +208,7 @@ memory_source_init(void)
}
if (pc->dumpfile) {
- if (!(pc->flags & LIVEDUMP) &&
- !file_exists(pc->dumpfile, NULL))
+ if (!file_exists(pc->dumpfile, NULL))
error(FATAL, "%s: %s\n", pc->dumpfile,
strerror(ENOENT));
diff --git a/main.c b/main.c
index 0fbd10a..075a1e8 100644
--- a/main.c
+++ b/main.c
@@ -430,9 +430,7 @@ main(int argc, char **argv)
}
if (ACTIVE()) {
- pc->flags |= LIVEDUMP;
- /* disable get_live_memory_source() logic in fd_init() */
- pc->dumpfile = "livedump";
+ pc->flags |= LIVE_RAMDUMP;
pc->readmem = read_ramdump;
pc->writemem = NULL;
optind++;
diff --git a/memory.c b/memory.c
index 3339aa2..aa8be87 100644
--- a/memory.c
+++ b/memory.c
@@ -16463,7 +16463,7 @@ memory_page_size(void)
case CRASHBUILTIN:
case KVMDUMP:
case PROC_KCORE:
- case LIVEDUMP:
+ case LIVE_RAMDUMP:
psz = (uint)getpagesize();
break;
diff --git a/ramdump.c b/ramdump.c
index 12bfe05..941851c 100644
--- a/ramdump.c
+++ b/ramdump.c
@@ -227,7 +227,7 @@ char *ramdump_to_elf(void)
}
e_file = write_elf(load, e_head, data_offset);
-end:
+
free(e_head);
return e_file;
}
@@ -242,7 +242,7 @@ int is_ramdump(char *p)
size_t len;
char *pattern;
struct stat64 st;
- int is_live = 0;
+ int is_live;
int err = 0;
is_live = PREFIX(p, "live:");
@@ -283,9 +283,11 @@ int is_ramdump(char *p)
pat = NULL;
}
- if (nodes && is_live)
+ if (nodes && is_live) {
pc->flags |= LIVE_SYSTEM;
-
+ pc->dumpfile = ramdump[0].path;
+ pc->live_memsrc = pc->dumpfile;
+ }
return nodes;
}
5:16 a.m.
On 05/03, Dave Anderson wrote:
> Based on your comments, please see the interdiff below.
Oleg,
Can you just give me a fresh patchset based upon the upstream git repo?
Hmm. Did you get 1-9 I sent in reply to this message? I can see this patchset
in https://www.redhat.com/archives/crash-utility/2016-May/date.html but
perhaps you didn't receive my emails?
Just in case... the interdiff in the cover letter is just fyi, of course you
do not need it to apply 1-9. It just show the difference between this patchset
and the previous V2.
And I just cloned http://github.com/crash-utility/crash to verify that this V3
has no conflicts. The last commit is c89b9de0eb9f40355fc57bc5d4f36be47eed4659
"crash-7.1.4 -> crash-7.1.5". Or I used the wrong repo?
Oleg.
7:41 a.m.
----- Original Message -----
On 05/03, Dave Anderson wrote:
>
> > Based on your comments, please see the interdiff below.
>
> Oleg,
>
> Can you just give me a fresh patchset based upon the upstream git repo?
Hmm. Did you get 1-9 I sent in reply to this message? I can see this patchset
in https://www.redhat.com/archives/crash-utility/2016-May/date.html but
perhaps you didn't receive my emails?
Just in case... the interdiff in the cover letter is just fyi, of course you
do not need it to apply 1-9. It just show the difference between this patchset
and the previous V2.
Ah OK, yes, I was mistakenly using the 0/9 patch. Although, even now without it,
there are several segements that only succeed with "(offset # lines)", so I
thought
maybe you were using an earlier version. Let me check that everything is intact, and
get back to you ASAP.
Thanks,
Dave
11:03 a.m.
Hi Oleg,
The v3 patchset has been queued for crash-7.1.6:
https://github.com/crash-utility/crash/commit/89ed9d0a7f7da4578294a492c1a...
I added some documentation in help.c for "crash -h", and in the crash.8 man
page.
Also, I changed ACTIVE() to LOCAL_ACTIVE() in the x86_64_calc_phys_base() function,
so phys_base will default to 0 instead of being based upon the host kernel's.
So the next stage should be support for creation of a permanent ELF vmcore from
one of these QEMU ramdumps with "crash -o". AFAICT, it should simply be a
matter
of adding this to ramdump_to_elf():
--- crash-7.1.5/ramdump.c.orig
+++ crash-7.1.5/ramdump.c
@@ -186,6 +186,8 @@ char *ramdump_to_elf(void)
e_machine = EM_AARCH64;
else if (machine_type("MIPS"))
e_machine = EM_MIPS;
+ else if (machine_type("X86_64"))
+ e_machine = EM_X86_64;
else
error(FATAL, "ramdump: unsupported machine type: %s\n",
MACHINE_TYPE);
Can you try that patch with an image? It would be best if it were with a crashed guest
image. If you want, I can do it, but I will need a pointer to a ramdump image that
I can work with.
Thanks,
Dave
----- Original Message -----
Hi Dave,
Based on your comments, please see the interdiff below.
Changes:
- s/LIVEDUMP/LIVE_RAMDUMP/
- redefine LOCAL_ACTIVE() using LIVE_RAMDUMP
- change pc->dumpfile to be the name of the first ramdump file
- remove the stale label in ramdump_to_elf()
Oleg.
---
diff --git a/defs.h b/defs.h
index d3a03c1..61497a5 100644
--- a/defs.h
+++ b/defs.h
@@ -212,7 +212,7 @@ struct number_option {
#define DEVMEM (0x2000000ULL)
#define REM_LIVE_SYSTEM (0x4000000ULL)
#define NAMELIST_LOCAL (0x8000000ULL)
-#define LIVEDUMP (0x10000000ULL)
+#define LIVE_RAMDUMP (0x10000000ULL)
#define NAMELIST_SAVED (0x20000000ULL)
#define DUMPFILE_SAVED (0x40000000ULL)
#define UNLINK_NAMELIST (0x80000000ULL)
@@ -251,11 +251,11 @@ struct number_option {
#define PROC_KCORE (0x8000000000000000ULL)
#define ACTIVE() (pc->flags & LIVE_SYSTEM)
-#define LOCAL_ACTIVE() ((pc->flags & LIVE_SYSTEM) && (pc->flags2
&
MEMSRC_LOCAL))
+#define LOCAL_ACTIVE() ((pc->flags & (LIVE_SYSTEM|LIVE_RAMDUMP)) ==
LIVE_SYSTEM)
#define DUMPFILE() (!(pc->flags & LIVE_SYSTEM))
#define LIVE() (pc->flags2 & LIVE_DUMP || pc->flags &
LIVE_SYSTEM)
-#define MEMORY_SOURCES
(NETDUMP|KDUMP|MCLXCD|LKCD|DEVMEM|S390D|MEMMOD|DISKDUMP|XENDUMP|CRASHBUILTIN|KVMDUMP|PROC_KCORE|SADUMP|VMWARE_VMSS|LIVEDUMP)
-#define DUMPFILE_TYPES
(DISKDUMP|NETDUMP|KDUMP|MCLXCD|LKCD|S390D|XENDUMP|KVMDUMP|SADUMP|VMWARE_VMSS|LIVEDUMP)
+#define MEMORY_SOURCES
(NETDUMP|KDUMP|MCLXCD|LKCD|DEVMEM|S390D|MEMMOD|DISKDUMP|XENDUMP|CRASHBUILTIN|KVMDUMP|PROC_KCORE|SADUMP|VMWARE_VMSS|LIVE_RAMDUMP)
+#define DUMPFILE_TYPES
(DISKDUMP|NETDUMP|KDUMP|MCLXCD|LKCD|S390D|XENDUMP|KVMDUMP|SADUMP|VMWARE_VMSS|LIVE_RAMDUMP)
#define REMOTE() (pc->flags2 & REMOTE_DAEMON)
#define REMOTE_ACTIVE() (pc->flags & REM_LIVE_SYSTEM)
#define REMOTE_DUMPFILE() \
diff --git a/filesys.c b/filesys.c
index 2779b2f..c291298 100644
--- a/filesys.c
+++ b/filesys.c
@@ -124,7 +124,6 @@ fd_init(void)
if (!pc->dumpfile) {
pc->flags |= LIVE_SYSTEM;
- pc->flags2 |= MEMSRC_LOCAL;
get_live_memory_source();
}
@@ -209,8 +208,7 @@ memory_source_init(void)
}
if (pc->dumpfile) {
- if (!(pc->flags & LIVEDUMP) &&
- !file_exists(pc->dumpfile, NULL))
+ if (!file_exists(pc->dumpfile, NULL))
error(FATAL, "%s: %s\n", pc->dumpfile,
strerror(ENOENT));
diff --git a/main.c b/main.c
index 0fbd10a..075a1e8 100644
--- a/main.c
+++ b/main.c
@@ -430,9 +430,7 @@ main(int argc, char **argv)
}
if (ACTIVE()) {
- pc->flags |= LIVEDUMP;
- /* disable get_live_memory_source() logic in fd_init() */
- pc->dumpfile = "livedump";
+ pc->flags |= LIVE_RAMDUMP;
pc->readmem = read_ramdump;
pc->writemem = NULL;
optind++;
diff --git a/memory.c b/memory.c
index 3339aa2..aa8be87 100644
--- a/memory.c
+++ b/memory.c
@@ -16463,7 +16463,7 @@ memory_page_size(void)
case CRASHBUILTIN:
case KVMDUMP:
case PROC_KCORE:
- case LIVEDUMP:
+ case LIVE_RAMDUMP:
psz = (uint)getpagesize();
break;
diff --git a/ramdump.c b/ramdump.c
index 12bfe05..941851c 100644
--- a/ramdump.c
+++ b/ramdump.c
@@ -227,7 +227,7 @@ char *ramdump_to_elf(void)
}
e_file = write_elf(load, e_head, data_offset);
-end:
+
free(e_head);
return e_file;
}
@@ -242,7 +242,7 @@ int is_ramdump(char *p)
size_t len;
char *pattern;
struct stat64 st;
- int is_live = 0;
+ int is_live;
int err = 0;
is_live = PREFIX(p, "live:");
@@ -283,9 +283,11 @@ int is_ramdump(char *p)
pat = NULL;
}
- if (nodes && is_live)
+ if (nodes && is_live) {
pc->flags |= LIVE_SYSTEM;
-
+ pc->dumpfile = ramdump[0].path;
+ pc->live_memsrc = pc->dumpfile;
+ }
return nodes;
}
11:53 a.m.
n 05/04, Dave Anderson wrote:
Hi Oleg,
The v3 patchset has been queued for crash-7.1.6:
https://github.com/crash-utility/crash/commit/89ed9d0a7f7da4578294a492c1a...
I added some documentation in help.c for "crash -h", and in the crash.8 man
page.
Also, I changed ACTIVE() to LOCAL_ACTIVE() in the x86_64_calc_phys_base() function,
so phys_base will default to 0 instead of being based upon the host kernel's.
Great, thanks!
So the next stage should be support for creation of a permanent ELF
vmcore from
one of these QEMU ramdumps with "crash -o". AFAICT, it should simply be a
matter
of adding this to ramdump_to_elf():
--- crash-7.1.5/ramdump.c.orig
+++ crash-7.1.5/ramdump.c
@@ -186,6 +186,8 @@ char *ramdump_to_elf(void)
e_machine = EM_AARCH64;
else if (machine_type("MIPS"))
e_machine = EM_MIPS;
+ else if (machine_type("X86_64"))
+ e_machine = EM_X86_64;
else
error(FATAL, "ramdump: unsupported machine type: %s\n",
MACHINE_TYPE);
Works for me ;)
Tested with and without the "-o" option.
$ ./crash ../VMLINUX /tmp/MEM@0
...
$ ./crash ../VMLINUX /tmp/MEM@0 -o /tmp/dump
...
$ ./crash ../VMLINUX /tmp/dump
everything seems to work.
It would be best if it were with a crashed guest
image.
yes, search-for-panicked-task works too.
but I will need a pointer to a ramdump image that
I can work with.
so everything seems to work, but if you want to play with my ramdump too you
can find the following files in http://people.redhat.com/onestero/for_dave/
VMLINUX # well, vmlinux ;)
MEM # RAM dump before panic
MEM_AFTER_CRASH # RAM dump after init (bash with pid==1) exits
Oleg.
1:40 p.m.
----- Original Message -----
n 05/04, Dave Anderson wrote:
>
> Hi Oleg,
>
> The v3 patchset has been queued for crash-7.1.6:
>
>
https://github.com/crash-utility/crash/commit/89ed9d0a7f7da4578294a492c1a...
>
> I added some documentation in help.c for "crash -h", and in the crash.8
man
> page.
> Also, I changed ACTIVE() to LOCAL_ACTIVE() in the x86_64_calc_phys_base()
> function,
> so phys_base will default to 0 instead of being based upon the host
> kernel's.
Great, thanks!
> So the next stage should be support for creation of a permanent ELF vmcore
> from
> one of these QEMU ramdumps with "crash -o". AFAICT, it should simply be
a
> matter
> of adding this to ramdump_to_elf():
>
> --- crash-7.1.5/ramdump.c.orig
> +++ crash-7.1.5/ramdump.c
> @@ -186,6 +186,8 @@ char *ramdump_to_elf(void)
> e_machine = EM_AARCH64;
> else if (machine_type("MIPS"))
> e_machine = EM_MIPS;
> + else if (machine_type("X86_64"))
> + e_machine = EM_X86_64;
> else
> error(FATAL, "ramdump: unsupported machine type: %s\n",
> MACHINE_TYPE);
Works for me ;)
Tested with and without the "-o" option.
$ ./crash ../VMLINUX /tmp/MEM@0
...
$ ./crash ../VMLINUX /tmp/MEM@0 -o /tmp/dump
...
$ ./crash ../VMLINUX /tmp/dump
everything seems to work.
> It would be best if it were with a crashed guest
> image.
yes, search-for-panicked-task works too.
> but I will need a pointer to a ramdump image that
> I can work with.
so everything seems to work, but if you want to play with my ramdump too you
can find the following files in http://people.redhat.com/onestero/for_dave/
VMLINUX # well, vmlinux ;)
MEM # RAM dump before panic
MEM_AFTER_CRASH # RAM dump after init (bash with pid==1) exits
Oleg.
Thanks Oleg -- I've got them...
And that patch is also queued for crash-7.1.6:
https://github.com/crash-utility/crash/commit/67a815b8749fbd5c99c29d24b4e...
Dave
3128
days inactive
3129
days old
devel@lists.crash-utility.osci.io
15 comments
2 participants
participants (2)
-
Dave Anderson -
Oleg Nesterov