dump: Set correct vaddr for ELF dump
PATCH v2 1/1 dump: Set correct vaddr for ELF dump
vaddr needs to be equal to the paddr since the dump file represents the physical memory image.
Without setting vaddr correctly, GDB would load all the different memory regions on top of each other to vaddr 0, thus making GDB showing the wrong memory data for a given address.
--- dump.c | 5 +++-- scripts/dump-guest-memory.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)
dump.c +3 -2
@@ -192,7 +192,7 @@ static void write_elf64_load(DumpState *s, MemoryMapping *memory_mapping, phdr.p_paddr =cpu_to_dump64 (s, memory_mapping->phys_addr); phdr.p_filesz =cpu_to_dump64 (s, filesz); phdr.p_memsz =cpu_to_dump64 (s, memory_mapping->length); - phdr.p_vaddr =cpu_to_dump64 (s, memory_mapping->virt_addr); + phdr.p_vaddr =cpu_to_dump64 (s, memory_mapping->virt_addr) ? : phdr.p_paddr;assert (memory_mapping->length >= filesz);
@@ -216,7 +216,8 @@ static void write_elf32_load(DumpState *s, MemoryMapping *memory_mapping, phdr.p_paddr =cpu_to_dump32 (s, memory_mapping->phys_addr); phdr.p_filesz =cpu_to_dump32 (s, filesz); phdr.p_memsz =cpu_to_dump32 (s, memory_mapping->length); - phdr.p_vaddr =cpu_to_dump32 (s, memory_mapping->virt_addr); + phdr.p_vaddr = +cpu_to_dump32 (s, memory_mapping->virt_addr) ? : phdr.p_paddr;assert (memory_mapping->length >= filesz);
scripts/dump-guest-memory.py +1 -0
@@ -163,6 +163,7 @@ class ELF(object): phdr = get_arch_phdr(self.endianness, self.elfclass) phdr.p_type = p_type phdr.p_paddr = p_paddr + phdr.p_vaddr = p_paddr phdr.p_filesz = p_size phdr.p_memsz = p_size self.segments.append(phdr)
Signature · 1 line
2.19.2
Quoted 9 lines · Jon Doron
vaddr needs to be equal to the paddr since the dump file represents the physical memory image.
Without setting vaddr correctly, GDB would load all the different memory regions on top of each other to vaddr 0, thus making GDB showing the wrong memory data for a given address.
Signed-off-by Jon Doron <[email protected]>
Not sure we are doing everything correctly, but solves the non-paging GDB case, so:
Quoted 43 lines
--- dump.c | 5 +++-- scripts/dump-guest-memory.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)dump.c +3
-2@@ -192,7 +192,7 @@ static void write_elf64_load(DumpState *s, MemoryMapping *memory_mapping, phdr.p_paddr =cpu_to_dump64 (s, memory_mapping->phys_addr); phdr.p_filesz =cpu_to_dump64 (s, filesz); phdr.p_memsz =cpu_to_dump64 (s, memory_mapping->length); - phdr.p_vaddr =cpu_to_dump64 (s, memory_mapping->virt_addr); + phdr.p_vaddr =cpu_to_dump64 (s, memory_mapping->virt_addr) ? : phdr.p_paddr;assert (memory_mapping->length >= filesz);@@ -216,7 +216,8 @@ static void write_elf32_load(DumpState *s, MemoryMapping *memory_mapping, phdr.p_paddr =cpu_to_dump32 (s, memory_mapping->phys_addr); phdr.p_filesz =cpu_to_dump32 (s, filesz); phdr.p_memsz =cpu_to_dump32 (s, memory_mapping->length); - phdr.p_vaddr =cpu_to_dump32 (s, memory_mapping->virt_addr); + phdr.p_vaddr = +cpu_to_dump32 (s, memory_mapping->virt_addr) ? : phdr.p_paddr;assert (memory_mapping->length >= filesz);scripts/dump-guest-memory.py +1
-1@@ -163,6 +163,7 @@ class ELF(object): phdr = get_arch_phdr(self.endianness, self.elfclass) phdr.p_type = p_type phdr.p_paddr = p_paddr + phdr.p_vaddr = p_paddr phdr.p_filesz = p_size phdr.p_memsz = p_size self.segments.append(phdr) --2.19.2
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Type: series
Subject: [Qemu-devel] [PATCH v2] dump: Set correct vaddr for ELF dump
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do
echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
failed=1
echo
fi
n=$((n+1))done
exit $failed
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
bbcb775 dump: Set correct vaddr for ELF dump
=== OUTPUT BEGIN ===
Checking PATCH 1/1: dump: Set correct vaddr for ELF dump...
ERROR: code indent should never use tabs
#40: FILE: dump.c:220:
+^I^Icpu_to_dump32(s, memory_mapping->virt_addr) ? : phdr.p_paddr;$
total: 1 errors, 0 warnings, 24 lines checked
Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Laszlo Ersek
Acked-byQuoted 9 lines · Marc-André Lureau
Quoted 8 lines · Jon Doron
vaddr needs to be equal to the paddr since the dump file represents the physical memory image.
Without setting vaddr correctly, GDB would load all the different memory regions on top of each other to vaddr 0, thus making GDB showing the wrong memory data for a given address.
Quoted 7 lines
Quoted 1 line
Signed-off-by Jon Doron <[email protected]>Not sure we are doing everything correctly, but solves the non-paging GDB case, so:
Tested-by Marc-André Lureau <[email protected]>Reviewed-by Marc-André Lureau <[email protected]>
Same thoughts here.
Thanks
Laszlo
Quoted 43 lines
Quoted 43 lines
--- dump.c | 5 +++-- scripts/dump-guest-memory.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-)dump.c +3
-2@@ -192,7 +192,7 @@ static void write_elf64_load(DumpState *s, MemoryMapping *memory_mapping, phdr.p_paddr =cpu_to_dump64 (s, memory_mapping->phys_addr); phdr.p_filesz =cpu_to_dump64 (s, filesz); phdr.p_memsz =cpu_to_dump64 (s, memory_mapping->length); - phdr.p_vaddr =cpu_to_dump64 (s, memory_mapping->virt_addr); + phdr.p_vaddr =cpu_to_dump64 (s, memory_mapping->virt_addr) ? : phdr.p_paddr;assert (memory_mapping->length >= filesz);@@ -216,7 +216,8 @@ static void write_elf32_load(DumpState *s, MemoryMapping *memory_mapping, phdr.p_paddr =cpu_to_dump32 (s, memory_mapping->phys_addr); phdr.p_filesz =cpu_to_dump32 (s, filesz); phdr.p_memsz =cpu_to_dump32 (s, memory_mapping->length); - phdr.p_vaddr =cpu_to_dump32 (s, memory_mapping->virt_addr); + phdr.p_vaddr = +cpu_to_dump32 (s, memory_mapping->virt_addr) ? : phdr.p_paddr;assert (memory_mapping->length >= filesz);scripts/dump-guest-memory.py +1
-1@@ -163,6 +163,7 @@ class ELF(object): phdr = get_arch_phdr(self.endianness, self.elfclass) phdr.p_type = p_type phdr.p_paddr = p_paddr + phdr.p_vaddr = p_paddr phdr.p_filesz = p_size phdr.p_memsz = p_size self.segments.append(phdr) --2.19.2