Guest debugging support for KVM
PATCH 1/1 Guest debugging support for KVM
[ Also available via git://git.kiszka.org/qemu.git queue/gdb ]
This is a backport of the guest debugging support for the KVM accelerator that is now part of the KVM tree. It implements the reworked KVM kernel API for guest debugging (KVM_CAP_SET_GUEST_DEBUG) which is not yet part of any mainline kernel but will probably be 2.6.30 stuff. So far supported is x86, but PPC is expected to catch up soon.
Core features are:
- unlimited soft-breakpoints via code patching
- hardware-assisted x86 breakpoints and watchpoints
Open issues: Writing soft breakpoints to BIOS code. cpu_memory_rw_debug does not work here. Suggestion to fix this cleanly are welcome.
---
configure | 4 + exec.c | 10 ++- gdbstub.c | 29 +++++++-- gdbstub.h | 7 ++ kvm-all.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++ kvm.h | 41 +++++++++++++ target-i386/kvm.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 423 insertions(+), 12 deletions(-)
configure +2 -2
@@ -479,11 +479,11 @@ case "$cpu" in ARCH_CFLAGS="-march=z900" ;; i386) - ARCH_CFLAGS="-m32" + ARCH_CFLAGS="-m32 -DCONFIG_X86" ARCH_LDFLAGS="-m32" ;; x86_64) - ARCH_CFLAGS="-m64" + ARCH_CFLAGS="-m64 -DCONFIG_X86" ARCH_LDFLAGS="-m64" ;; esac
exec.c +7 -3
@@ -1458,9 +1458,13 @@ void cpu_single_step(CPUState *env, int enabled)#if defined(TARGET_HAS_ICE )if (env->singlestep_enabled != enabled) { env->singlestep_enabled = enabled; -/* must flush all the translated code to avoid inconsistancies */ -/* XXX: only flush what is necessary */ -tb_flush (env); +if (kvm_enabled ()) +kvm_update_guest_debug (env,0 ); +else { +/* must flush all the translated code to avoid inconsistancies */ +/* XXX: only flush what is necessary */ +tb_flush (env); + } }#endif }
gdbstub.c +22 -7
@@ -38,6 +38,7 @@#define MAX_PACKET_LENGTH 4096#include "qemu_socket.h" +#include "kvm.h" enum {
@@ -1389,13 +1390,6 @@ void gdb_register_coprocessor(CPUState * env, } } -/* GDB breakpoint/watchpoint types */ -#define GDB_BREAKPOINT_SW 0 -#define GDB_BREAKPOINT_HW 1 -#define GDB_WATCHPOINT_WRITE 2 -#define GDB_WATCHPOINT_READ 3 -#define GDB_WATCHPOINT_ACCESS 4 -#ifndef CONFIG_USER_ONLY static const int xlat_gdb_type[] = { [GDB_WATCHPOINT_WRITE] = BP_GDB | BP_MEM_WRITE,
@@ -1409,6 +1403,9 @@ static int gdb_breakpoint_insert(target_ulong addr, target_ulong len, int type)CPUState *env;int err =0 ; +if (kvm_enabled ()) +return kvm_insert_breakpoint (gdbserver_state->c_cpu, addr, len, type); +switch (type) {case GDB_BREAKPOINT_SW :case GDB_BREAKPOINT_HW :
@@ -1440,6 +1437,9 @@ static int gdb_breakpoint_remove(target_ulong addr, target_ulong len, int type)CPUState *env;int err =0 ; +if (kvm_enabled ()) +return kvm_remove_breakpoint (gdbserver_state->c_cpu, addr, len, type); +switch (type) {case GDB_BREAKPOINT_SW :case GDB_BREAKPOINT_HW :
@@ -1469,6 +1469,11 @@ static void gdb_breakpoint_remove_all(void) {CPUState *env; +if (kvm_enabled ()) { +kvm_remove_all_breakpoints (gdbserver_state->c_cpu); +return ; + } +for (env = first_cpu; env !=NULL ; env = env->next_cpu) {cpu_breakpoint_remove_all (env,BP_GDB );#ifndef CONFIG_USER_ONLY
@@ -1509,6 +1514,8 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) addr =strtoull (p, (char **)&p,16 );#if defined(TARGET_I386 ) s->c_cpu->eip = addr; +if (kvm_enabled ()) +kvm_put_registers (s->c_cpu);#elif defined (TARGET_PPC ) s->c_cpu->nip = addr;#elif defined (TARGET_SPARC )
@@ -1550,6 +1557,8 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) addr =strtoull (p, (char **)&p,16 );#if defined(TARGET_I386 ) s->c_cpu->eip = addr; +if (kvm_enabled ()) +kvm_put_registers (s->c_cpu);#elif defined (TARGET_PPC ) s->c_cpu->nip = addr;#elif defined (TARGET_SPARC )
@@ -1595,6 +1604,8 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) }break ;case 'g' : +if (kvm_enabled ()) +kvm_get_registers (s->g_cpu); len =0 ;for (addr =0 ; addr < num_g_regs; addr++) { reg_size =gdb_read_register (s->g_cpu, mem_buf + len, addr);
@@ -1612,6 +1623,8 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) len -= reg_size; registers += reg_size; } +if (kvm_enabled ()) +kvm_put_registers (s->g_cpu);put_packet (s,"OK" );break ;case 'm' :
@@ -1770,6 +1783,8 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) thread =strtoull (p+16 , (char **)&p,16 );for (env = first_cpu; env !=NULL ; env = env->next_cpu)if (env->cpu_index +1 == thread) { +if (kvm_enabled ()) +kvm_get_registers (env); len =snprintf ((char *)mem_buf,sizeof (mem_buf),"CPU#%d [%s]" , env->cpu_index, env->halted ?"halted " :"running" );
gdbstub.h +7 -0
@@ -3,6 +3,13 @@#define DEFAULT_GDBSTUB_PORT "1234" +/* GDB breakpoint/watchpoint types */ +#define GDB_BREAKPOINT_SW 0 +#define GDB_BREAKPOINT_HW 1 +#define GDB_WATCHPOINT_WRITE 2 +#define GDB_WATCHPOINT_READ 3 +#define GDB_WATCHPOINT_ACCESS 4 +typedef void (*gdb_syscall_complete_cb )(CPUState *env,target_ulong ret,target_ulong err);
kvm-all.c +172 -0
193 lines not on this page · raw message
kvm.h +41 -0
57 lines not on this page · raw message
target-i386/kvm.c +172 -0
181 lines not on this page · raw message
Quoted 36 lines · Jan Kiszka
[ Also available via
git://git.kiszka.org/qemu.gitqueue/gdb ]This is a backport of the guest debugging support for the KVM accelerator that is now part of the KVM tree. It implements the reworked KVM kernel API for guest debugging (
KVM_CAP_SET_GUEST_DEBUG) which is not yet part of any mainline kernel but will probably be 2.6.30 stuff. So far supported is x86, but PPC is expected to catch up soon.Core features are:
- unlimited soft-breakpoints via code patching
- hardware-assisted x86 breakpoints and watchpointsOpen issues: Writing soft breakpoints to BIOS code.
cpu_memory_rw_debugdoes not work here. Suggestion to fix this cleanly are welcome.Signed-off-by Jan Kiszka <[email protected]>---
configure | 4 + exec.c | 10 ++- gdbstub.c | 29 +++++++-- gdbstub.h | 7 ++ kvm-all.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++ kvm.h | 41 +++++++++++++ target-i386/kvm.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 423 insertions(+), 12 deletions(-)configure +0
-0@@ -479,11 +479,11 @@ case "$cpu" in ARCH_CFLAGS="-march=z900" ;; i386)
configure case "$cpu" in · line 489
Quoted 10 lines
configure +2
-2- ARCH_CFLAGS="-m32" + ARCH_CFLAGS="-m32 -DCONFIG_X86" ARCH_LDFLAGS="-m32" ;; x86_64) - ARCH_CFLAGS="-m64" + ARCH_CFLAGS="-m64 -DCONFIG_X86" ARCH_LDFLAGS="-m64" ;; esac
This seems unnecessary, no?
The rest looks good.
Regards,
Anthony Liguori
Quoted 43 lines · Anthony Liguori
Quoted 42 lines · Jan Kiszka
[ Also available via
git://git.kiszka.org/qemu.gitqueue/gdb ]This is a backport of the guest debugging support for the KVM accelerator that is now part of the KVM tree. It implements the reworked KVM kernel API for guest debugging (
KVM_CAP_SET_GUEST_DEBUG) which is not yet part of any mainline kernel but will probably be 2.6.30 stuff. So far supported is x86, but PPC is expected to catch up soon.Core features are:
- unlimited soft-breakpoints via code patching
- hardware-assisted x86 breakpoints and watchpointsOpen issues: Writing soft breakpoints to BIOS code.
cpu_memory_rw_debugdoes not work here. Suggestion to fix this cleanly are welcome.Signed-off-by Jan Kiszka <[email protected]>---
configure | 4 + exec.c | 10 ++- gdbstub.c | 29 +++++++-- gdbstub.h | 7 ++ kvm-all.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++ kvm.h | 41 +++++++++++++ target-i386/kvm.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 423 insertions(+), 12 deletions(-)configure +1
-1@@ -479,11 +479,11 @@ case "$cpu" in ARCH_CFLAGS="-march=z900" ;; i386) - ARCH_CFLAGS="-m32" + ARCH_CFLAGS="-m32 -DCONFIG_X86" ARCH_LDFLAGS="-m32" ;; x86_64)
Quoted 8 lines
configure case "$cpu" in · line 489
Quoted 6 lines
configure +1
-1- ARCH_CFLAGS="-m64" + ARCH_CFLAGS="-m64 -DCONFIG_X86" ARCH_LDFLAGS="-m64" ;; esacThis seems unnecessary, no?
Nope. I suggested and Avi merged a patch to define KVM_CAP_SET_GUEST_DEBUG only for those archs (ie. currently x86) that really support it. That avoids having to define empty stubs on the other KVM archs.
So we need to define the proper arch switch to make the CAP appear in the kernel header. Also note that there are much more conditional CAP defines queued up or already merged into mainline.
Quoted 9 lines
The rest looks good.
Regards,
Anthony Liguori
Jan