Skip to contentSkip to conversation

extract vmcoreinfo from /proc/vmcore for Xen

PATCH In review Itsuro ODA 2 participants 3 messages Mar 31, 2008

Subsystems (2)
lore
Share & tools
lore

Itsuro ODA

author
#0 lore raw

PATCH 1/4 extract vmcoreinfo from /proc/vmcore for Xen

This patch is for xen-3.2.0.

kexec.c renamed from kexec.c.org +67 -0
@@ -43,6 +43,9 @@
 
 static spinlock_t kexec_lock = SPIN_LOCK_UNLOCKED;
 
+static unsigned char vmcoreinfo_data[VMCOREINFO_BYTES];
+static size_t vmcoreinfo_size = 0;
+
 xen_kexec_reserve_t kexec_crash_area;
 
 static void __init parse_crashkernel(const char *str)
@@ -223,6 +226,13 @@
     return 0;
 }
 
+static int kexec_get(vmcoreinfo)(xen_kexec_range_t *range)
+{
+    range->start = __pa((unsigned long)vmcoreinfo_data);
+    range->size = VMCOREINFO_BYTES;
+    return 0;
+}
+
 static int kexec_get(range)(XEN_GUEST_HANDLE(void) uarg)
 {
     xen_kexec_range_t range;
@@ -242,6 +252,9 @@
     case KEXEC_RANGE_MA_CPU:
         ret = kexec_get(cpu)(&range);
         break;
+    case KEXEC_RANGE_MA_VMCOREINFO:
+        ret = kexec_get(vmcoreinfo)(&range);
+        break;
     }
 
     if ( ret == 0 && unlikely(copy_to_guest(uarg, &range, 1)) )
@@ -270,6 +283,57 @@
     return 0;
 }
 
+void vmcoreinfo_append_str(const char *fmt, ...)
+{
+    va_list args;
+    char buf[0x50];
+    int r;
+    size_t note_size = sizeof(Elf_Note) + ELFNOTE_ALIGN(strlen(VMCOREINFO_NOTE_NAME) + 1);
+
+    va_start(args, fmt);
+    r = vsnprintf(buf, sizeof(buf), fmt, args);
+    va_end(args);
+
+    if (r + vmcoreinfo_size + note_size > VMCOREINFO_BYTES)
+	r = VMCOREINFO_BYTES - vmcoreinfo_size - note_size;
+
+    memcpy(&vmcoreinfo_data[note_size + vmcoreinfo_size], buf, r);
+
+    vmcoreinfo_size += r;
+}
+
+static void crash_save_vmcoreinfo(void)
+{
+    size_t data_size;
+
+    if (vmcoreinfo_size > 0)	/* already saved */
+	return;
+
+    data_size = VMCOREINFO_BYTES - (sizeof(Elf_Note) + ELFNOTE_ALIGN(strlen(VMCOREINFO_NOTE_NAME) + 1));
+    setup_note((Elf_Note *)vmcoreinfo_data, VMCOREINFO_NOTE_NAME, 0, data_size);
+
+    VMCOREINFO_PAGESIZE(PAGE_SIZE);
+
+    VMCOREINFO_SYMBOL(domain_list);
+    VMCOREINFO_SYMBOL(frame_table);
+    VMCOREINFO_SYMBOL(alloc_bitmap);
+    VMCOREINFO_SYMBOL(max_page);
+    VMCOREINFO_SYMBOL(xenheap_phys_start);
+    VMCOREINFO_SYMBOL(xenheap_phys_end);
+
+    VMCOREINFO_STRUCT_SIZE(page_info);
+    VMCOREINFO_STRUCT_SIZE(domain);
+
+    VMCOREINFO_OFFSET(page_info, count_info);
+    VMCOREINFO_OFFSET_ALIAS(page_info, u, _domain);
+    VMCOREINFO_OFFSET(domain, domain_id);
+    VMCOREINFO_OFFSET(domain, next_in_list);
+
+#ifdef ARCH_CRASH_SAVE_VMCOREINFO
+    arch_crash_save_vmcoreinfo();
+#endif
+}
+
 #endif
 
 static int kexec_load_unload(unsigned long op, XEN_GUEST_HANDLE(void) uarg)
