target-arm: support QMP dump-guest-memory
Add the support needed for creating prstatus elf notes. This allows us to use QMP dump-guest-memory. Signed-off-by: Andrew Jones <drjones@redhat.com> Message-id: 1452542185-10914-6-git-send-email-drjones@redhat.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> [PMM: moved setting of cpu::write_elf64_note inside !CONFIG_USER_ONLY ifdef to avoid compile failure for linux-user build] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
b6e05aa473
commit
da2b91409f
@ -1,5 +1,5 @@
|
||||
obj-y += arm-semi.o
|
||||
obj-$(CONFIG_SOFTMMU) += machine.o
|
||||
obj-$(CONFIG_SOFTMMU) += machine.o psci.o arch_dump.o
|
||||
obj-$(CONFIG_KVM) += kvm.o
|
||||
obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) += kvm32.o
|
||||
obj-$(call land,$(CONFIG_KVM),$(TARGET_AARCH64)) += kvm64.o
|
||||
@ -7,6 +7,5 @@ obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
|
||||
obj-y += translate.o op_helper.o helper.o cpu.o
|
||||
obj-y += neon_helper.o iwmmxt_helper.o
|
||||
obj-y += gdbstub.o
|
||||
obj-$(CONFIG_SOFTMMU) += psci.o
|
||||
obj-$(TARGET_AARCH64) += cpu64.o translate-a64.o helper-a64.o gdbstub64.o
|
||||
obj-y += crypto_helper.o
|
||||
|
230
target-arm/arch_dump.c
Normal file
230
target-arm/arch_dump.c
Normal file
@ -0,0 +1,230 @@
|
||||
/* Support for writing ELF notes for ARM architectures
|
||||
*
|
||||
* Copyright (C) 2015 Red Hat Inc.
|
||||
*
|
||||
* Author: Andrew Jones <drjones@redhat.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "cpu.h"
|
||||
#include "elf.h"
|
||||
#include "sysemu/dump.h"
|
||||
|
||||
/* struct user_pt_regs from arch/arm64/include/uapi/asm/ptrace.h */
|
||||
struct aarch64_user_regs {
|
||||
uint64_t regs[31];
|
||||
uint64_t sp;
|
||||
uint64_t pc;
|
||||
uint64_t pstate;
|
||||
} QEMU_PACKED;
|
||||
|
||||
QEMU_BUILD_BUG_ON(sizeof(struct aarch64_user_regs) != 272);
|
||||
|
||||
/* struct elf_prstatus from include/uapi/linux/elfcore.h */
|
||||
struct aarch64_elf_prstatus {
|
||||
char pad1[32]; /* 32 == offsetof(struct elf_prstatus, pr_pid) */
|
||||
uint32_t pr_pid;
|
||||
char pad2[76]; /* 76 == offsetof(struct elf_prstatus, pr_reg) -
|
||||
offsetof(struct elf_prstatus, pr_ppid) */
|
||||
struct aarch64_user_regs pr_reg;
|
||||
uint32_t pr_fpvalid;
|
||||
char pad3[4];
|
||||
} QEMU_PACKED;
|
||||
|
||||
QEMU_BUILD_BUG_ON(sizeof(struct aarch64_elf_prstatus) != 392);
|
||||
|
||||
struct aarch64_note {
|
||||
Elf64_Nhdr hdr;
|
||||
char name[8]; /* align_up(sizeof("CORE"), 4) */
|
||||
struct aarch64_elf_prstatus prstatus;
|
||||
} QEMU_PACKED;
|
||||
|
||||
QEMU_BUILD_BUG_ON(sizeof(struct aarch64_note) != 412);
|
||||
|
||||
static void aarch64_note_init(struct aarch64_note *note, DumpState *s,
|
||||
const char *name, Elf64_Word namesz,
|
||||
Elf64_Word type, Elf64_Word descsz)
|
||||
{
|
||||
memset(note, 0, sizeof(*note));
|
||||
|
||||
note->hdr.n_namesz = cpu_to_dump32(s, namesz);
|
||||
note->hdr.n_descsz = cpu_to_dump32(s, descsz);
|
||||
note->hdr.n_type = cpu_to_dump32(s, type);
|
||||
|
||||
memcpy(note->name, name, namesz);
|
||||
}
|
||||
|
||||
int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
|
||||
int cpuid, void *opaque)
|
||||
{
|
||||
struct aarch64_note note;
|
||||
CPUARMState *env = &ARM_CPU(cs)->env;
|
||||
DumpState *s = opaque;
|
||||
uint64_t pstate, sp;
|
||||
int ret, i;
|
||||
|
||||
aarch64_note_init(¬e, s, "CORE", 5, NT_PRSTATUS, sizeof(note.prstatus));
|
||||
|
||||
note.prstatus.pr_pid = cpu_to_dump32(s, cpuid);
|
||||
|
||||
if (!is_a64(env)) {
|
||||
aarch64_sync_32_to_64(env);
|
||||
pstate = cpsr_read(env);
|
||||
sp = 0;
|
||||
} else {
|
||||
pstate = pstate_read(env);
|
||||
sp = env->xregs[31];
|
||||
}
|
||||
|
||||
for (i = 0; i < 31; ++i) {
|
||||
note.prstatus.pr_reg.regs[i] = cpu_to_dump64(s, env->xregs[i]);
|
||||
}
|
||||
note.prstatus.pr_reg.sp = cpu_to_dump64(s, sp);
|
||||
note.prstatus.pr_reg.pc = cpu_to_dump64(s, env->pc);
|
||||
note.prstatus.pr_reg.pstate = cpu_to_dump64(s, pstate);
|
||||
|
||||
ret = f(¬e, sizeof(note), s);
|
||||
if (ret < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* struct pt_regs from arch/arm/include/asm/ptrace.h */
|
||||
struct arm_user_regs {
|
||||
uint32_t regs[17];
|
||||
char pad[4];
|
||||
} QEMU_PACKED;
|
||||
|
||||
QEMU_BUILD_BUG_ON(sizeof(struct arm_user_regs) != 72);
|
||||
|
||||
/* struct elf_prstatus from include/uapi/linux/elfcore.h */
|
||||
struct arm_elf_prstatus {
|
||||
char pad1[24]; /* 24 == offsetof(struct elf_prstatus, pr_pid) */
|
||||
uint32_t pr_pid;
|
||||
char pad2[44]; /* 44 == offsetof(struct elf_prstatus, pr_reg) -
|
||||
offsetof(struct elf_prstatus, pr_ppid) */
|
||||
struct arm_user_regs pr_reg;
|
||||
uint32_t pr_fpvalid;
|
||||
} QEMU_PACKED arm_elf_prstatus;
|
||||
|
||||
QEMU_BUILD_BUG_ON(sizeof(struct arm_elf_prstatus) != 148);
|
||||
|
||||
struct arm_note {
|
||||
Elf32_Nhdr hdr;
|
||||
char name[8]; /* align_up(sizeof("CORE"), 4) */
|
||||
struct arm_elf_prstatus prstatus;
|
||||
} QEMU_PACKED;
|
||||
|
||||
QEMU_BUILD_BUG_ON(sizeof(struct arm_note) != 168);
|
||||
|
||||
static void arm_note_init(struct arm_note *note, DumpState *s,
|
||||
const char *name, Elf32_Word namesz,
|
||||
Elf32_Word type, Elf32_Word descsz)
|
||||
{
|
||||
memset(note, 0, sizeof(*note));
|
||||
|
||||
note->hdr.n_namesz = cpu_to_dump32(s, namesz);
|
||||
note->hdr.n_descsz = cpu_to_dump32(s, descsz);
|
||||
note->hdr.n_type = cpu_to_dump32(s, type);
|
||||
|
||||
memcpy(note->name, name, namesz);
|
||||
}
|
||||
|
||||
int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
|
||||
int cpuid, void *opaque)
|
||||
{
|
||||
struct arm_note note;
|
||||
CPUARMState *env = &ARM_CPU(cs)->env;
|
||||
DumpState *s = opaque;
|
||||
int ret, i;
|
||||
|
||||
arm_note_init(¬e, s, "CORE", 5, NT_PRSTATUS, sizeof(note.prstatus));
|
||||
|
||||
note.prstatus.pr_pid = cpu_to_dump32(s, cpuid);
|
||||
|
||||
for (i = 0; i < 16; ++i) {
|
||||
note.prstatus.pr_reg.regs[i] = cpu_to_dump32(s, env->regs[i]);
|
||||
}
|
||||
note.prstatus.pr_reg.regs[16] = cpu_to_dump32(s, cpsr_read(env));
|
||||
|
||||
ret = f(¬e, sizeof(note), s);
|
||||
if (ret < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int cpu_get_dump_info(ArchDumpInfo *info,
|
||||
const GuestPhysBlockList *guest_phys_blocks)
|
||||
{
|
||||
ARMCPU *cpu = ARM_CPU(first_cpu);
|
||||
CPUARMState *env = &cpu->env;
|
||||
GuestPhysBlock *block;
|
||||
hwaddr lowest_addr = ULLONG_MAX;
|
||||
|
||||
/* Take a best guess at the phys_base. If we get it wrong then crash
|
||||
* will need '--machdep phys_offset=<phys-offset>' added to its command
|
||||
* line, which isn't any worse than assuming we can use zero, but being
|
||||
* wrong. This is the same algorithm the crash utility uses when
|
||||
* attempting to guess as it loads non-dumpfile formatted files.
|
||||
*/
|
||||
QTAILQ_FOREACH(block, &guest_phys_blocks->head, next) {
|
||||
if (block->target_start < lowest_addr) {
|
||||
lowest_addr = block->target_start;
|
||||
}
|
||||
}
|
||||
|
||||
if (arm_feature(env, ARM_FEATURE_AARCH64)) {
|
||||
info->d_machine = EM_AARCH64;
|
||||
info->d_class = ELFCLASS64;
|
||||
info->page_size = (1 << 16); /* aarch64 max pagesize */
|
||||
if (lowest_addr != ULLONG_MAX) {
|
||||
info->phys_base = lowest_addr;
|
||||
}
|
||||
} else {
|
||||
info->d_machine = EM_ARM;
|
||||
info->d_class = ELFCLASS32;
|
||||
info->page_size = (1 << 12);
|
||||
if (lowest_addr < UINT_MAX) {
|
||||
info->phys_base = lowest_addr;
|
||||
}
|
||||
}
|
||||
|
||||
/* We assume the relevant endianness is that of EL1; this is right
|
||||
* for kernels, but might give the wrong answer if you're trying to
|
||||
* dump a hypervisor that happens to be running an opposite-endian
|
||||
* kernel.
|
||||
*/
|
||||
info->d_endian = (env->cp15.sctlr_el[1] & SCTLR_EE) != 0
|
||||
? ELFDATA2MSB : ELFDATA2LSB;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
ssize_t cpu_get_note_size(int class, int machine, int nr_cpus)
|
||||
{
|
||||
size_t note_size;
|
||||
|
||||
if (class == ELFCLASS64) {
|
||||
note_size = sizeof(struct aarch64_note);
|
||||
} else {
|
||||
note_size = sizeof(struct arm_note);
|
||||
}
|
||||
|
||||
return note_size * nr_cpus;
|
||||
}
|
@ -221,6 +221,11 @@ hwaddr arm_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
|
||||
int arm_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
|
||||
int arm_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
|
||||
|
||||
int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
|
||||
int cpuid, void *opaque);
|
||||
int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
|
||||
int cpuid, void *opaque);
|
||||
|
||||
/* Callback functions for the generic timer's timers. */
|
||||
void arm_gt_ptimer_cb(void *opaque);
|
||||
void arm_gt_vtimer_cb(void *opaque);
|
||||
|
@ -1421,6 +1421,8 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
|
||||
cc->get_phys_page_debug = arm_cpu_get_phys_page_debug;
|
||||
cc->vmsd = &vmstate_arm_cpu;
|
||||
cc->virtio_is_big_endian = arm_cpu_is_big_endian;
|
||||
cc->write_elf64_note = arm_cpu_write_elf64_note;
|
||||
cc->write_elf32_note = arm_cpu_write_elf32_note;
|
||||
#endif
|
||||
cc->gdb_num_core_regs = 26;
|
||||
cc->gdb_core_xml_file = "arm-core.xml";
|
||||
|
Loading…
Reference in New Issue
Block a user