[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 7/8] scripts/dump-guest-memory.py: add vmcoreinfo
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v5 7/8] scripts/dump-guest-memory.py: add vmcoreinfo |
Date: |
Mon, 7 Aug 2017 20:16:17 +0200 |
Add vmcoreinfo ELF note if fw-cfg has the memory location details.
Signed-off-by: Marc-André Lureau <address@hidden>
---
scripts/dump-guest-memory.py | 51 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py
index f7c6635f15..1f97373f0d 100644
--- a/scripts/dump-guest-memory.py
+++ b/scripts/dump-guest-memory.py
@@ -14,6 +14,7 @@ the COPYING file in the top-level directory.
"""
import ctypes
+import struct
UINTPTR_T = gdb.lookup_type("uintptr_t")
@@ -45,6 +46,12 @@ EM_S390 = 22
EM_AARCH = 183
EM_X86_64 = 62
+def le32_to_cpu(val):
+ return struct.unpack("<I", struct.pack("=I", val))[0]
+
+def le64_to_cpu(val):
+ return struct.unpack("<Q", struct.pack("=Q", val))[0]
+
class ELF(object):
"""Representation of a ELF file."""
@@ -120,6 +127,25 @@ class ELF(object):
self.segments[0].p_filesz += ctypes.sizeof(note)
self.segments[0].p_memsz += ctypes.sizeof(note)
+
+ def add_vmcoreinfo_note(self, vmcoreinfo):
+ """Adds a vmcoreinfo note to the ELF dump."""
+ # compute the header size, and copy that many bytes from the note
+ header = get_arch_note(self.endianness, 0, 0)
+ ctypes.memmove(ctypes.pointer(header),
+ vmcoreinfo, ctypes.sizeof(header))
+ if header.n_descsz > 1 << 20:
+ print('warning: invalid vmcoreinfo size')
+ return
+ # now get the full note
+ note = get_arch_note(self.endianness,
+ header.n_namesz - 1, header.n_descsz)
+ ctypes.memmove(ctypes.pointer(note), vmcoreinfo, ctypes.sizeof(note))
+
+ self.notes.append(note)
+ self.segments[0].p_filesz += ctypes.sizeof(note)
+ self.segments[0].p_memsz += ctypes.sizeof(note)
+
def add_segment(self, p_type, p_paddr, p_size):
"""Adds a segment to the elf."""
@@ -505,6 +531,30 @@ shape and this command should mostly work."""
cur += chunk_size
left -= chunk_size
+ def phys_memory_read(self, addr, size):
+ qemu_core = gdb.inferiors()[0]
+ for block in self.guest_phys_blocks:
+ if block["target_start"] <= addr \
+ and addr + size <= block["target_end"]:
+ haddr = block["host_addr"] + (addr - block["target_start"])
+ return qemu_core.read_memory(haddr, size)
+ return None
+
+ def add_vmcoreinfo(self):
+ if not gdb.parse_and_eval("fw_cfg_find()") \
+ or not gdb.parse_and_eval("fw_cfg_find()->have_vmcoreinfo"):
+ return
+
+ addr = gdb.parse_and_eval("fw_cfg_find()->vmcoreinfo.paddr")
+ size = gdb.parse_and_eval("fw_cfg_find()->vmcoreinfo.size")
+
+ addr = le64_to_cpu(addr)
+ size = le32_to_cpu(size)
+
+ vmcoreinfo = self.phys_memory_read(addr, size)
+ if vmcoreinfo:
+ self.elf.add_vmcoreinfo_note(vmcoreinfo.tobytes())
+
def invoke(self, args, from_tty):
"""Handles command invocation from gdb."""
@@ -518,6 +568,7 @@ shape and this command should mostly work."""
self.elf = ELF(argv[1])
self.guest_phys_blocks = get_guest_phys_blocks()
+ self.add_vmcoreinfo()
with open(argv[0], "wb") as vmcore:
self.dump_init(vmcore)
--
2.14.0.1.geff633fa0
- [Qemu-devel] [PATCH v5 0/8] KASLR kernel dump support, Marc-André Lureau, 2017/08/07
- [Qemu-devel] [PATCH v5 1/8] fw_cfg: rename read callback, Marc-André Lureau, 2017/08/07
- [Qemu-devel] [PATCH v5 2/8] fw_cfg: add write callback, Marc-André Lureau, 2017/08/07
- [Qemu-devel] [PATCH v5 3/8] fw_cfg: add vmcoreinfo file, Marc-André Lureau, 2017/08/07
- [Qemu-devel] [PATCH v5 4/8] dump: add guest ELF note, Marc-André Lureau, 2017/08/07
- [Qemu-devel] [PATCH v5 5/8] dump: update phys_base header field based on VMCOREINFO content, Marc-André Lureau, 2017/08/07
- [Qemu-devel] [PATCH v5 6/8] kdump: set vmcoreinfo location, Marc-André Lureau, 2017/08/07
- [Qemu-devel] [PATCH v5 7/8] scripts/dump-guest-memory.py: add vmcoreinfo,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v5 8/8] MAINTAINERS: add Dump maintainers, Marc-André Lureau, 2017/08/07
- Re: [Qemu-devel] [PATCH v5 0/8] KASLR kernel dump support, Michael S. Tsirkin, 2017/08/16