@@ -308,6 +372,9 @@
             /* Make new image the active one */
             change_bit(bit, &kexec_flags);
         }
+#ifndef COMPAT
+        crash_save_vmcoreinfo();
+#endif
     }
 
     /* Unload the old image if present and load successful */
public/kexec.h renamed from public/kexec.h.org +32 -0
@@ -111,6 +111,7 @@
 #define KEXEC_RANGE_MA_CRASH 0   /* machine address and size of crash area */
 #define KEXEC_RANGE_MA_XEN   1   /* machine address and size of Xen itself */
 #define KEXEC_RANGE_MA_CPU   2   /* machine address and size of a CPU note */
+#define KEXEC_RANGE_MA_VMCOREINFO   3   /* machine address and size of vmcoreinfo */
 
 /*
  * Find the address and size of certain memory areas
@@ -127,6 +128,37 @@
     unsigned long start;
 } xen_kexec_range_t;
 
+/* vmcoreinfo stuff */
+#define VMCOREINFO_BYTES           (4096)
+#define VMCOREINFO_NOTE_NAME       "VMCOREINFO_XEN"
+void arch_crash_save_vmcoreinfo(void);
+void vmcoreinfo_append_str(const char *fmt, ...)
+       __attribute__ ((format (printf, 1, 2)));
+#define VMCOREINFO_OSRELEASE(name) \
+       vmcoreinfo_append_str("OSRELEASE=%s\n", #name)
+#define VMCOREINFO_PAGESIZE(value) \
+       vmcoreinfo_append_str("PAGESIZE=%ld\n", value)
+#define VMCOREINFO_SYMBOL(name) \
+       vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name)
+#define VMCOREINFO_SYMBOL_ALIAS(alias, name) \
+       vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #alias, (unsigned long)&name)
+#define VMCOREINFO_SIZE(name) \
+       vmcoreinfo_append_str("SIZE(%s)=%zu\n", #name, sizeof(name))
+#define VMCOREINFO_STRUCT_SIZE(name) \
+       vmcoreinfo_append_str("SIZE(%s)=%zu\n", #name, sizeof(struct name))
+#define VMCOREINFO_OFFSET(name, field) \
+       vmcoreinfo_append_str("OFFSET(%s.%s)=%zu\n", #name, #field, \
+                             offsetof(struct name, field))
+#define VMCOREINFO_OFFSET_ALIAS(name, field, alias) \
+       vmcoreinfo_append_str("OFFSET(%s.%s)=%zu\n", #name, #alias, \
+                             offsetof(struct name, field))
+#define VMCOREINFO_LENGTH(name, value) \
+       vmcoreinfo_append_str("LENGTH(%s)=%lu\n", #name, (unsigned long)value)
+#define VMCOREINFO_NUMBER(name) \
+       vmcoreinfo_append_str("NUMBER(%s)=%ld\n", #name, (long)name)
+#define VMCOREINFO_CONFIG(name) \
+       vmcoreinfo_append_str("CONFIG_%s=y\n", #name)
+
 #endif /* _XEN_PUBLIC_KEXEC_H */
 
 /*
page_alloc.c renamed from page_alloc.c.org +1 -1
@@ -101,7 +101,7 @@
  *  One bit per page of memory. Bit set => page is allocated.
  */
 
-static unsigned long *alloc_bitmap;
+unsigned long *alloc_bitmap;
 #define PAGES_PER_MAPWORD (sizeof(unsigned long) * 8)
 
 #define allocated_in_map(_pn)                       \
x86/machine_kexec.c renamed from x86/machine_kexec.c.org +13 -0
@@ -135,6 +135,19 @@
     }
 }
 
+void arch_crash_save_vmcoreinfo(void)
+{
+	VMCOREINFO_SYMBOL(dom_xen);
+	VMCOREINFO_SYMBOL(dom_io);
+
+#ifdef CONFIG_X86_PAE
+	VMCOREINFO_SYMBOL_ALIAS(pgd_l3, idle_pg_table);
+#endif
+#ifdef CONFIG_X86_64
+	VMCOREINFO_SYMBOL_ALIAS(pgd_l4, idle_pg_table);
+#endif
+}
+
 /*
  * Local variables:
  * mode: C
x86/mm.c renamed from x86/mm.c.org +1 -1
@@ -142,7 +142,7 @@
 #define FOREIGNDOM (this_cpu(percpu_mm_info).foreign ?: current->domain)
 
 /* Private domain structs for DOMID_XEN and DOMID_IO. */
-static struct domain *dom_xen, *dom_io;
+struct domain *dom_xen, *dom_io;
 
 /* Frame table and its size in pages. */
 struct page_info *frame_table;
ia64/xen/machine_kexec.c renamed from ia64/xen/machine_kexec.c.org +9 -0
@@ -165,6 +165,15 @@
 	machine_kexec(image);
 }
 
+void arch_crash_save_vmcoreinfo(void)
+{
+	VMCOREINFO_SYMBOL(dom_xen);
+	VMCOREINFO_SYMBOL(dom_io);
+	VMCOREINFO_SYMBOL(xen_pstart);
+	VMCOREINFO_SYMBOL(frametable_pg_dir);
+	VMCOREINFO_SYMBOL_ALIAS(xen_heap_start, xen_pickle_offset);
+}
+
 /*
  * Local variables:
  * mode: C
ia64/xen/mm.c renamed from ia64/xen/mm.c.org +1 -1
@@ -189,7 +189,7 @@
 
 extern unsigned long ia64_iobase;
 
-static struct domain *dom_xen, *dom_io;
+struct domain *dom_xen, *dom_io;
 
 /*
  * This number is bigger than DOMID_SELF, DOMID_XEN and DOMID_IO.
xen/mm.h renamed from xen/mm.h.org +1 -0
@@ -105,4 +105,5 @@
 /* Returns TRUE if the memory at address @p is ordinary RAM. */
 int memory_is_conventional_ram(paddr_t p);
 
+extern unsigned long *alloc_bitmap;
 #endif /* __XEN_MM_H__ */
asm-x86/mm.h renamed from asm-x86/mm.h.org +1 -0
@@ -356,4 +356,5 @@
 
 unsigned long domain_get_maximum_gpfn(struct domain *d);
 
+extern struct domain *dom_xen, *dom_io;
 #endif /* __ASM_X86_MM_H__ */
asm-ia64/mm.h renamed from asm-ia64/mm.h.org +1 -0
@@ -523,4 +523,5 @@
 
 unsigned long domain_get_maximum_gpfn(struct domain *d);
 
+extern struct domain *dom_xen, *dom_io;
 #endif /* __ASM_IA64_MM_H__ */
asm-x86/config.h renamed from asm-x86/config.h.org +2 -0
@@ -388,4 +388,6 @@
 #define ELFSIZE 32
 #endif
 
+#define ARCH_CRASH_SAVE_VMCOREINFO
+
 #endif /* __X86_CONFIG_H__ */
asm-ia64/config.h renamed from asm-ia64/config.h.org +2 -0
@@ -287,4 +287,6 @@
 /* Define CONFIG_PRIVIFY to support privified OS (deprecated).  */
 #undef CONFIG_PRIVIFY
 
+#define ARCH_CRASH_SAVE_VMCOREINFO
+
 #endif	/* _IA64_CONFIG_H_ */
xen/elfcore.h renamed from xen/elfcore.h.org +1 -0
@@ -66,6 +66,7 @@
     unsigned long xen_compile_time;
     unsigned long tainted;
 #if defined(__i386__) || defined(__x86_64__)
+    unsigned long xen_phys_start_mfn;
     unsigned long dom0_pfn_to_mfn_frame_list_list;
 #endif
 #if defined(__ia64__)
x86/crash.c renamed from x86/crash.c.org +1 -0
@@ -102,6 +102,7 @@
     hvm_cpu_down();
 
     info = kexec_crash_save_info();
+    info->xen_phys_start_mfn = xen_phys_start >> PAGE_SHIFT;
     info->dom0_pfn_to_mfn_frame_list_list =
         arch_get_pfn_to_mfn_frame_list_list(dom0);
 }
Signature · 1 line
Itsuro ODA <[email protected]>
#1 lore raw
Quoted 5 lines · Itsuro ODA

This patch is for xen-3.2.0.

kexec.c renamed from kexec.c.org +0 -0
@@ -43,6 +43,9 @@

[snip]

Quoted 8 lines
kexec.c renamed from kexec.c.org +8 -0
+void vmcoreinfo_append_str(const char *fmt, ...)
+{
+    va_list args;
+    char buf[0x50];
+    int r;
+    size_t note_size = sizeof(Elf_Note) + ELFNOTE_ALIGN(strlen(VMCOREINFO_NOTE_NAME) + 1);
+
+    va_start(args, fmt);

kexec.c line 303

Quoted 10 lines
kexec.c renamed from kexec.c.org +10 -0
+    r = vsnprintf(buf, sizeof(buf), fmt, args);
+    va_end(args);
+
+    if (r + vmcoreinfo_size + note_size > VMCOREINFO_BYTES)
+	r = VMCOREINFO_BYTES - vmcoreinfo_size - note_size;
+
+    memcpy(&vmcoreinfo_data[note_size + vmcoreinfo_size], buf, r);
+
+    vmcoreinfo_size += r;
+}

Hi Oda-san,

It looks like it is possible for both vsnprintf() and the "if (r + vmcoreinfo_size + note_size > VMCOREINFO_BYTES)" logic to truncate a feild. Is this likely to be a problem in practice, or is the code just guarding against malformed input?

Also, this code looks like it will be need to up-ported due to changes that I recently made to common/kexec.c and the range fetching portion of the hypercall in unstable. This shouldn't be a big deal, just something that is worth mentioning.

Signature · 1 line
Horms
author
#2 lore raw

Hi,

Quoted 30 lines · On Mon, 31 Mar 2008 14:28:26 +0900 Simon Horman <[email protected]> wrote:
Quoted 5 lines · Itsuro ODA

This patch is for xen-3.2.0.

kexec.c renamed from kexec.c.org +0 -0
@@ -43,6 +43,9 @@

[snip]

Quoted 8 lines
kexec.c renamed from kexec.c.org +8 -0
+void vmcoreinfo_append_str(const char *fmt, ...)
+{
+    va_list args;
+    char buf[0x50];
+    int r;
+    size_t note_size = sizeof(Elf_Note) + ELFNOTE_ALIGN(strlen(VMCOREINFO_NOTE_NAME) + 1);
+
+    va_start(args, fmt);

kexec.c line 303

Quoted 10 lines
kexec.c renamed from kexec.c.org +10 -0
+    r = vsnprintf(buf, sizeof(buf), fmt, args);
+    va_end(args);
+
+    if (r + vmcoreinfo_size + note_size > VMCOREINFO_BYTES)
+	r = VMCOREINFO_BYTES - vmcoreinfo_size - note_size;
+
+    memcpy(&vmcoreinfo_data[note_size + vmcoreinfo_size], buf, r);
+
+    vmcoreinfo_size += r;
+}

Hi Oda-san,

Quoted 4 lines

It looks like it is possible for both vsnprintf() and the "if (r + vmcoreinfo_size + note_size > VMCOREINFO_BYTES)" logic to truncate a feild. Is this likely to be a problem in practice, or is the code just guarding against malformed input?

just guarding against malformed input.

Quoted 4 lines

Also, this code looks like it will be need to up-ported due to changes that I recently made to common/kexec.c and the range fetching portion of the hypercall in unstable. This shouldn't be a big deal, just something that is worth mentioning.

I see.

Thanks.

Signature · 1 line
Itsuro ODA <[email protected]>