accel: Unassorted cleanups around debugging
v3 cover accel: Unassorted cleanups around debugging
Missing review: 16
Since v2:
- Fixed gdb_can_reverse (patch #16)
- & -> mask, == -> flags (patch #20)
- Dropped patch #29 (Move CPUWatchpoint def)
Since v1:
- Introduce AccelGdbConfig structure (Alex)
- Dropped target-specific Breakpoint/Watchpoint changes (Richard working on it)
Refreshing the `split-accel' preparatory work; this series follows "accel: Preparatory cleanups for split-accel" from last year:
https://lore.kernel.org/qemu-devel/[email protected]/
Nothing really noteworthy here, generic code refactoring with the objective to strengthen the various APIs, introducing few enums or headers.
I'm quite pleased with the total diff-stat.
Philippe Mathieu-Daudé (31):
cpu: Constify CPUState::cc (cached CPUClass pointer) target/i386: Remove duplicate tlb_flush() call in cpu_post_load() accel/tcg: Restrict tlb_protect/unprotect_code() to TCG accel/hvf: Remove left-over comment
accel/mshv: Replace @dirty field by generic CPUState::vcpu_dirty field
gdbstub: Add trace event for STEP packet handler
gdbstub: Only return E22 when reverse GDB is not supported accel/whpx: Implement missing
AccelClass::gdbstub_supported_sstep_flags
accel/kvm: Always define AccelOpsClass::supports_guest_debug accel/kvm: Simplify kvm_init() w.r.t. TARGET_KVM_HAVE_GUEST_DEBUG accel/kvm: Hold have_guest_debug in KVMState
gdbstub: Reduce gdb_supports_guest_debug() scope
gdbstub: Move supported_sstep_flags in AccelGdbConfig structure
accel: Have each implementation return their AccelGdbConfig
gdbstub: Make default replay_mode value explicit in stubs
accel: Hold @can_reverse information in AccelGdbConfig
accel: Remove AccelOpsClass::supports_guest_debug
cpu: Move BREAKPOINT definitions to 'exec/breakpoint.h'
cpu: Define BreakpointFlags type
accel: Remove unnecessary 'inline' qualifier in remove_all_breakpoints gdbstub/user: Directly call gdb_breakpoint_remove_all() in user mode
gdbstub: Reduce @type variable scope
gdbstub: Introduce GdbBreakpointType enumerator
accel: Use GdbBreakpointType enum
target/arm: Inline check_watchpoints() in arm_debug_check_watchpoint() target/ppc: Ensure TCG is used in ppc_update_daw() accel/tcg: Improve docstrings around TCGCPUOps::*watchpoint* handlers
cpu: Better name cpu_single_step() trace event
cpu: Introduce cpu_single_stepping() helper
cpu: Rename CPUState @singlestep_enabled -> @singlestep_flags
cpu: Only check SSTEP_ENABLE flag in cpu_single_stepping()
Richard Henderson (1):
cpu: Move cpu_breakpoint_test out of line
docs/system/gdb.rst | 2 +- accel/kvm/kvm-cpus.h | 12 ++++--- accel/tcg/system-page-protection.h | 17 ++++++++++ gdbstub/internals.h | 12 ++++--- include/accel/accel-cpu-ops.h | 10 +++--- include/accel/accel-ops.h | 5 ++- include/accel/tcg/cpu-ops.h | 11 ++++--- include/exec/breakpoint.h | 19 +++++++++-- include/exec/cputlb.h | 8 ++--- include/exec/watchpoint.h | 6 ++-- include/gdbstub/enums.h | 12 ++++--- include/hw/core/cpu.h | 53 ++++++++++-------------------- include/qemu/accel.h | 13 +++++--- include/system/hvf_int.h | 14 ++++---- include/system/kvm.h | 9 +++-- include/system/mshv_int.h | 1 - include/system/whpx-all.h | 3 -- target/arm/internals.h | 5 +-- accel/accel-common.c | 15 +++------ accel/hvf/hvf-accel-ops.c | 23 +++++++------ accel/hvf/hvf-all.c | 8 ++--- accel/kvm/kvm-accel-ops.c | 7 ++-- accel/kvm/kvm-all.c | 52 ++++++++--------------------- accel/mshv/mshv-all.c | 18 +++++----- accel/tcg/cpu-exec-common.c | 2 +- accel/tcg/cpu-exec.c | 12 +++---- accel/tcg/cputlb.c | 15 +++++---- accel/tcg/tb-maint.c | 1 + accel/tcg/tcg-accel-ops-rr.c | 2 +- accel/tcg/tcg-accel-ops.c | 31 ++++++++--------- accel/tcg/tcg-all.c | 30 ++++++++--------- accel/tcg/translate-all.c | 3 +- accel/tcg/user-exec-stub.c | 9 ++--- accel/tcg/watchpoint.c | 9 ++--- accel/whpx/whpx-accel-ops.c | 6 ---- cpu-common.c | 19 +++++++++-- cpu-target.c | 10 +++--- gdbstub/gdbstub.c | 18 +++++----- gdbstub/system.c | 37 ++++++++------------- gdbstub/user.c | 20 +++-------- linux-user/riscv/cpu_loop.c | 2 +- linux-user/s390x/cpu_loop.c | 2 +- stubs/replay-mode.c | 2 +- system/cpus.c | 2 +- system/watchpoint.c | 4 +-- target/arm/hvf/hvf.c | 27 +++++++-------- target/arm/hyp_gdbstub.c | 8 ++--- target/arm/kvm.c | 14 ++++---- target/arm/tcg/debug.c | 44 +++++++++++-------------- target/arm/tcg/mte_helper.c | 3 +- target/arm/whpx/whpx-all.c | 5 --- target/i386/hvf/hvf.c | 13 +++----- target/i386/kvm/kvm.c | 14 ++++---- target/i386/machine.c | 1 - target/i386/mshv/mshv-cpu.c | 6 ++-- target/i386/whpx/whpx-all.c | 13 +++----- target/loongarch/kvm/kvm.c | 10 +++--- target/microblaze/translate.c | 2 +- target/ppc/cpu.c | 4 ++- target/ppc/kvm.c | 19 ++++++----- target/ppc/translate.c | 16 ++++----- target/riscv/cpu_helper.c | 2 +- target/riscv/debug.c | 12 +++---- target/riscv/kvm/kvm-cpu.c | 8 +++-- target/s390x/kvm/kvm.c | 10 +++--- target/s390x/tcg/debug.c | 3 +- target/xtensa/dbg_helper.c | 2 +- trace-events | 2 +- 68 files changed, 392 insertions(+), 417 deletions(-) create mode 100644 accel/tcg/system-page-protection.h
Signature · 1 line
2.53.0
PATCH v3 1/32 cpu: Constify CPUState::cc (cached CPUClass pointer)
Various CPUState can share the same CPUClass parent, and must not update its fields. Protect the CPUClass by marking the CPUState pointer const.
--- include/hw/core/cpu.h | 2 +- accel/tcg/cpu-exec.c | 2 +- accel/tcg/translate-all.c | 3 +-- gdbstub/gdbstub.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-)
include/hw/core/cpu.h +1 -1
@@ -480,7 +480,7 @@ struct CPUState {/*< private >*/ DeviceState parent_obj;/* cache to avoid expensive CPU_GET_CLASS */ -CPUClass *cc; +const CPUClass *cc;/*< public >*/ int nr_threads;
accel/tcg/cpu-exec.c +1 -1
@@ -460,7 +460,7 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit)* counter hit zero); we must restore the guest PC to the address * of the start of the TB. */ -CPUClass *cc = cpu->cc; +const CPUClass *cc = cpu->cc;const TCGCPUOps *tcg_ops = cc->tcg_ops;if (tcg_ops->synchronize_from_tb) {
accel/tcg/translate-all.c +1 -2
@@ -575,7 +575,7 @@ void tb_check_watchpoint(CPUState *cpu, uintptr_t retaddr)void cpu_io_recompile (CPUState *cpu,uintptr_t retaddr) {TranslationBlock *tb; -CPUClass *cc; +const CPUClass *cc = cpu->cc;uint32_t n; tb =tcg_tb_lookup (retaddr);
@@ -591,7 +591,6 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr)* to account for the re-execution of the branch. */ n =1 ; - cc = cpu->cc;if (cc->tcg_ops->io_recompile_replay_branch && cc->tcg_ops->io_recompile_replay_branch (cpu, tb)) { cpu->neg.icount_decr.u16.low++;
gdbstub/gdbstub.c +1 -1
@@ -578,7 +578,7 @@ static void gdb_register_feature(CPUState *cpu, int base_reg,static const char *gdb_get_core_xml_file (CPUState *cpu) { -CPUClass *cc = cpu->cc; +const CPUClass *cc = cpu->cc;/* * The CPU class can provide the XML filename via a method,
Signature · 1 line
2.53.0
PATCH v3 2/32 target/i386: Remove duplicate tlb_flush() call in cpu_post_load()
In reply to Philippe Mathieu-DaudéCommon vCPU cpu_common_post_load() handler calls tlb_flush() since commit 9656f324d25 ("Move interrupt_request and user_mode_only to common cpu state..."), no need to call it twice.
--- target/i386/machine.c | 1 - 1 file changed, 1 deletion(-)
target/i386/machine.c +0 -1
@@ -401,7 +401,6 @@ static int cpu_post_load(void *opaque, int version_id) env->dr[7 ] = dr7 & ~(DR7_GLOBAL_BP_MASK |DR7_LOCAL_BP_MASK );cpu_x86_update_dr7 (env, dr7); } -tlb_flush (cs);return 0 ; }
Signature · 1 line
2.53.0
PATCH v3 3/32 accel/tcg: Restrict tlb_protect/unprotect_code() to TCG
In reply to Philippe Mathieu-DaudéBoth tlb_protect() and tlb_unprotect_code() are only used within accel/tcg/. Avoid exposing them to the whole code base, declare them in a new "system-page-protection.h" local header.
--- accel/tcg/system-page-protection.h | 17 +++++++++++++++++ include/exec/cputlb.h | 8 ++------ accel/tcg/cputlb.c | 3 ++- accel/tcg/tb-maint.c | 1 + 4 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 accel/tcg/system-page-protection.h
accel/tcg/system-page-protection.h new file +17 -0
@@ -0,0 +1,17 @@ +/* +* QEMU page protection (system emulation) +* +* Copyright (c) 2003 Fabrice Bellard +* +* SPDX-License-Identifier: LGPL-2.1-or-later +*/ +#ifndef SYSTEM_PAGE_PROTECTION_H +#define SYSTEM_PAGE_PROTECTION_H + +#include "system/ram_addr.h" + +void tlb_protect_code (ram_addr_t ram_addr); +void tlb_unprotect_code (ram_addr_t ram_addr); + +#endif +
include/exec/cputlb.h +2 -6
@@ -24,14 +24,10 @@#include "exec/hwaddr.h" #include "exec/memattrs.h" #include "exec/vaddr.h" -#include "system/ram_addr.h" - -#if defined(CONFIG_TCG ) && !defined(CONFIG_USER_ONLY ) -void tlb_protect_code (ram_addr_t ram_addr); -void tlb_unprotect_code (ram_addr_t ram_addr); -#endif #ifndef CONFIG_USER_ONLY +#include "system/ram_addr.h" +void tlb_reset_dirty (CPUState *cpu,uintptr_t start,uintptr_t length);void tlb_reset_dirty_range_all (ram_addr_t start,ram_addr_t length);#endif
accel/tcg/cputlb.c +2 -1
@@ -1,5 +1,5 @@/* -* Common CPU TLB handling +* Common CPU TLB handling (system emulation) * * Copyright (c) 2003 Fabrice Bellard *
@@ -47,6 +47,7 @@#include "tb-hash.h" #include "tlb-bounds.h" #include "internal-common.h" +#include "system-page-protection.h" #ifdef CONFIG_PLUGIN #include "qemu/plugin-memory.h" #endif
accel/tcg/tb-maint.c +1 -0
@@ -38,6 +38,7 @@#include "user/page-protection.h" #define runstate_is_running () true#else +#include "system-page-protection.h" #include "system/runstate.h" #endif #include "trace.h"
Signature · 1 line
2.53.0
PATCH v3 4/32 accel/hvf: Remove left-over comment
In reply to Philippe Mathieu-DaudéMissed in commit 6bf331164c5 ("accel/hvf: Drop hvf_slot and hvf_find_overlap_slot").
--- accel/hvf/hvf-accel-ops.c | 2 -- 1 file changed, 2 deletions(-)
accel/hvf/hvf-accel-ops.c +0 -2
@@ -62,8 +62,6 @@HVFState *hvf_state; -/* Memory slots */ -static void do_hvf_cpu_synchronize_state (CPUState *cpu,run_on_cpu_data arg) {if (!cpu->vcpu_dirty) {
Signature · 1 line
2.53.0
PATCH v3 5/32 accel/mshv: Replace @dirty field by generic CPUState::vcpu_dirty field
In reply to Philippe Mathieu-DaudéNo need for accel-specific @dirty field when we have a generic one in CPUState. (Other accelerators already did that in commits 6f13a0ada01..36ab216b81d).
--- include/system/mshv_int.h | 1 - accel/mshv/mshv-all.c | 18 +++++++++--------- target/i386/mshv/mshv-cpu.c | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-)
include/system/mshv_int.h +0 -1
@@ -43,7 +43,6 @@ typedef struct MshvHvCallArgs {struct AccelCPUState {int cpufd; -bool dirty;MshvHvCallArgs hvcall_args; };
accel/mshv/mshv-all.c +9 -9
@@ -531,7 +531,7 @@ static int mshv_init_vcpu(CPUState *cpu) }mshv_arch_init_vcpu (cpu); - cpu->accel->dirty = true; + cpu->vcpu_dirty = true;return 0 ; }
@@ -617,7 +617,7 @@ static int mshv_cpu_exec(CPUState *cpu)cpu_exec_start (cpu); do { - if (cpu->accel->dirty) { + if (cpu->vcpu_dirty) { ret = mshv_arch_store_vcpu_state(cpu); if (ret) { error_report("Failed to put registers after init: %s",
@@ -625,7 +625,7 @@ static int mshv_cpu_exec(CPUState *cpu) ret =-1 ;break ; } - cpu->accel->dirty = false; + cpu->vcpu_dirty = false; } ret =mshv_run_vcpu (mshv_state->vm, cpu, &mshv_msg, &exit_reason);
@@ -746,7 +746,7 @@ static void do_mshv_cpu_synchronize_post_init(CPUState *cpu,abort (); } - cpu->accel->dirty = false; + cpu->vcpu_dirty = false; }static void mshv_cpu_synchronize_post_init (CPUState *cpu)
@@ -763,13 +763,13 @@ static void mshv_cpu_synchronize_post_reset(CPUState *cpu)cpu_dump_state (cpu, stderr,CPU_DUMP_CODE );vm_stop (RUN_STATE_INTERNAL_ERROR ); } - cpu->accel->dirty = false; + cpu->vcpu_dirty = false; }static void do_mshv_cpu_synchronize_pre_loadvm (CPUState *cpu,run_on_cpu_data arg) { - cpu->accel->dirty = true; + cpu->vcpu_dirty = true; }static void mshv_cpu_synchronize_pre_loadvm (CPUState *cpu)
@@ -779,7 +779,7 @@ static void mshv_cpu_synchronize_pre_loadvm(CPUState *cpu)static void do_mshv_cpu_synchronize (CPUState *cpu,run_on_cpu_data arg) { -if (!cpu->accel->dirty) { +if (!cpu->vcpu_dirty) {int ret =mshv_arch_load_vcpu_state (cpu);if (ret <0 ) { error_report("Failed to load registers for vcpu %d",
@@ -789,13 +789,13 @@ static void do_mshv_cpu_synchronize(CPUState *cpu, run_on_cpu_data arg)vm_stop (RUN_STATE_INTERNAL_ERROR ); } - cpu->accel->dirty = true; + cpu->vcpu_dirty = true; } }static void mshv_cpu_synchronize (CPUState *cpu) { -if (!cpu->accel->dirty) { +if (!cpu->vcpu_dirty) {run_on_cpu (cpu, do_mshv_cpu_synchronize,RUN_ON_CPU_NULL ); } }
target/i386/mshv/mshv-cpu.c +3 -3
@@ -1692,7 +1692,7 @@ static int pio_write(uint64_t port, const uint8_t *data, uintptr_t size,return ret; } -static int handle_pio_non_str (const CPUState *cpu, +static int handle_pio_non_str (CPUState *cpu,hv_x64_io_port_intercept_message *info) {size_t len = info->access_info.access_size;
@@ -1748,7 +1748,7 @@ static int handle_pio_non_str(const CPUState *cpu,return -1 ; } - cpu->accel->dirty = false; + cpu->vcpu_dirty = false;return 0 ; }
@@ -1909,7 +1909,7 @@ static int handle_pio_str(CPUState *cpu, hv_x64_io_port_intercept_message *info)return -1 ; } - cpu->accel->dirty = false; + cpu->vcpu_dirty = false;return 0 ; }
Signature · 1 line
2.53.0
PATCH v3 6/32 gdbstub: Add trace event for STEP packet handler
In reply to Philippe Mathieu-Daudé--- gdbstub/gdbstub.c | 1 + 1 file changed, 1 insertion(+)
gdbstub/gdbstub.c +1 -0
@@ -1369,6 +1369,7 @@ static void handle_step(GArray *params, void *user_ctx)gdb_set_cpu_pc (gdb_get_cmd_param (params,0 )->val_ull); } +trace_gdbstub_op_stepping (gdbserver_state.c_cpu->cpu_index);cpu_single_step (gdbserver_state.c_cpu, gdbserver_state.sstep_flags);gdb_continue (); }
Signature · 1 line
2.53.0
PATCH v3 7/32 gdbstub: Only return E22 when reverse GDB is not supported
In reply to Philippe Mathieu-DaudéNo need to keep processing the arguments when we know reverse debugging is not available.
--- gdbstub/gdbstub.c | 1 + 1 file changed, 1 insertion(+)
gdbstub/gdbstub.c +1 -0
@@ -1378,6 +1378,7 @@ static void handle_backward(GArray *params, void *user_ctx) {if (!gdb_can_reverse ()) {gdb_put_packet ("E22" ); +return ; }if (params->len ==1 ) {switch (gdb_get_cmd_param (params,0 )->opcode) {
Signature · 1 line
2.53.0
PATCH v3 8/32 accel/whpx: Implement missing AccelClass::gdbstub_supported_sstep_flags
In reply to Philippe Mathieu-DaudéCorrect gdbstub support requires some gdbstub_supported_sstep_flags. Apparently missed in commit d7482ffe975 ("whpx: Added support for breakpoints and stepping"), even with the recent 19b48084f71 ("whpx:
i386: re-enable guest debug support") fixes.
--- include/system/whpx-all.h | 1 + accel/whpx/whpx-common.c | 1 + target/arm/whpx/whpx-all.c | 5 +++++ target/i386/whpx/whpx-all.c | 5 +++++ 4 files changed, 12 insertions(+)
include/system/whpx-all.h +1 -0
@@ -23,6 +23,7 @@ void whpx_arch_destroy_vcpu(CPUState *cpu);void whpx_arch_accel_class_init (ObjectClass *oc);/* called by whpx-accel-ops */ +int whpx_arch_gdbstub_sstep_flags (AccelState *as);bool whpx_arch_supports_guest_debug (void );#endif
accel/whpx/whpx-common.c +1 -0
@@ -527,6 +527,7 @@ static void whpx_accel_class_init(ObjectClass *oc, const void *data) ac->init_machine = whpx_accel_init; ac->pre_resume_vm = whpx_pre_resume_vm; ac->allowed = &whpx_allowed; + ac->gdbstub_supported_sstep_flags = whpx_arch_gdbstub_sstep_flags; object_class_property_add(oc, "kernel-irqchip", "on|off|split", NULL, whpx_set_kernel_irqchip,
target/arm/whpx/whpx-all.c +5 -0
@@ -295,6 +295,11 @@ void whpx_translate_cpu_breakpoints(/* Breakpoints aren’t supported on this platform */ } +int whpx_arch_gdbstub_sstep_flags (AccelState *as) +{ +return 0 ; +} +bool whpx_arch_supports_guest_debug (void ) {return false;
target/i386/whpx/whpx-all.c +5 -0
@@ -1853,6 +1853,11 @@ void whpx_apply_breakpoints( } } +int whpx_arch_gdbstub_sstep_flags (AccelState *as) +{ +return SSTEP_ENABLE ; +} +bool whpx_arch_supports_guest_debug (void ) {return true;
Signature · 1 line
2.53.0
PATCH v3 9/32 accel/kvm: Always define AccelOpsClass::supports_guest_debug
In reply to Philippe Mathieu-DaudéWhether TARGET_KVM_HAVE_GUEST_DEBUG is defined or not, kvm_supports_guest_debug() still exists and can be called.
--- accel/kvm/kvm-accel-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
accel/kvm/kvm-accel-ops.c +1 -1
@@ -105,9 +105,9 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, const void *data) ops->synchronize_pre_loadvm = kvm_cpu_synchronize_pre_loadvm; ops->handle_interrupt = generic_handle_interrupt; + ops->supports_guest_debug = kvm_supports_guest_debug;#ifdef TARGET_KVM_HAVE_GUEST_DEBUG ops->update_guest_debug = kvm_update_guest_debug_ops; - ops->supports_guest_debug = kvm_supports_guest_debug; ops->insert_breakpoint = kvm_insert_breakpoint; ops->remove_breakpoint = kvm_remove_breakpoint; ops->remove_all_breakpoints = kvm_remove_all_breakpoints;
Signature · 1 line
2.53.0
PATCH v3 10/32 accel/kvm: Simplify kvm_init() w.r.t. TARGET_KVM_HAVE_GUEST_DEBUG
In reply to Philippe Mathieu-DaudéSimplify #ifdef'ry using TARGET_KVM_HAVE_GUEST_DEBUG in kvm_init(). No need to zero-initialize kvm_sstep_flags again.
--- accel/kvm/kvm-all.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
accel/kvm/kvm-all.c +1 -4
@@ -3040,21 +3040,18 @@ static int kvm_init(AccelState *as, MachineState *ms)#ifdef TARGET_KVM_HAVE_GUEST_DEBUG kvm_has_guest_debug = (kvm_check_extension (s,KVM_CAP_SET_GUEST_DEBUG ) >0 ); -#endif - kvm_sstep_flags =0 ;if (kvm_has_guest_debug) { kvm_sstep_flags =SSTEP_ENABLE ; -#if definedTARGET_KVM_HAVE_GUEST_DEBUG int guest_debug_flags =kvm_check_extension (s,KVM_CAP_SET_GUEST_DEBUG2 );if (guest_debug_flags &KVM_GUESTDBG_BLOCKIRQ ) { kvm_sstep_flags |=SSTEP_NOIRQ ; } -#endif } +#endif kvm_state = s;
Signature · 1 line
2.53.0
PATCH v3 11/32 accel/kvm: Hold have_guest_debug in KVMState
In reply to Philippe Mathieu-DaudéPrefer to store per-accelerator variables in the per-accelerator state, rather than as static variables. This is a good practice to allow concurrent accelerators in the future.
--- include/system/kvm_int.h | 1 + accel/kvm/kvm-all.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-)
include/system/kvm_int.h +1 -0
@@ -118,6 +118,7 @@ struct KVMState#endif int max_nested_state_len;int kvm_shadow_mem; +bool have_guest_debug;bool kernel_irqchip_allowed;bool kernel_irqchip_required;OnOffAuto kernel_irqchip_split;
accel/kvm/kvm-all.c +5 -4
@@ -104,7 +104,6 @@ bool kvm_readonly_mem_allowed;bool kvm_vm_attributes_allowed;bool kvm_msi_use_devid;bool kvm_pre_fault_memory_supported; -static bool kvm_has_guest_debug;static int kvm_sstep_flags;static bool kvm_immediate_exit;static uint64_t kvm_supported_memory_attributes;
@@ -3038,10 +3037,10 @@ static int kvm_init(AccelState *as, MachineState *ms) (kvm_check_extension (s,KVM_CAP_VM_ATTRIBUTES ) >0 );#ifdef TARGET_KVM_HAVE_GUEST_DEBUG - kvm_has_guest_debug = + s->have_guest_debug = (kvm_check_extension (s,KVM_CAP_SET_GUEST_DEBUG ) >0 ); -if (kvm_has_guest_debug) { +if (s->have_guest_debug) { kvm_sstep_flags =SSTEP_ENABLE ; int guest_debug_flags =
@@ -3833,8 +3832,10 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)bool kvm_supports_guest_debug (void ) { +KVMState *s =KVM_STATE (as); +/* probed during kvm_init() */ -return kvm_has_guest_debug; +return s->have_guest_debug; }int kvm_insert_breakpoint (CPUState *cpu,int type,vaddr addr,vaddr len)
Signature · 1 line
2.53.0
PATCH v3 12/32 gdbstub: Reduce gdb_supports_guest_debug() scope
In reply to Philippe Mathieu-Daudégdb_supports_guest_debug() is only required for system emulation, reduce its scope by making it private; remove the user emulation variant.
--- gdbstub/internals.h | 1 - gdbstub/system.c | 4 +++- gdbstub/user.c | 6 ------ 3 files changed, 3 insertions(+), 8 deletions(-)
gdbstub/internals.h +0 -1
@@ -217,7 +217,6 @@ void gdb_syscall_handling(const char *syscall_packet);* Break/Watch point support - there is an implementation for system * and user mode. */ -bool gdb_supports_guest_debug (void );int gdb_breakpoint_insert (CPUState *cs,int type,vaddr addr,vaddr len);int gdb_breakpoint_remove (CPUState *cs,int type,vaddr addr,vaddr len);void gdb_breakpoint_remove_all (CPUState *cs);
gdbstub/system.c +3 -1
@@ -331,6 +331,8 @@ static void create_processes(GDBState *s)gdb_create_default_process (s); } +static bool gdb_supports_guest_debug (void ); +bool gdbserver_start (const char *device,Error **errp) {Chardev *chr =NULL ;
@@ -627,7 +629,7 @@ int gdb_signal_to_target(int sig)* Break/Watch point helpers */ -bool gdb_supports_guest_debug (void ) +static bool gdb_supports_guest_debug (void ) {const AccelOpsClass *ops =cpus_get_accel ();if (ops->supports_guest_debug) {
gdbstub/user.c +0 -6
@@ -796,12 +796,6 @@ bool gdb_can_reverse(void)* Break/Watch point helpers */ -bool gdb_supports_guest_debug (void ) -{ -/* user-mode == TCG == supported */ -return true; -} -int gdb_breakpoint_insert (CPUState *cs,int type,vaddr addr,vaddr len) {CPUState *cpu;
Signature · 1 line
2.53.0
PATCH v3 13/32 gdbstub: Move supported_sstep_flags in AccelGdbConfig structure
In reply to Philippe Mathieu-Daudésupported_sstep_flags are per-accelerators. Move them to a new AccelGdbConfig structure, still in GDBState.
--- gdbstub/internals.h | 3 ++- include/qemu/accel.h | 9 +++++++++ gdbstub/gdbstub.c | 10 +++++----- 3 files changed, 16 insertions(+), 6 deletions(-)
gdbstub/internals.h +2 -1
@@ -9,6 +9,7 @@#ifndef GDBSTUB_INTERNALS_H #define GDBSTUB_INTERNALS_H +#include "qemu/accel.h" #include "exec/cpu-common.h" /*
@@ -83,8 +84,8 @@ typedef struct GDBState {int process_num;GString *str_buf;GByteArray *mem_buf; +AccelGdbConfig accel_config;int sstep_flags; -int supported_sstep_flags;/* * Whether we are allowed to send a stop reply packet at this moment. * Must be set off after sending the stop reply itself.
include/qemu/accel.h +9 -0
@@ -73,6 +73,15 @@ bool accel_cpu_common_realize(CPUState *cpu, Error **errp);*/ void accel_cpu_common_unrealize (CPUState *cpu); +/** +* struct AccelGdbConfig - gdbstub configuration for an accelerator. +* +* @sstep_flags: Set SSTEP_* flags that accelerator supports for guest debug. +*/ +typedef struct AccelGdbConfig { +unsigned sstep_flags; +}AccelGdbConfig ; +/** * accel_supported_gdbstub_sstep_flags: *
gdbstub/gdbstub.c +5 -5
@@ -72,9 +72,9 @@ void gdb_init_gdbserver_state(void)* By default try to use no IRQs and no timers while single * stepping so as to make single stepping like a typical ICE HW step. */ - gdbserver_state.supported_sstep_flags =accel_supported_gdbstub_sstep_flags (); + gdbserver_state.accel_config.sstep_flags =accel_supported_gdbstub_sstep_flags (); gdbserver_state.sstep_flags =SSTEP_ENABLE |SSTEP_NOIRQ |SSTEP_NOTIMER ; - gdbserver_state.sstep_flags &= gdbserver_state.supported_sstep_flags; + gdbserver_state.sstep_flags &= gdbserver_state.accel_config.sstep_flags; }/* writes 2*len+1 bytes in buf */
@@ -1537,12 +1537,12 @@ static void handle_query_qemu_sstepbits(GArray *params, void *user_ctx) {g_string_printf (gdbserver_state.str_buf,"ENABLE=%x" ,SSTEP_ENABLE ); -if (gdbserver_state.supported_sstep_flags &SSTEP_NOIRQ ) { +if (gdbserver_state.accel_config.sstep_flags &SSTEP_NOIRQ ) {g_string_append_printf (gdbserver_state.str_buf,",NOIRQ=%x" ,SSTEP_NOIRQ ); } -if (gdbserver_state.supported_sstep_flags &SSTEP_NOTIMER ) { +if (gdbserver_state.accel_config.sstep_flags &SSTEP_NOTIMER ) {g_string_append_printf (gdbserver_state.str_buf,",NOTIMER=%x" ,SSTEP_NOTIMER ); }
@@ -1560,7 +1560,7 @@ static void handle_set_qemu_sstep(GArray *params, void *user_ctx) new_sstep_flags =gdb_get_cmd_param (params,0 )->val_ul; -if (new_sstep_flags & ~gdbserver_state.supported_sstep_flags) { +if (new_sstep_flags & ~gdbserver_state.accel_config.sstep_flags) {gdb_put_packet ("E22" );return ; }
Signature · 1 line
2.53.0
PATCH v3 14/32 accel: Have each implementation return their AccelGdbConfig
In reply to Philippe Mathieu-DaudéHold the per-accelerator AccelGdbConfig in AccelState, set its single @sstep_flags field in AccelClass::init_machine handlers.
Remove the AccelClass::gdbstub_supported_sstep_flags() getter and inline the single accel_supported_gdbstub_sstep_flags() call in gdb_init_gdbserver_state().
--- include/accel/accel-ops.h | 5 ++--- include/qemu/accel.h | 8 -------- include/system/whpx-all.h | 1 - accel/accel-common.c | 10 ---------- accel/hvf/hvf-all.c | 8 ++------ accel/kvm/kvm-all.c | 17 ++--------------- accel/tcg/tcg-all.c | 27 +++++++++++---------------- accel/whpx/whpx-common.c | 1 - gdbstub/gdbstub.c | 2 +- target/arm/whpx/whpx-all.c | 5 ----- target/i386/whpx/whpx-all.c | 7 ++----- 11 files changed, 20 insertions(+), 71 deletions(-)
include/accel/accel-ops.h +2 -3
@@ -13,6 +13,8 @@struct AccelState {Object parent_obj; + +AccelGdbConfig gdbstub; };struct AccelClass {
@@ -36,9 +38,6 @@ struct AccelClass {bool (*has_memory)(AccelState *accel,AddressSpace *as,hwaddr start_addr,hwaddr size); -/* gdbstub related hooks */ -int (*gdbstub_supported_sstep_flags)(AccelState *as); -bool *allowed;/* * Array of global properties that would be applied when specific
include/qemu/accel.h +0 -8
@@ -82,12 +82,4 @@ typedef struct AccelGdbConfig { unsigned sstep_flags; } AccelGdbConfig; -/** -* accel_supported_gdbstub_sstep_flags: -* -* Returns the supported single step modes for the configured -* accelerator. -*/ -int accel_supported_gdbstub_sstep_flags (void ); -#endif /* QEMU_ACCEL_H */
include/system/whpx-all.h +0 -1
@@ -23,7 +23,6 @@ void whpx_arch_destroy_vcpu(CPUState *cpu);void whpx_arch_accel_class_init (ObjectClass *oc);/* called by whpx-accel-ops */ -int whpx_arch_gdbstub_sstep_flags (AccelState *as);bool whpx_arch_supports_guest_debug (void );#endif
accel/accel-common.c +0 -10
@@ -113,16 +113,6 @@ void accel_cpu_common_unrealize(CPUState *cpu) } } -int accel_supported_gdbstub_sstep_flags (void ) -{ -AccelState *accel =current_accel (); -AccelClass *acc =ACCEL_GET_CLASS (accel); -if (acc->gdbstub_supported_sstep_flags) { -return acc->gdbstub_supported_sstep_flags (accel); - } -return 0 ; -} -static const TypeInfo accel_types[] = { { .name =TYPE_ACCEL ,
accel/hvf/hvf-all.c +2 -6
@@ -220,6 +220,8 @@ static int hvf_accel_init(AccelState *as, MachineState *ms) }assert_hvf_ok (ret); + as->gdbstub.sstep_flags =SSTEP_ENABLE |SSTEP_NOIRQ ; +QTAILQ_INIT (&s->hvf_sw_breakpoints); hvf_state = s;
@@ -228,11 +230,6 @@ static int hvf_accel_init(AccelState *as, MachineState *ms)return hvf_arch_init (); } -static int hvf_gdbstub_sstep_flags (AccelState *as) -{ -return SSTEP_ENABLE |SSTEP_NOIRQ ; -} -static void hvf_set_kernel_irqchip (Object *obj,Visitor *v,const char *name,void *opaque,Error **errp)
@@ -278,7 +275,6 @@ static void hvf_accel_class_init(ObjectClass *oc, const void *data) ac->name ="HVF" ; ac->init_machine = hvf_accel_init; ac->allowed = &hvf_allowed; - ac->gdbstub_supported_sstep_flags = hvf_gdbstub_sstep_flags; hvf_kernel_irqchip_override = false; hvf_kernel_irqchip = false; object_class_property_add(oc, "kernel-irqchip", "on|off|split",
accel/kvm/kvm-all.c +2 -15
@@ -104,7 +104,6 @@ bool kvm_readonly_mem_allowed;bool kvm_vm_attributes_allowed;bool kvm_msi_use_devid;bool kvm_pre_fault_memory_supported; -static int kvm_sstep_flags;static bool kvm_immediate_exit;static uint64_t kvm_supported_memory_attributes;static bool kvm_guest_memfd_supported;
@@ -3041,13 +3040,13 @@ static int kvm_init(AccelState *as, MachineState *ms) (kvm_check_extension (s,KVM_CAP_SET_GUEST_DEBUG ) >0 );if (s->have_guest_debug) { - kvm_sstep_flags =SSTEP_ENABLE ; + as->gdbstub.sstep_flags =SSTEP_ENABLE ;int guest_debug_flags =kvm_check_extension (s,KVM_CAP_SET_GUEST_DEBUG2 );if (guest_debug_flags &KVM_GUESTDBG_BLOCKIRQ ) { - kvm_sstep_flags |=SSTEP_NOIRQ ; + as->gdbstub.sstep_flags |=SSTEP_NOIRQ ; } }#endif
@@ -4279,17 +4278,6 @@ static void kvm_accel_instance_init(Object *obj) s->honor_guest_pat =ON_OFF_AUTO_OFF ; } -/** -* kvm_gdbstub_sstep_flags(): -* -* Returns: SSTEP_* flags that KVM supports for guest debug. The -* support is probed during kvm_init() -*/ -static int kvm_gdbstub_sstep_flags (AccelState *as) -{ -return kvm_sstep_flags; -} -static void kvm_accel_class_init (ObjectClass *oc,const void *data) {AccelClass *ac =ACCEL_CLASS (oc);
@@ -4298,7 +4286,6 @@ static void kvm_accel_class_init(ObjectClass *oc, const void *data) ac->rebuild_guest = kvm_reset_vmfd; ac->has_memory = kvm_accel_has_memory; ac->allowed = &kvm_allowed; - ac->gdbstub_supported_sstep_flags = kvm_gdbstub_sstep_flags; object_class_property_add(oc, "kernel-irqchip", "on|off|split", NULL, kvm_set_kernel_irqchip,
accel/tcg/tcg-all.c +11 -16
@@ -149,6 +149,17 @@ static int tcg_init_machine(AccelState *as, MachineState *ms) tcg_allowed = true; + as->gdbstub.sstep_flags =SSTEP_ENABLE ; +if (replay_mode ==REPLAY_MODE_NONE ) { +/* +* In replay mode all events will come from the log and can't be +* suppressed otherwise we would break determinism. However as those +* events are tied to the number of executed instructions we won't see +* them occurring every time we single step. +*/ + as->gdbstub.sstep_flags |=SSTEP_NOIRQ |SSTEP_NOTIMER ; + } +page_init ();tb_htable_init ();tcg_init (s->tb_size * MiB, s->splitwx_enabled, max_threads);
@@ -242,21 +253,6 @@ static void tcg_set_one_insn_per_tb(Object *obj, bool value, Error **errp)qatomic_set (&one_insn_per_tb, value); } -static int tcg_gdbstub_supported_sstep_flags (AccelState *as) -{ -/* -* In replay mode all events will come from the log and can't be -* suppressed otherwise we would break determinism. However as those -* events are tied to the number of executed instructions we won't see -* them occurring every time we single step. -*/ -if (replay_mode !=REPLAY_MODE_NONE ) { -return SSTEP_ENABLE ; - }else { -return SSTEP_ENABLE |SSTEP_NOIRQ |SSTEP_NOTIMER ; - } -} -static void tcg_accel_class_init (ObjectClass *oc,const void *data) {AccelClass *ac =ACCEL_CLASS (oc);
@@ -266,7 +262,6 @@ static void tcg_accel_class_init(ObjectClass *oc, const void *data) ac->cpu_common_unrealize = tcg_exec_unrealizefn; ac->get_stats = tcg_get_stats; ac->allowed = &tcg_allowed; - ac->gdbstub_supported_sstep_flags = tcg_gdbstub_supported_sstep_flags; object_class_property_add_str(oc, "thread", tcg_get_thread,
accel/whpx/whpx-common.c +0 -1
@@ -527,7 +527,6 @@ static void whpx_accel_class_init(ObjectClass *oc, const void *data) ac->init_machine = whpx_accel_init; ac->pre_resume_vm = whpx_pre_resume_vm; ac->allowed = &whpx_allowed; - ac->gdbstub_supported_sstep_flags = whpx_arch_gdbstub_sstep_flags; object_class_property_add(oc, "kernel-irqchip", "on|off|split", NULL, whpx_set_kernel_irqchip,
gdbstub/gdbstub.c +1 -1
@@ -72,7 +72,7 @@ void gdb_init_gdbserver_state(void)* By default try to use no IRQs and no timers while single * stepping so as to make single stepping like a typical ICE HW step. */ - gdbserver_state.accel_config.sstep_flags =accel_supported_gdbstub_sstep_flags (); + gdbserver_state.accel_config =current_accel ()->gdbstub; gdbserver_state.sstep_flags =SSTEP_ENABLE |SSTEP_NOIRQ |SSTEP_NOTIMER ; gdbserver_state.sstep_flags &= gdbserver_state.accel_config.sstep_flags; }
target/arm/whpx/whpx-all.c +0 -5
@@ -295,11 +295,6 @@ void whpx_translate_cpu_breakpoints(/* Breakpoints aren’t supported on this platform */ } -int whpx_arch_gdbstub_sstep_flags (AccelState *as) -{ -return 0 ; -} -bool whpx_arch_supports_guest_debug (void ) {return false;
target/i386/whpx/whpx-all.c +2 -5
@@ -1853,11 +1853,6 @@ void whpx_apply_breakpoints( } } -int whpx_arch_gdbstub_sstep_flags (AccelState *as) -{ -return SSTEP_ENABLE ; -} -bool whpx_arch_supports_guest_debug (void ) {return true;
@@ -3348,6 +3343,8 @@ int whpx_accel_init(AccelState *as, MachineState *ms)whpx_memory_init ();whpx_init_emu (); + as->gdbstub.sstep_flags =SSTEP_ENABLE ; +return 0 ; error:
Signature · 1 line
2.53.0
PATCH v3 15/32 gdbstub: Make default replay_mode value explicit in stubs
In reply to Philippe Mathieu-DaudéMake explicit @replay_mode is stubbed as REPLAY_MODE_NONE.
--- stubs/replay-mode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
stubs/replay-mode.c +1 -1
@@ -1,4 +1,4 @@#include "qemu/osdep.h" #include "system/replay.h" -ReplayMode replay_mode; +ReplayMode replay_mode =REPLAY_MODE_NONE ;
Signature · 1 line
2.53.0
PATCH v3 16/32 accel: Hold @can_reverse information in AccelGdbConfig
In reply to Philippe Mathieu-DaudéHold @can_reverse in AccelGdbConfig, set it when initializing AccelState in AccelClass::init_machine handlers (only TCG sets it). Remove gdb_can_reverse() as now unused.
--- gdbstub/internals.h | 1 - include/qemu/accel.h | 2 ++ accel/tcg/tcg-all.c | 3 +++ gdbstub/gdbstub.c | 4 ++-- gdbstub/system.c | 5 ----- gdbstub/user.c | 6 ------ 6 files changed, 7 insertions(+), 14 deletions(-)
gdbstub/internals.h +0 -1
@@ -154,7 +154,6 @@ CPUState *gdb_first_attached_cpu(void);void gdb_append_thread_id (CPUState *cpu,GString *buf);int gdb_get_cpu_index (CPUState *cpu);unsigned int gdb_get_max_cpus (void );/* both */ -bool gdb_can_reverse (void );/* system emulation, stub for user */ int gdb_target_sigtrap (void );/* user */ void gdb_create_default_process (GDBState *s);
include/qemu/accel.h +2 -0
@@ -77,9 +77,11 @@ void accel_cpu_common_unrealize(CPUState *cpu);* struct AccelGdbConfig - gdbstub configuration for an accelerator. * * @sstep_flags: Set SSTEP_* flags that accelerator supports for guest debug. +* @can_reverse: Whether reverse mode is supported. */ typedef struct AccelGdbConfig {unsigned sstep_flags; +bool can_reverse; }AccelGdbConfig ;#endif /* QEMU_ACCEL_H */
accel/tcg/tcg-all.c +3 -0
@@ -159,6 +159,9 @@ static int tcg_init_machine(AccelState *as, MachineState *ms)*/ as->gdbstub.sstep_flags |=SSTEP_NOIRQ |SSTEP_NOTIMER ; } +if (replay_mode ==REPLAY_MODE_PLAY ) { + as->gdbstub.can_reverse = true; + }page_init ();tb_htable_init ();
gdbstub/gdbstub.c +2 -2
@@ -1376,7 +1376,7 @@ static void handle_step(GArray *params, void *user_ctx)static void handle_backward (GArray *params,void *user_ctx) { -if (!gdb_can_reverse ()) { +if (!gdbserver_state.accel_config.can_reverse) {gdb_put_packet ("E22" );return ; }
@@ -1684,7 +1684,7 @@ static void handle_query_supported(GArray *params, void *user_ctx)g_string_append (gdbserver_state.str_buf,";qXfer:features:read+" ); } -if (gdb_can_reverse ()) { +if (gdbserver_state.accel_config.can_reverse) {g_string_append (gdbserver_state.str_buf,";ReverseStep+;ReverseContinue+" ); }
gdbstub/system.c +0 -5
@@ -479,11 +479,6 @@ unsigned int gdb_get_max_cpus(void)return ms->smp.max_cpus; } -bool gdb_can_reverse (void ) -{ -return replay_mode ==REPLAY_MODE_PLAY ; -} -/* * Softmmu specific command helpers */
gdbstub/user.c +0 -6
@@ -786,12 +786,6 @@ unsigned int gdb_get_max_cpus(void)return max_cpus; } -/* replay not supported for user-mode */ -bool gdb_can_reverse (void ) -{ -return false; -} -/* * Break/Watch point helpers */
Signature · 1 line
2.53.0
Re: [PATCH v3 16/32] accel: Hold @can_reverse information in AccelGdbConfig
Quoted 6 lines · Philippe Mathieu-Daudé
Hold @can_reverse in AccelGdbConfig, set it when initializing AccelState in
AccelClass::init_machinehandlers (only TCG sets it). Removegdb_can_reverse()as now unused.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
PATCH v3 17/32 accel: Remove AccelOpsClass::supports_guest_debug
In reply to Philippe Mathieu-DaudéNow accelerators hold the 'guest debug supported' information in their state, accessible by the common code. No need to call a per-accelerator handler, simply check for the SSTEP_ENABLE in AccelGdbConfig::sstep_flags.
Remove all AccelOpsClass::supports_guest_debug implementations, inline gdb_supports_guest_debug() and remove the now unnecessary KVMState::have_guest_debug field.
--- docs/system/gdb.rst | 2 +- accel/kvm/kvm-cpus.h | 1 - include/accel/accel-cpu-ops.h | 1 - include/qemu/accel.h | 2 ++ include/system/hvf_int.h | 5 ----- include/system/kvm_int.h | 1 - include/system/whpx-all.h | 3 --- accel/accel-common.c | 5 +++++ accel/hvf/hvf-accel-ops.c | 1 - accel/kvm/kvm-accel-ops.c | 1 - accel/kvm/kvm-all.c | 13 +------------ accel/tcg/tcg-accel-ops.c | 6 ------ accel/whpx/whpx-accel-ops.c | 6 ------ gdbstub/system.c | 13 +------------ target/arm/hvf/hvf.c | 5 ----- target/arm/whpx/whpx-all.c | 5 ----- target/i386/hvf/hvf.c | 5 ----- target/i386/whpx/whpx-all.c | 5 ----- 18 files changed, 10 insertions(+), 70 deletions(-)
docs/system/gdb.rst +1 -1
@@ -54,7 +54,7 @@ While GDB can always fall back to inserting breakpoints into memory accelerator. For TCG system emulation we advertise an infinite number of hardware assisted breakpoints and watchpoints. For other accelerators it will depend on if support has been added (see -supports_guest_debug and related hooks in AccelOpsClass). +the AccelGdbConfig structure). As TCG cannot track all memory accesses in user-mode there is no support for watchpoints.
accel/kvm/kvm-cpus.h +0 -1
@@ -16,7 +16,6 @@ void kvm_destroy_vcpu(CPUState *cpu);void kvm_cpu_synchronize_post_reset (CPUState *cpu);void kvm_cpu_synchronize_post_init (CPUState *cpu);void kvm_cpu_synchronize_pre_loadvm (CPUState *cpu); -bool kvm_supports_guest_debug (void );int kvm_insert_breakpoint (CPUState *cpu,int type,vaddr addr,vaddr len);int kvm_remove_breakpoint (CPUState *cpu,int type,vaddr addr,vaddr len);void kvm_remove_all_breakpoints (CPUState *cpu);
include/accel/accel-cpu-ops.h +0 -1
@@ -84,7 +84,6 @@ struct AccelOpsClass {int64_t (*get_elapsed_ticks)(void );/* gdbstub hooks */ -bool (*supports_guest_debug)(void );int (*update_guest_debug)(CPUState *cpu);int (*insert_breakpoint)(CPUState *cpu,int type,vaddr addr,vaddr len);int (*remove_breakpoint)(CPUState *cpu,int type,vaddr addr,vaddr len);
include/qemu/accel.h +2 -0
@@ -84,4 +84,6 @@ typedef struct AccelGdbConfig { bool can_reverse; } AccelGdbConfig; +bool accel_supports_guest_debug (AccelState *accel); +#endif /* QEMU_ACCEL_H */
include/system/hvf_int.h +0 -5
@@ -104,11 +104,6 @@ void hvf_arch_remove_all_hw_breakpoints(void);*/ int hvf_update_guest_debug (CPUState *cpu); -/* -* Return whether the guest supports debugging. -*/ -bool hvf_arch_supports_guest_debug (void ); -bool hvf_arch_cpu_realize (CPUState *cpu,Error **errp);uint32_t hvf_arch_get_default_ipa_bit_size (void );uint32_t hvf_arch_get_max_ipa_bit_size (void );
include/system/kvm_int.h +0 -1
@@ -118,7 +118,6 @@ struct KVMState#endif int max_nested_state_len;int kvm_shadow_mem; -bool have_guest_debug;bool kernel_irqchip_allowed;bool kernel_irqchip_required;OnOffAuto kernel_irqchip_split;
include/system/whpx-all.h +0 -3
@@ -22,7 +22,4 @@ void whpx_translate_cpu_breakpoints(void whpx_arch_destroy_vcpu (CPUState *cpu);void whpx_arch_accel_class_init (ObjectClass *oc); -/* called by whpx-accel-ops */ -bool whpx_arch_supports_guest_debug (void ); -#endif
accel/accel-common.c +5 -0
@@ -70,6 +70,11 @@ void accel_init_interfaces(AccelClass *ac)accel_init_cpu_interfaces (ac); } +bool accel_supports_guest_debug (AccelState *accel) +{ +return accel->gdbstub.sstep_flags &SSTEP_ENABLE ; +} +void accel_cpu_instance_init (CPUState *cpu) {if (cpu->cc->accel_cpu && cpu->cc->accel_cpu->cpu_instance_init) {
accel/hvf/hvf-accel-ops.c +0 -1
@@ -369,7 +369,6 @@ static void hvf_accel_ops_class_init(ObjectClass *oc, const void *data) ops->remove_breakpoint = hvf_remove_breakpoint; ops->remove_all_breakpoints = hvf_remove_all_breakpoints; ops->update_guest_debug = hvf_update_guest_debug; - ops->supports_guest_debug = hvf_arch_supports_guest_debug; ops->get_vcpu_stats = hvf_get_vcpu_stats; };
accel/kvm/kvm-accel-ops.c +0 -1
@@ -105,7 +105,6 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, const void *data) ops->synchronize_pre_loadvm = kvm_cpu_synchronize_pre_loadvm; ops->handle_interrupt = generic_handle_interrupt; - ops->supports_guest_debug = kvm_supports_guest_debug;#ifdef TARGET_KVM_HAVE_GUEST_DEBUG ops->update_guest_debug = kvm_update_guest_debug_ops; ops->insert_breakpoint = kvm_insert_breakpoint;
accel/kvm/kvm-all.c +1 -12
@@ -3036,10 +3036,7 @@ static int kvm_init(AccelState *as, MachineState *ms) (kvm_check_extension (s,KVM_CAP_VM_ATTRIBUTES ) >0 );#ifdef TARGET_KVM_HAVE_GUEST_DEBUG - s->have_guest_debug = - (kvm_check_extension (s,KVM_CAP_SET_GUEST_DEBUG ) >0 ); - -if (s->have_guest_debug) { +if (kvm_check_extension (s,KVM_CAP_SET_GUEST_DEBUG ) >0 ) { as->gdbstub.sstep_flags =SSTEP_ENABLE ; int guest_debug_flags =
@@ -3829,14 +3826,6 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)return data.err; } -bool kvm_supports_guest_debug (void ) -{ -KVMState *s =KVM_STATE (as); - -/* probed during kvm_init() */ -return s->have_guest_debug; -} -int kvm_insert_breakpoint (CPUState *cpu,int type,vaddr addr,vaddr len) {struct kvm_sw_breakpoint *bp;
accel/tcg/tcg-accel-ops.c +0 -6
@@ -109,11 +109,6 @@ void tcg_handle_interrupt(CPUState *cpu, int mask) } } -static bool tcg_supports_guest_debug (void ) -{ -return true; -} -/* Translate GDB watchpoint type to a flags value for cpu_watchpoint_* */ static inline int xlat_gdb_type (CPUState *cpu,int gdbtype) {
@@ -221,7 +216,6 @@ static void tcg_accel_ops_init(AccelClass *ac) } ops->cpu_reset_hold = tcg_cpu_reset_hold; - ops->supports_guest_debug = tcg_supports_guest_debug; ops->insert_breakpoint = tcg_insert_breakpoint; ops->remove_breakpoint = tcg_remove_breakpoint; ops->remove_all_breakpoints = tcg_remove_all_breakpoints;
accel/whpx/whpx-accel-ops.c +0 -6
@@ -82,11 +82,6 @@ static bool whpx_vcpu_thread_is_idle(CPUState *cpu)return !whpx_irqchip_in_kernel (); } -static bool whpx_supports_guest_debug (void ) -{ -return whpx_arch_supports_guest_debug (); -} -static void whpx_accel_ops_class_init (ObjectClass *oc,const void *data) {
@@ -96,7 +91,6 @@ static void whpx_accel_ops_class_init(ObjectClass *oc, const void *data) ops->kick_vcpu_thread = whpx_kick_vcpu_thread; ops->cpu_thread_is_idle = whpx_vcpu_thread_is_idle; ops->handle_interrupt = generic_handle_interrupt; - ops->supports_guest_debug = whpx_supports_guest_debug; ops->synchronize_post_reset = whpx_cpu_synchronize_post_reset; ops->synchronize_post_init = whpx_cpu_synchronize_post_init;
gdbstub/system.c +1 -12
@@ -331,8 +331,6 @@ static void create_processes(GDBState *s)gdb_create_default_process (s); } -static bool gdb_supports_guest_debug (void ); -bool gdbserver_start (const char *device,Error **errp) {Chardev *chr =NULL ;
@@ -345,7 +343,7 @@ bool gdbserver_start(const char *device, Error **errp)return false; } -if (!gdb_supports_guest_debug ()) { +if (!accel_supports_guest_debug (current_accel ())) {error_setg (errp,"gdbstub: current accelerator doesn't " "support guest debugging" );return false;
@@ -624,15 +622,6 @@ int gdb_signal_to_target(int sig)* Break/Watch point helpers */ -static bool gdb_supports_guest_debug (void ) -{ -const AccelOpsClass *ops =cpus_get_accel (); -if (ops->supports_guest_debug) { -return ops->supports_guest_debug (); - } -return false; -} -int gdb_breakpoint_insert (CPUState *cs,int type,vaddr addr,vaddr len) {const AccelOpsClass *ops =cpus_get_accel ();
target/arm/hvf/hvf.c +0 -5
@@ -2900,8 +2900,3 @@ void hvf_arch_update_guest_debug(CPUState *cpu)hvf_arch_set_traps (cpu); } - -bool hvf_arch_supports_guest_debug (void ) -{ -return true; -}
target/arm/whpx/whpx-all.c +0 -5
@@ -295,11 +295,6 @@ void whpx_translate_cpu_breakpoints(/* Breakpoints aren’t supported on this platform */ } -bool whpx_arch_supports_guest_debug (void ) -{ -return false; -} -void whpx_arch_destroy_vcpu (CPUState *cpu) {/* currently empty on Arm */
target/i386/hvf/hvf.c +0 -5
@@ -1066,8 +1066,3 @@ void hvf_arch_remove_all_hw_breakpoints(void)void hvf_arch_update_guest_debug (CPUState *cpu) { } - -bool hvf_arch_supports_guest_debug (void ) -{ -return false; -}
target/i386/whpx/whpx-all.c +0 -5
@@ -1853,11 +1853,6 @@ void whpx_apply_breakpoints( } } -bool whpx_arch_supports_guest_debug (void ) -{ -return true; -} -void whpx_arch_destroy_vcpu (CPUState *cpu) {X86CPU *x86cpu =X86_CPU (cpu);
Signature · 1 line
2.53.0
PATCH v3 18/32 cpu: Move cpu_breakpoint_test out of line
In reply to Philippe Mathieu-DaudéFrom: Richard Henderson <[email protected]>
Move the function to cpu-common.c, with the other
breakpoint functions.
--- include/hw/core/cpu.h | 16 +--------------- cpu-common.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-)
include/hw/core/cpu.h +1 -15
@@ -1157,21 +1157,7 @@ int cpu_breakpoint_insert(CPUState *cpu, vaddr pc, int flags,int cpu_breakpoint_remove (CPUState *cpu,vaddr pc,int flags);void cpu_breakpoint_remove_by_ref (CPUState *cpu,CPUBreakpoint *breakpoint);void cpu_breakpoint_remove_all (CPUState *cpu,int mask); - -/* Return true if PC matches an installed breakpoint. */ -static inline bool cpu_breakpoint_test (CPUState *cpu,vaddr pc,int mask) -{ -CPUBreakpoint *bp; - -if (unlikely (!QTAILQ_EMPTY (&cpu->breakpoints))) { - QTAILQ_FOREACH(bp, &cpu->breakpoints, entry) { -if (bp->pc == pc && (bp->flags & mask)) { -return true; - } - } - } -return false; -} +bool cpu_breakpoint_test (CPUState *cpu,vaddr pc,int mask);/** * cpu_get_address_space:
cpu-common.c +15 -0
@@ -388,6 +388,21 @@ void process_queued_cpu_work(CPUState *cpu)qemu_cond_broadcast (&qemu_work_cond); } +/* Return true if PC matches an installed breakpoint. */ +bool cpu_breakpoint_test (CPUState *cpu,vaddr pc,int mask) +{ +CPUBreakpoint *bp; + +if (unlikely (!QTAILQ_EMPTY (&cpu->breakpoints))) { + QTAILQ_FOREACH(bp, &cpu->breakpoints, entry) { +if (bp->pc == pc && (bp->flags & mask)) { +return true; + } + } + } +return false; +} +/* Add a breakpoint. */ int cpu_breakpoint_insert (CPUState *cpu,vaddr pc,int flags,CPUBreakpoint **breakpoint)
Signature · 1 line
2.53.0
PATCH v3 19/32 cpu: Move BREAKPOINT definitions to 'exec/breakpoint.h'
In reply to Philippe Mathieu-Daudé--- include/exec/breakpoint.h | 14 ++++++++++++++ include/hw/core/cpu.h | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-)
include/exec/breakpoint.h +14 -0
@@ -12,6 +12,20 @@#include "exec/vaddr.h" #include "exec/memattrs.h" +/* Breakpoint/watchpoint flags */ +#define BP_MEM_READ 0x01 +#define BP_MEM_WRITE 0x02 +#define BP_MEM_ACCESS (BP_MEM_READ | BP_MEM_WRITE) +#define BP_STOP_BEFORE_ACCESS 0x04 +/* 0x08 currently unused */ +#define BP_GDB 0x10 +#define BP_CPU 0x20 +#define BP_ANY (BP_GDB | BP_CPU) +#define BP_HIT_SHIFT 6 +#define BP_WATCHPOINT_HIT_READ (BP_MEM_READ << BP_HIT_SHIFT) +#define BP_WATCHPOINT_HIT_WRITE (BP_MEM_WRITE << BP_HIT_SHIFT) +#define BP_WATCHPOINT_HIT (BP_MEM_ACCESS << BP_HIT_SHIFT) + typedef struct CPUBreakpoint { vaddr pc; int flags; /* BP_* */
include/hw/core/cpu.h +0 -14
@@ -1138,20 +1138,6 @@ void qemu_init_vcpu(CPUState *cpu);*/ void cpu_single_step (CPUState *cpu,int enabled); -/* Breakpoint/watchpoint flags */ -#define BP_MEM_READ 0x01 -#define BP_MEM_WRITE 0x02 -#define BP_MEM_ACCESS (BP_MEM_READ | BP_MEM_WRITE) -#define BP_STOP_BEFORE_ACCESS 0x04 -/* 0x08 currently unused */ -#define BP_GDB 0x10 -#define BP_CPU 0x20 -#define BP_ANY (BP_GDB | BP_CPU) -#define BP_HIT_SHIFT 6 -#define BP_WATCHPOINT_HIT_READ (BP_MEM_READ << BP_HIT_SHIFT) -#define BP_WATCHPOINT_HIT_WRITE (BP_MEM_WRITE << BP_HIT_SHIFT) -#define BP_WATCHPOINT_HIT (BP_MEM_ACCESS << BP_HIT_SHIFT) -int cpu_breakpoint_insert (CPUState *cpu,vaddr pc,int flags,CPUBreakpoint **breakpoint);int cpu_breakpoint_remove (CPUState *cpu,vaddr pc,int flags);
Signature · 1 line
2.53.0
PATCH v3 20/32 cpu: Define BreakpointFlags type
In reply to Philippe Mathieu-DaudéUse the BreakpointFlags typedef to better follow when we deal with breakpoint flags (BP_*).
--- include/accel/tcg/cpu-ops.h | 6 ++++-- include/exec/breakpoint.h | 5 +++-- include/exec/watchpoint.h | 6 ++++-- include/hw/core/cpu.h | 4 ++-- accel/tcg/cputlb.c | 12 +++++++----- accel/tcg/tcg-accel-ops.c | 10 +++++----- accel/tcg/user-exec-stub.c | 9 +++++---- accel/tcg/watchpoint.c | 9 +++++---- cpu-common.c | 4 ++-- system/watchpoint.c | 4 ++-- target/arm/tcg/debug.c | 4 ++-- target/arm/tcg/mte_helper.c | 3 ++- target/ppc/cpu.c | 2 +- target/ppc/kvm.c | 5 +++-- target/riscv/cpu_helper.c | 2 +- target/riscv/debug.c | 12 +++++------- target/s390x/tcg/debug.c | 3 ++- target/xtensa/dbg_helper.c | 2 +- 18 files changed, 56 insertions(+), 46 deletions(-)
include/accel/tcg/cpu-ops.h +4 -2
@@ -298,7 +298,8 @@ struct TCGCPUOps {* specified by @flags. Exit via exception with a hit. */ void cpu_check_watchpoint (CPUState *cpu,vaddr addr,vaddr len, -MemTxAttrs attrs,int flags,uintptr_t ra); +MemTxAttrs attrs,BreakpointFlags flags, +uintptr_t ra);/** * cpu_watchpoint_address_matches:
@@ -309,7 +310,8 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len,* Return the watchpoint flags that apply to [addr, addr+len). * If no watchpoint is registered for the range, the result is 0. */ -int cpu_watchpoint_address_matches (CPUState *cpu,vaddr addr,vaddr len); +BreakpointFlags cpu_watchpoint_address_matches (CPUState *cpu, +vaddr addr,vaddr len);/* * Common pointer_wrap implementations.
include/exec/breakpoint.h +3 -2
@@ -12,6 +12,7 @@#include "exec/vaddr.h" #include "exec/memattrs.h" +typedef int BreakpointFlags ;/* Breakpoint/watchpoint flags */ #define BP_MEM_READ 0x01#define BP_MEM_WRITE 0x02
@@ -28,7 +29,7 @@typedef struct CPUBreakpoint {vaddr pc; -int flags;/* BP_* */ +BreakpointFlags flags;QTAILQ_ENTRY (CPUBreakpoint) entry; }CPUBreakpoint ;
@@ -37,7 +38,7 @@ typedef struct CPUWatchpoint {vaddr len;vaddr hitaddr;MemTxAttrs hitattrs; -int flags;/* BP_* */ +BreakpointFlags flags;QTAILQ_ENTRY (CPUWatchpoint) entry; } CPUWatchpoint;
include/exec/watchpoint.h +4 -2
@@ -8,10 +8,12 @@#ifndef EXEC_WATCHPOINT_H #define EXEC_WATCHPOINT_H +#include "exec/breakpoint.h" +int cpu_watchpoint_insert (CPUState *cpu,vaddr addr,vaddr len, -int flags,CPUWatchpoint **watchpoint); +BreakpointFlags flags,CPUWatchpoint **watchpoint);int cpu_watchpoint_remove (CPUState *cpu,vaddr addr, -vaddr len,int flags); +vaddr len,BreakpointFlags flags);void cpu_watchpoint_remove_by_ref (CPUState *cpu,CPUWatchpoint *watchpoint);void cpu_watchpoint_remove_all (CPUState *cpu,int mask);
include/hw/core/cpu.h +2 -2
@@ -1138,9 +1138,9 @@ void qemu_init_vcpu(CPUState *cpu);*/ void cpu_single_step (CPUState *cpu,int enabled); -int cpu_breakpoint_insert (CPUState *cpu,vaddr pc,int flags, +int cpu_breakpoint_insert (CPUState *cpu,vaddr pc,BreakpointFlags flags,CPUBreakpoint **breakpoint); -int cpu_breakpoint_remove (CPUState *cpu,vaddr pc,int flags); +int cpu_breakpoint_remove (CPUState *cpu,vaddr pc,BreakpointFlags flags);void cpu_breakpoint_remove_by_ref (CPUState *cpu,CPUBreakpoint *breakpoint);void cpu_breakpoint_remove_all (CPUState *cpu,int mask);bool cpu_breakpoint_test (CPUState *cpu,vaddr pc,int mask);
accel/tcg/cputlb.c +7 -5
@@ -1033,7 +1033,8 @@ void tlb_set_page_full(CPUState *cpu, int mmu_idx,CPUTLBEntry *te, tn;hwaddr iotlb, xlat, sz, paddr_page;vaddr addr_page; -int asidx, wp_flags, prot; +int asidx, prot; +BreakpointFlags wp_flags;bool is_ram, is_romd;assert_cpu_is_self (cpu);
@@ -1499,8 +1500,8 @@ void *probe_access(CPUArchState *env, vaddr addr, int size,if (unlikely (flags & (TLB_NOTDIRTY |TLB_WATCHPOINT ))) {/* Handle watchpoints. */ if (flags &TLB_WATCHPOINT ) { -int wp_access = (access_type ==MMU_DATA_STORE - ?BP_MEM_WRITE :BP_MEM_READ ); +BreakpointFlags wp_access = (access_type ==MMU_DATA_STORE + ?BP_MEM_WRITE :BP_MEM_READ );cpu_check_watchpoint (env_cpu (env), addr, size, full->attrs, wp_access, retaddr); }
@@ -1702,7 +1703,8 @@ static void mmu_watch_or_dirty(CPUState *cpu, MMULookupPageData *data,/* On watchpoint hit, this will longjmp out. */ if (flags &TLB_WATCHPOINT ) { -int wp = access_type ==MMU_DATA_STORE ?BP_MEM_WRITE :BP_MEM_READ ; +BreakpointFlags wp = access_type ==MMU_DATA_STORE ?BP_MEM_WRITE + :BP_MEM_READ ;cpu_check_watchpoint (cpu, addr, size, full->attrs, wp, ra); flags &= ~TLB_WATCHPOINT ; }
@@ -1885,7 +1887,7 @@ static void *atomic_mmu_lookup(CPUState *cpu, vaddr addr, MemOpIdx oi, }if (unlikely (tlb_addr &TLB_WATCHPOINT )) { -int wp_flags =0 ; +BreakpointFlags wp_flags =0 ;if (full->slow_flags[MMU_DATA_STORE ] &TLB_WATCHPOINT ) { wp_flags |=BP_MEM_WRITE ;
accel/tcg/tcg-accel-ops.c +5 -5
@@ -110,20 +110,20 @@ void tcg_handle_interrupt(CPUState *cpu, int mask) }/* Translate GDB watchpoint type to a flags value for cpu_watchpoint_* */ -static inline int xlat_gdb_type (CPUState *cpu,int gdbtype) +static inline BreakpointFlags xlat_gdb_type (CPUState *cpu,int gdbtype) { -static const int xlat[] = { +static const BreakpointFlags xlat[] = { [GDB_WATCHPOINT_WRITE ] =BP_GDB |BP_MEM_WRITE , [GDB_WATCHPOINT_READ ] =BP_GDB |BP_MEM_READ , [GDB_WATCHPOINT_ACCESS ] =BP_GDB |BP_MEM_ACCESS , }; -int cputype = xlat[gdbtype]; +BreakpointFlags cpuflags = xlat[gdbtype];if (cpu->cc->gdb_stop_before_watchpoint) { - cputype |=BP_STOP_BEFORE_ACCESS ; + cpuflags |=BP_STOP_BEFORE_ACCESS ; } -return cputype; +return cpuflags; }static int tcg_insert_breakpoint (CPUState *cs,int type,vaddr addr,vaddr len)
accel/tcg/user-exec-stub.c +5 -4
@@ -22,13 +22,13 @@ void cpu_exec_reset_hold(CPUState *cpu) }int cpu_watchpoint_insert (CPUState *cpu,vaddr addr,vaddr len, -int flags,CPUWatchpoint **watchpoint) +BreakpointFlags flags,CPUWatchpoint **watchpoint) {return -ENOSYS ; }int cpu_watchpoint_remove (CPUState *cpu,vaddr addr, -vaddr len,int flags) +vaddr len,BreakpointFlags flags) {return -ENOSYS ; }
@@ -41,13 +41,14 @@ void cpu_watchpoint_remove_all(CPUState *cpu, int mask) { } -int cpu_watchpoint_address_matches (CPUState *cpu,vaddr addr,vaddr len) +BreakpointFlags cpu_watchpoint_address_matches (CPUState *cpu, +vaddr addr,vaddr len) {return 0 ; }void cpu_check_watchpoint (CPUState *cpu,vaddr addr,vaddr len, -MemTxAttrs atr,int fl,uintptr_t ra) +MemTxAttrs atr,BreakpointFlags flags,uintptr_t ra) { }
accel/tcg/watchpoint.c +5 -4
@@ -52,10 +52,11 @@ static inline bool watchpoint_address_matches(CPUWatchpoint *wp, }/* Return flags for watchpoints that match addr + prot. */ -int cpu_watchpoint_address_matches (CPUState *cpu,vaddr addr,vaddr len) +BreakpointFlags cpu_watchpoint_address_matches (CPUState *cpu, +vaddr addr,vaddr len) {CPUWatchpoint *wp; -int ret =0 ; +BreakpointFlags ret =0 ; QTAILQ_FOREACH(wp, &cpu->watchpoints, entry) {if (watchpoint_address_matches (wp, addr, len)) {
@@ -67,7 +68,7 @@ int cpu_watchpoint_address_matches(CPUState *cpu, vaddr addr, vaddr len)/* Generate a debug exception if a watchpoint has been hit. */ void cpu_check_watchpoint (CPUState *cpu,vaddr addr,vaddr len, -MemTxAttrs attrs,int flags,uintptr_t ra) +MemTxAttrs attrs,BreakpointFlags flags,uintptr_t ra) {CPUWatchpoint *wp;
@@ -91,7 +92,7 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len,assert ((flags & ~BP_MEM_ACCESS ) ==0 ); QTAILQ_FOREACH(wp, &cpu->watchpoints, entry) { -int hit_flags = wp->flags & flags; +BreakpointFlags hit_flags = wp->flags & flags;if (hit_flags &&watchpoint_address_matches (wp, addr, len)) {if (replay_running_debug ()) {
cpu-common.c +2 -2
@@ -404,7 +404,7 @@ bool cpu_breakpoint_test(CPUState *cpu, vaddr pc, int mask) }/* Add a breakpoint. */ -int cpu_breakpoint_insert (CPUState *cpu,vaddr pc,int flags, +int cpu_breakpoint_insert (CPUState *cpu,vaddr pc,BreakpointFlags flags,CPUBreakpoint **breakpoint) {CPUBreakpoint *bp;
@@ -434,7 +434,7 @@ int cpu_breakpoint_insert(CPUState *cpu, vaddr pc, int flags, }/* Remove a specific breakpoint. */ -int cpu_breakpoint_remove (CPUState *cpu,vaddr pc,int flags) +int cpu_breakpoint_remove (CPUState *cpu,vaddr pc,BreakpointFlags flags) {CPUBreakpoint *bp;
system/watchpoint.c +2 -2
@@ -26,7 +26,7 @@/* Add a watchpoint. */ int cpu_watchpoint_insert (CPUState *cpu,vaddr addr,vaddr len, -int flags,CPUWatchpoint **watchpoint) +BreakpointFlags flags,CPUWatchpoint **watchpoint) {CPUWatchpoint *wp;vaddr in_page;
@@ -65,7 +65,7 @@ int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,/* Remove a specific watchpoint. */ int cpu_watchpoint_remove (CPUState *cpu,vaddr addr,vaddr len, -int flags) +BreakpointFlags flags) {CPUWatchpoint *wp;
target/arm/tcg/debug.c +2 -2
@@ -550,7 +550,7 @@ void hw_watchpoint_update(ARMCPU *cpu, int n)vaddr wvr = env->cp15.dbgwvr[n];uint64_t wcr = env->cp15.dbgwcr[n];int mask; -int flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; +BreakpointFlags flags =BP_CPU |BP_STOP_BEFORE_ACCESS ;if (env->cpu_watchpoint[n]) {cpu_watchpoint_remove_by_ref (CPU (cpu), env->cpu_watchpoint[n]);
@@ -656,7 +656,7 @@ void hw_breakpoint_update(ARMCPU *cpu, int n)uint64_t bcr = env->cp15.dbgbcr[n];vaddr addr;int bt; -int flags =BP_CPU ; +BreakpointFlags flags =BP_CPU ;if (env->cpu_breakpoint[n]) {cpu_breakpoint_remove_by_ref (CPU (cpu), env->cpu_breakpoint[n]);
target/arm/tcg/mte_helper.c +2 -1
@@ -190,7 +190,8 @@ uint8_t *allocation_tag_mem_probe(CPUARMState *env, int ptr_mmu_idx,/* Any debug exception has priority over a tag check exception. */ if (!probe &&unlikely (flags &TLB_WATCHPOINT )) { -int wp = ptr_access ==MMU_DATA_LOAD ?BP_MEM_READ :BP_MEM_WRITE ; +BreakpointFlags wp = ptr_access ==MMU_DATA_LOAD ?BP_MEM_READ + :BP_MEM_WRITE ;assert (ra !=0 );cpu_check_watchpoint (env_cpu (env), ptr, ptr_size, attrs, wp, ra); }
target/ppc/cpu.c +1 -1
@@ -145,7 +145,7 @@ void ppc_update_daw(CPUPPCState *env, int rid)bool sv =extract32 (dawrx,PPC_BIT_NR (62 ),1 );bool pr =extract32 (dawrx,PPC_BIT_NR (62 ),1 );vaddr len; -int flags; +BreakpointFlags flags;if (env->dawr_watchpoint[rid]) {cpu_watchpoint_remove_by_ref (cs, env->dawr_watchpoint[rid]);
target/ppc/kvm.c +3 -2
@@ -1429,7 +1429,7 @@ static int find_hw_breakpoint(target_ulong addr, int type)return -1 ; } -static int find_hw_watchpoint (target_ulong addr,int *flag) +static int find_hw_watchpoint (target_ulong addr,BreakpointFlags *flag) {int n;
@@ -1575,7 +1575,6 @@ static int kvm_handle_hw_breakpoint(CPUState *cs, {int handle =DEBUG_RETURN_GUEST ;int n; -int flag =0 ;if (nb_hw_breakpoint + nb_hw_watchpoint >0 ) {if (arch_info->status &KVMPPC_DEBUG_BREAKPOINT ) {
@@ -1585,6 +1584,8 @@ static int kvm_handle_hw_breakpoint(CPUState *cs, } }else if (arch_info->status & (KVMPPC_DEBUG_WATCH_READ |KVMPPC_DEBUG_WATCH_WRITE )) { +BreakpointFlags flag =0 ; + n =find_hw_watchpoint (arch_info->address, &flag);if (n >=0 ) { handle =DEBUG_RETURN_GDB ;
target/riscv/cpu_helper.c +1 -1
@@ -2000,7 +2000,7 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, }else if (probe) {return false; }else { -int wp_access =0 ; +BreakpointFlags wp_access =0 ;if (access_type ==MMU_DATA_LOAD ) { wp_access |=BP_MEM_READ ;
target/riscv/debug.c +5 -7
@@ -480,7 +480,7 @@ static void type2_breakpoint_insert(CPURISCVState *env, target_ulong index)target_ulong addr = env->tdata2[index];bool enabled =type2_breakpoint_enabled (ctrl);CPUState *cs =env_cpu (env); -int flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; +BreakpointFlags flags =BP_CPU |BP_STOP_BEFORE_ACCESS ;uint32_t size, def_size;if (!enabled) {
@@ -605,7 +605,7 @@ static void type6_breakpoint_insert(CPURISCVState *env, target_ulong index)target_ulong addr = env->tdata2[index];bool enabled =type6_breakpoint_enabled (ctrl);CPUState *cs =env_cpu (env); -int flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; +BreakpointFlags flags =BP_CPU |BP_STOP_BEFORE_ACCESS ;uint32_t size;if (!enabled) {
@@ -993,12 +993,10 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp)CPURISCVState *env = &cpu->env;target_ulong ctrl;target_ulong addr; -int trigger_type; -int flags; -int i; -for (i =0 ; i < env->num_triggers; i++) { - trigger_type =get_trigger_type (env, i); +for (int i =0 ; i < env->num_triggers; i++) { +int trigger_type =get_trigger_type (env, i); +BreakpointFlags flags;if (!trigger_common_match (env, trigger_type, i)) {continue ;
target/s390x/tcg/debug.c +2 -1
@@ -14,7 +14,8 @@void s390_cpu_recompute_watchpoints (CPUState *cs) { -const int wp_flags =BP_CPU |BP_MEM_WRITE |BP_STOP_BEFORE_ACCESS ; +const BreakpointFlags wp_flags =BP_CPU |BP_MEM_WRITE + |BP_STOP_BEFORE_ACCESS ;CPUS390XState *env =cpu_env (cs);/* We are called when the watchpoints have changed. First
target/xtensa/dbg_helper.c +1 -1
@@ -85,7 +85,7 @@ static void set_dbreak(CPUXtensaState *env, unsigned i, uint32_t dbreaka, uint32_t dbreakc) {CPUState *cs =env_cpu (env); -int flags =BP_CPU |BP_STOP_BEFORE_ACCESS ; +BreakpointFlags flags =BP_CPU |BP_STOP_BEFORE_ACCESS ;uint32_t mask = dbreakc | ~DBREAKC_MASK ;if (env->cpu_watchpoint[i]) {
Signature · 1 line
2.53.0
PATCH v3 21/32 accel: Remove unnecessary 'inline' qualifier in remove_all_breakpoints
In reply to Philippe Mathieu-Daudé--- accel/tcg/tcg-accel-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
accel/tcg/tcg-accel-ops.c +1 -1
@@ -188,7 +188,7 @@ static int tcg_remove_breakpoint(CPUState *cs, int type, vaddr addr, vaddr len) } } -static inline void tcg_remove_all_breakpoints (CPUState *cpu) +static void tcg_remove_all_breakpoints (CPUState *cpu) {cpu_breakpoint_remove_all (cpu,BP_GDB );cpu_watchpoint_remove_all (cpu,BP_GDB );
Signature · 1 line
2.53.0
PATCH v3 22/32 gdbstub/user: Directly call gdb_breakpoint_remove_all() in user mode
In reply to Philippe Mathieu-DaudéNo need to deref external methods with unused argument to end up calling a method defined in the same unit file, call it directly.
--- gdbstub/user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
gdbstub/user.c +1 -1
@@ -557,7 +557,7 @@ static void disable_gdbstub(CPUState *thread_cpu)close (gdbserver_user_state.fd); gdbserver_user_state.fd =-1 ;CPU_FOREACH (cpu) { -cpu_breakpoint_remove_all (cpu,BP_GDB ); +gdb_breakpoint_remove_all (cpu);/* no cpu_watchpoint_remove_all for user-mode */ cpu_single_step (cpu,0 ); }
Signature · 1 line
2.53.0
PATCH v3 23/32 gdbstub: Reduce @type variable scope
In reply to Philippe Mathieu-Daudé--- gdbstub/system.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
gdbstub/system.c +2 -1
@@ -125,7 +125,6 @@ static void gdb_vm_state_change(void *opaque, bool running, RunState state)CPUState *cpu = gdbserver_state.c_cpu;g_autoptr (GString) buf =g_string_new (NULL );g_autoptr (GString) tid =g_string_new (NULL ); -const char *type;int ret;if (running || gdbserver_state.state ==RS_INACTIVE ) {
@@ -151,6 +150,8 @@ static void gdb_vm_state_change(void *opaque, bool running, RunState state)switch (state) {case RUN_STATE_DEBUG :if (cpu->watchpoint_hit) { +const char *type; +switch (cpu->watchpoint_hit->flags &BP_MEM_ACCESS ) {case BP_MEM_READ : type ="r" ;
Signature · 1 line
2.53.0
PATCH v3 24/32 gdbstub: Introduce GdbBreakpointType enumerator
In reply to Philippe Mathieu-DaudéIntroduce the GdbBreakpointType enumerator to better follow code related to GDB protocol handling.
--- gdbstub/internals.h | 7 +++++-- include/gdbstub/enums.h | 12 +++++++----- gdbstub/system.c | 6 ++++-- gdbstub/user.c | 6 ++++-- 4 files changed, 20 insertions(+), 11 deletions(-)
gdbstub/internals.h +5 -2
@@ -11,6 +11,7 @@#include "qemu/accel.h" #include "exec/cpu-common.h" +#include "gdbstub/enums.h" /* * Most "large" transfers (e.g. memory reads, feature XML
@@ -217,8 +218,10 @@ void gdb_syscall_handling(const char *syscall_packet);* Break/Watch point support - there is an implementation for system * and user mode. */ -int gdb_breakpoint_insert (CPUState *cs,int type,vaddr addr,vaddr len); -int gdb_breakpoint_remove (CPUState *cs,int type,vaddr addr,vaddr len); +int gdb_breakpoint_insert (CPUState *cs,GdbBreakpointType type, +vaddr addr,vaddr len); +int gdb_breakpoint_remove (CPUState *cs,GdbBreakpointType type, +vaddr addr,vaddr len);void gdb_breakpoint_remove_all (CPUState *cs);/**
include/gdbstub/enums.h +7 -5
@@ -12,10 +12,12 @@#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 enum GdbBreakpointType { +GDB_BREAKPOINT_SW =0 , +GDB_BREAKPOINT_HW =1 , +GDB_WATCHPOINT_WRITE =2 , +GDB_WATCHPOINT_READ =3 , +GDB_WATCHPOINT_ACCESS =4 , +}GdbBreakpointType ;#endif /* GDBSTUB_ENUMS_H */
gdbstub/system.c +4 -2
@@ -623,7 +623,8 @@ int gdb_signal_to_target(int sig)* Break/Watch point helpers */ -int gdb_breakpoint_insert (CPUState *cs,int type,vaddr addr,vaddr len) +int gdb_breakpoint_insert (CPUState *cs,GdbBreakpointType type, +vaddr addr,vaddr len) {const AccelOpsClass *ops =cpus_get_accel ();if (ops->insert_breakpoint) {
@@ -632,7 +633,8 @@ int gdb_breakpoint_insert(CPUState *cs, int type, vaddr addr, vaddr len)return -ENOSYS ; } -int gdb_breakpoint_remove (CPUState *cs,int type,vaddr addr,vaddr len) +int gdb_breakpoint_remove (CPUState *cs,GdbBreakpointType type, +vaddr addr,vaddr len) {const AccelOpsClass *ops =cpus_get_accel ();if (ops->remove_breakpoint) {
gdbstub/user.c +4 -2
@@ -790,7 +790,8 @@ unsigned int gdb_get_max_cpus(void)* Break/Watch point helpers */ -int gdb_breakpoint_insert (CPUState *cs,int type,vaddr addr,vaddr len) +int gdb_breakpoint_insert (CPUState *cs,GdbBreakpointType type, +vaddr addr,vaddr len) {CPUState *cpu;int err =0 ;
@@ -811,7 +812,8 @@ int gdb_breakpoint_insert(CPUState *cs, int type, vaddr addr, vaddr len) } } -int gdb_breakpoint_remove (CPUState *cs,int type,vaddr addr,vaddr len) +int gdb_breakpoint_remove (CPUState *cs,GdbBreakpointType type, +vaddr addr,vaddr len) {CPUState *cpu;int err =0 ;
Signature · 1 line
2.53.0
PATCH v3 25/32 accel: Use GdbBreakpointType enum
In reply to Philippe Mathieu-DaudéInclude '_gdbstub_' in the AccelOpsClass handlers to emphasize we are handling gdbstub-related requests.
--- accel/kvm/kvm-cpus.h | 11 ++++++++--- include/accel/accel-cpu-ops.h | 9 ++++++--- include/system/hvf_int.h | 9 ++++++--- include/system/kvm.h | 9 ++++++--- target/arm/internals.h | 5 +++-- accel/hvf/hvf-accel-ops.c | 20 +++++++++++--------- accel/kvm/kvm-accel-ops.c | 6 +++--- accel/kvm/kvm-all.c | 14 ++++++++------ accel/tcg/tcg-accel-ops.c | 17 ++++++++++------- gdbstub/system.c | 12 ++++++------ target/arm/hvf/hvf.c | 12 +++++++----- target/arm/hyp_gdbstub.c | 8 ++++---- target/arm/kvm.c | 12 +++++++----- target/i386/hvf/hvf.c | 8 +++++--- target/i386/kvm/kvm.c | 12 +++++++----- target/loongarch/kvm/kvm.c | 8 +++++--- target/ppc/kvm.c | 12 +++++++----- target/riscv/kvm/kvm-cpu.c | 8 +++++--- target/s390x/kvm/kvm.c | 8 +++++--- 19 files changed, 119 insertions(+), 81 deletions(-)
accel/kvm/kvm-cpus.h +8 -3
@@ -10,13 +10,18 @@#ifndef KVM_CPUS_H #define KVM_CPUS_H +#include "gdbstub/enums.h" +int kvm_init_vcpu (CPUState *cpu,Error **errp);int kvm_cpu_exec (CPUState *cpu);void kvm_destroy_vcpu (CPUState *cpu);void kvm_cpu_synchronize_post_reset (CPUState *cpu);void kvm_cpu_synchronize_post_init (CPUState *cpu);void kvm_cpu_synchronize_pre_loadvm (CPUState *cpu); -int kvm_insert_breakpoint (CPUState *cpu,int type,vaddr addr,vaddr len); -int kvm_remove_breakpoint (CPUState *cpu,int type,vaddr addr,vaddr len); -void kvm_remove_all_breakpoints (CPUState *cpu); +int kvm_insert_gdbstub_breakpoint (CPUState *cpu,GdbBreakpointType type, +vaddr addr,vaddr len); +int kvm_remove_gdbstub_breakpoint (CPUState *cpu,GdbBreakpointType type, +vaddr addr,vaddr len); +void kvm_remove_all_gdbstub_breakpoints (CPUState *cpu); +#endif /* KVM_CPUS_H */
include/accel/accel-cpu-ops.h +6 -3
@@ -13,6 +13,7 @@#include "qemu/accel.h" #include "exec/vaddr.h" #include "qom/object.h" +#include "gdbstub/enums.h" #define ACCEL_OPS_SUFFIX "-ops"#define TYPE_ACCEL_OPS "accel" ACCEL_OPS_SUFFIX
@@ -85,9 +86,11 @@ struct AccelOpsClass {/* gdbstub hooks */ int (*update_guest_debug)(CPUState *cpu); -int (*insert_breakpoint)(CPUState *cpu,int type,vaddr addr,vaddr len); -int (*remove_breakpoint)(CPUState *cpu,int type,vaddr addr,vaddr len); -void (*remove_all_breakpoints)(CPUState *cpu); +int (*insert_gdbstub_breakpoint)(CPUState *cpu,GdbBreakpointType type, +vaddr addr,vaddr len); +int (*remove_gdbstub_breakpoint)(CPUState *cpu,GdbBreakpointType type, +vaddr addr,vaddr len); +void (*remove_all_gdbstub_breakpoints)(CPUState *cpu); };void generic_handle_interrupt (CPUState *cpu,int mask);
include/system/hvf_int.h +6 -3
@@ -13,6 +13,7 @@#include "qemu/queue.h" #include "exec/vaddr.h" +#include "gdbstub/enums.h" #include "qom/object.h" #include "accel/accel-ops.h"
@@ -91,9 +92,11 @@ int hvf_sw_breakpoints_active(CPUState *cpu);int hvf_arch_insert_sw_breakpoint (CPUState *cpu,struct hvf_sw_breakpoint *bp);int hvf_arch_remove_sw_breakpoint (CPUState *cpu,struct hvf_sw_breakpoint *bp); -int hvf_arch_insert_hw_breakpoint (vaddr addr,vaddr len,int type); -int hvf_arch_remove_hw_breakpoint (vaddr addr,vaddr len,int type); -void hvf_arch_remove_all_hw_breakpoints (void ); +int hvf_arch_insert_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type); +int hvf_arch_remove_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type); +void hvf_arch_remove_all_gdbstub_hw_breakpoints (void );/* * hvf_update_guest_debug:
include/system/kvm.h +6 -3
@@ -17,6 +17,7 @@#define QEMU_KVM_H #include "exec/memattrs.h" +#include "gdbstub/enums.h" #include "qemu/accel.h" #include "accel/accel-route.h" #include "qom/object.h"
@@ -412,9 +413,11 @@ int kvm_arch_insert_sw_breakpoint(CPUState *cpu, struct kvm_sw_breakpoint *bp);int kvm_arch_remove_sw_breakpoint (CPUState *cpu,struct kvm_sw_breakpoint *bp); -int kvm_arch_insert_hw_breakpoint (vaddr addr,vaddr len,int type); -int kvm_arch_remove_hw_breakpoint (vaddr addr,vaddr len,int type); -void kvm_arch_remove_all_hw_breakpoints (void ); +int kvm_arch_insert_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type); +int kvm_arch_remove_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type); +void kvm_arch_remove_all_gdbstub_hw_breakpoints (void );void kvm_arch_update_guest_debug (CPUState *cpu,struct kvm_guest_debug *dbg);
target/arm/internals.h +3 -2
@@ -29,6 +29,7 @@#include "exec/vaddr.h" #include "exec/breakpoint.h" #include "exec/memop.h" +#include "gdbstub/enums.h" #ifdef CONFIG_TCG #include "accel/tcg/tb-cpu-state.h" #include "tcg/tcg-gvec-desc.h"
@@ -1968,8 +1969,8 @@ int delete_hw_breakpoint(vaddr pc);bool check_watchpoint_in_range (int i,vaddr addr);CPUWatchpoint *find_hw_watchpoint (CPUState *cpu,vaddr addr); -int insert_hw_watchpoint (vaddr addr,vaddr len,int type); -int delete_hw_watchpoint (vaddr addr,vaddr len,int type); +int insert_gdbstub_hw_watchpoint (vaddr addr,vaddr len,GdbBreakpointType type); +int delete_gdbstub_hw_watchpoint (vaddr addr,vaddr len,GdbBreakpointType type);/* Return the current value of the system counter in ticks */ uint64_t gt_get_countervalue (CPUARMState *env);
accel/hvf/hvf-accel-ops.c +11 -9
@@ -233,7 +233,8 @@ int hvf_update_guest_debug(CPUState *cpu)return 0 ; } -static int hvf_insert_breakpoint (CPUState *cpu,int type,vaddr addr,vaddr len) +static int hvf_insert_gdbstub_breakpoint (CPUState *cpu,GdbBreakpointType type, +vaddr addr,vaddr len) {struct hvf_sw_breakpoint *bp;int err;
@@ -256,7 +257,7 @@ static int hvf_insert_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr len)QTAILQ_INSERT_HEAD (&hvf_state->hvf_sw_breakpoints, bp, entry); }else { - err =hvf_arch_insert_hw_breakpoint (addr, len, type); + err =hvf_arch_insert_gdbstub_hw_breakpoint (addr, len, type);if (err) {return err; }
@@ -271,7 +272,8 @@ static int hvf_insert_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr len)return 0 ; } -static int hvf_remove_breakpoint (CPUState *cpu,int type,vaddr addr,vaddr len) +static int hvf_remove_gdbstub_breakpoint (CPUState *cpu,GdbBreakpointType type, +vaddr addr,vaddr len) {struct hvf_sw_breakpoint *bp;int err;
@@ -295,7 +297,7 @@ static int hvf_remove_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr len)QTAILQ_REMOVE (&hvf_state->hvf_sw_breakpoints, bp, entry);g_free (bp); }else { - err =hvf_arch_remove_hw_breakpoint (addr, len, type); + err =hvf_arch_remove_gdbstub_hw_breakpoint (addr, len, type);if (err) {return err; }
@@ -310,7 +312,7 @@ static int hvf_remove_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr len)return 0 ; } -static void hvf_remove_all_breakpoints (CPUState *cpu) +static void hvf_remove_all_gdbstub_breakpoints (CPUState *cpu) {struct hvf_sw_breakpoint *bp, *next;CPUState *tmpcpu;
@@ -328,7 +330,7 @@ static void hvf_remove_all_breakpoints(CPUState *cpu)QTAILQ_REMOVE (&hvf_state->hvf_sw_breakpoints, bp, entry);g_free (bp); } -hvf_arch_remove_all_hw_breakpoints (); +hvf_arch_remove_all_gdbstub_hw_breakpoints ();CPU_FOREACH (cpu) {hvf_update_guest_debug (cpu);
@@ -365,9 +367,9 @@ static void hvf_accel_ops_class_init(ObjectClass *oc, const void *data) ops->synchronize_state = hvf_cpu_synchronize_state; ops->synchronize_pre_loadvm = hvf_cpu_synchronize_pre_loadvm; - ops->insert_breakpoint = hvf_insert_breakpoint; - ops->remove_breakpoint = hvf_remove_breakpoint; - ops->remove_all_breakpoints = hvf_remove_all_breakpoints; + ops->insert_gdbstub_breakpoint = hvf_insert_gdbstub_breakpoint; + ops->remove_gdbstub_breakpoint = hvf_remove_gdbstub_breakpoint; + ops->remove_all_gdbstub_breakpoints = hvf_remove_all_gdbstub_breakpoints; ops->update_guest_debug = hvf_update_guest_debug; ops->get_vcpu_stats = hvf_get_vcpu_stats;
accel/kvm/kvm-accel-ops.c +3 -3
@@ -107,9 +107,9 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, const void *data)#ifdef TARGET_KVM_HAVE_GUEST_DEBUG ops->update_guest_debug = kvm_update_guest_debug_ops; - ops->insert_breakpoint = kvm_insert_breakpoint; - ops->remove_breakpoint = kvm_remove_breakpoint; - ops->remove_all_breakpoints = kvm_remove_all_breakpoints; + ops->insert_gdbstub_breakpoint = kvm_insert_gdbstub_breakpoint; + ops->remove_gdbstub_breakpoint = kvm_remove_gdbstub_breakpoint; + ops->remove_all_gdbstub_breakpoints = kvm_remove_all_gdbstub_breakpoints;#endif }
accel/kvm/kvm-all.c +8 -6
@@ -3826,7 +3826,8 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)return data.err; } -int kvm_insert_breakpoint (CPUState *cpu,int type,vaddr addr,vaddr len) +int kvm_insert_gdbstub_breakpoint (CPUState *cpu,GdbBreakpointType type, +vaddr addr,vaddr len) {struct kvm_sw_breakpoint *bp;int err;
@@ -3849,7 +3850,7 @@ int kvm_insert_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr len)QTAILQ_INSERT_HEAD (&cpu->kvm_state->kvm_sw_breakpoints, bp, entry); }else { - err =kvm_arch_insert_hw_breakpoint (addr, len, type); + err =kvm_arch_insert_gdbstub_hw_breakpoint (addr, len, type);if (err) {return err; }
@@ -3864,7 +3865,8 @@ int kvm_insert_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr len)return 0 ; } -int kvm_remove_breakpoint (CPUState *cpu,int type,vaddr addr,vaddr len) +int kvm_remove_gdbstub_breakpoint (CPUState *cpu,GdbBreakpointType type, +vaddr addr,vaddr len) {struct kvm_sw_breakpoint *bp;int err;
@@ -3888,7 +3890,7 @@ int kvm_remove_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr len)QTAILQ_REMOVE (&cpu->kvm_state->kvm_sw_breakpoints, bp, entry);g_free (bp); }else { - err =kvm_arch_remove_hw_breakpoint (addr, len, type); + err =kvm_arch_remove_gdbstub_hw_breakpoint (addr, len, type);if (err) {return err; }
@@ -3903,7 +3905,7 @@ int kvm_remove_breakpoint(CPUState *cpu, int type, vaddr addr, vaddr len)return 0 ; } -void kvm_remove_all_breakpoints (CPUState *cpu) +void kvm_remove_all_gdbstub_breakpoints (CPUState *cpu) {struct kvm_sw_breakpoint *bp, *next;KVMState *s = cpu->kvm_state;
@@ -3921,7 +3923,7 @@ void kvm_remove_all_breakpoints(CPUState *cpu)QTAILQ_REMOVE (&s->kvm_sw_breakpoints, bp, entry);g_free (bp); } -kvm_arch_remove_all_hw_breakpoints (); +kvm_arch_remove_all_gdbstub_hw_breakpoints ();CPU_FOREACH (cpu) {kvm_update_guest_debug (cpu,0 );
accel/tcg/tcg-accel-ops.c +10 -7
@@ -110,7 +110,8 @@ void tcg_handle_interrupt(CPUState *cpu, int mask) }/* Translate GDB watchpoint type to a flags value for cpu_watchpoint_* */ -static inline BreakpointFlags xlat_gdb_type (CPUState *cpu,int gdbtype) +static inline BreakpointFlags xlat_gdb_type (CPUState *cpu, +GdbBreakpointType gdbtype) {static const BreakpointFlags xlat[] = { [GDB_WATCHPOINT_WRITE ] =BP_GDB |BP_MEM_WRITE ,
@@ -126,7 +127,8 @@ static inline BreakpointFlags xlat_gdb_type(CPUState *cpu, int gdbtype)return cpuflags; } -static int tcg_insert_breakpoint (CPUState *cs,int type,vaddr addr,vaddr len) +static int tcg_insert_gdbstub_breakpoint (CPUState *cs,GdbBreakpointType type, +vaddr addr,vaddr len) {CPUState *cpu;int err =0 ;
@@ -157,7 +159,8 @@ static int tcg_insert_breakpoint(CPUState *cs, int type, vaddr addr, vaddr len) } } -static int tcg_remove_breakpoint (CPUState *cs,int type,vaddr addr,vaddr len) +static int tcg_remove_gdbstub_breakpoint (CPUState *cs,GdbBreakpointType type, +vaddr addr,vaddr len) {CPUState *cpu;int err =0 ;
@@ -188,7 +191,7 @@ static int tcg_remove_breakpoint(CPUState *cs, int type, vaddr addr, vaddr len) } } -static void tcg_remove_all_breakpoints (CPUState *cpu) +static void tcg_remove_all_gdbstub_breakpoints (CPUState *cpu) {cpu_breakpoint_remove_all (cpu,BP_GDB );cpu_watchpoint_remove_all (cpu,BP_GDB );
@@ -216,9 +219,9 @@ static void tcg_accel_ops_init(AccelClass *ac) } ops->cpu_reset_hold = tcg_cpu_reset_hold; - ops->insert_breakpoint = tcg_insert_breakpoint; - ops->remove_breakpoint = tcg_remove_breakpoint; - ops->remove_all_breakpoints = tcg_remove_all_breakpoints; + ops->insert_gdbstub_breakpoint = tcg_insert_gdbstub_breakpoint; + ops->remove_gdbstub_breakpoint = tcg_remove_gdbstub_breakpoint; + ops->remove_all_gdbstub_breakpoints = tcg_remove_all_gdbstub_breakpoints; }static void tcg_accel_ops_class_init (ObjectClass *oc,const void *data)
gdbstub/system.c +6 -6
@@ -627,8 +627,8 @@ int gdb_breakpoint_insert(CPUState *cs, GdbBreakpointType type, vaddr addr, vaddr len) {const AccelOpsClass *ops =cpus_get_accel (); -if (ops->insert_breakpoint) { -return ops->insert_breakpoint (cs, type, addr, len); +if (ops->insert_gdbstub_breakpoint) { +return ops->insert_gdbstub_breakpoint (cs, type, addr, len); }return -ENOSYS ; }
@@ -637,8 +637,8 @@ int gdb_breakpoint_remove(CPUState *cs, GdbBreakpointType type, vaddr addr, vaddr len) {const AccelOpsClass *ops =cpus_get_accel (); -if (ops->remove_breakpoint) { -return ops->remove_breakpoint (cs, type, addr, len); +if (ops->remove_gdbstub_breakpoint) { +return ops->remove_gdbstub_breakpoint (cs, type, addr, len); }return -ENOSYS ; }
@@ -646,8 +646,8 @@ int gdb_breakpoint_remove(CPUState *cs, GdbBreakpointType type,void gdb_breakpoint_remove_all (CPUState *cs) {const AccelOpsClass *ops =cpus_get_accel (); -if (ops->remove_all_breakpoints) { - ops->remove_all_breakpoints (cs); +if (ops->remove_all_gdbstub_breakpoints) { + ops->remove_all_gdbstub_breakpoints (cs); } }
target/arm/hvf/hvf.c +7 -5
@@ -2726,7 +2726,8 @@ int hvf_arch_remove_sw_breakpoint(CPUState *cpu, struct hvf_sw_breakpoint *bp)return 0 ; } -int hvf_arch_insert_hw_breakpoint (vaddr addr,vaddr len,int type) +int hvf_arch_insert_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {switch (type) {case GDB_BREAKPOINT_HW :
@@ -2734,13 +2735,14 @@ int hvf_arch_insert_hw_breakpoint(vaddr addr, vaddr len, int type)case GDB_WATCHPOINT_READ :case GDB_WATCHPOINT_WRITE :case GDB_WATCHPOINT_ACCESS : -return insert_hw_watchpoint (addr, len, type); +return insert_gdbstub_hw_watchpoint (addr, len, type);default :return -ENOSYS ; } } -int hvf_arch_remove_hw_breakpoint (vaddr addr,vaddr len,int type) +int hvf_arch_remove_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {switch (type) {case GDB_BREAKPOINT_HW :
@@ -2748,13 +2750,13 @@ int hvf_arch_remove_hw_breakpoint(vaddr addr, vaddr len, int type)case GDB_WATCHPOINT_READ :case GDB_WATCHPOINT_WRITE :case GDB_WATCHPOINT_ACCESS : -return delete_hw_watchpoint (addr, len, type); +return delete_gdbstub_hw_watchpoint (addr, len, type);default :return -ENOSYS ; } } -void hvf_arch_remove_all_hw_breakpoints (void ) +void hvf_arch_remove_all_gdbstub_hw_breakpoints (void ) {if (cur_hw_wps >0 ) {g_array_remove_range (hw_watchpoints,0 , cur_hw_wps);
target/arm/hyp_gdbstub.c +4 -4
@@ -94,7 +94,7 @@ int delete_hw_breakpoint(vaddr pc) }/** -* insert_hw_watchpoint() +* insert_gdbstub_hw_watchpoint() * @addr: address of watch point * @len: size of area * @type: type of watch point
@@ -125,7 +125,7 @@ int delete_hw_breakpoint(vaddr pc)* need to ensure you mask the address as required and set BAS=0xff */ -int insert_hw_watchpoint (vaddr addr,vaddr len,int type) +int insert_gdbstub_hw_watchpoint (vaddr addr,vaddr len,GdbBreakpointType type) {HWWatchpoint wp = { .wcr =R_DBGWCR_E_MASK ,/* E=1, enable */
@@ -208,13 +208,13 @@ bool check_watchpoint_in_range(int i, vaddr addr) }/** -* delete_hw_watchpoint() +* delete_gdbstub_hw_watchpoint() * @addr: address of breakpoint * * Delete a breakpoint and shuffle any above down */ -int delete_hw_watchpoint (vaddr addr,vaddr len,int type) +int delete_gdbstub_hw_watchpoint (vaddr addr,vaddr len,GdbBreakpointType type) {int i;for (i =0 ; i < cur_hw_wps; i++) {
target/arm/kvm.c +7 -5
@@ -1784,7 +1784,8 @@ void kvm_arch_accel_class_init(ObjectClass *oc) "Eager Page Split chunk size for hugepages. (default: 0, disabled)"); } -int kvm_arch_insert_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_insert_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {switch (type) {case GDB_BREAKPOINT_HW :
@@ -1793,13 +1794,14 @@ int kvm_arch_insert_hw_breakpoint(vaddr addr, vaddr len, int type)case GDB_WATCHPOINT_READ :case GDB_WATCHPOINT_WRITE :case GDB_WATCHPOINT_ACCESS : -return insert_hw_watchpoint (addr, len, type); +return insert_gdbstub_hw_watchpoint (addr, len, type);default :return -ENOSYS ; } } -int kvm_arch_remove_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_remove_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {switch (type) {case GDB_BREAKPOINT_HW :
@@ -1807,13 +1809,13 @@ int kvm_arch_remove_hw_breakpoint(vaddr addr, vaddr len, int type)case GDB_WATCHPOINT_READ :case GDB_WATCHPOINT_WRITE :case GDB_WATCHPOINT_ACCESS : -return delete_hw_watchpoint (addr, len, type); +return delete_gdbstub_hw_watchpoint (addr, len, type);default :return -ENOSYS ; } } -void kvm_arch_remove_all_hw_breakpoints (void ) +void kvm_arch_remove_all_gdbstub_hw_breakpoints (void ) {if (cur_hw_wps >0 ) {g_array_remove_range (hw_watchpoints,0 , cur_hw_wps);
target/i386/hvf/hvf.c +5 -3
@@ -1049,17 +1049,19 @@ int hvf_arch_remove_sw_breakpoint(CPUState *cpu, struct hvf_sw_breakpoint *bp)return -ENOSYS ; } -int hvf_arch_insert_hw_breakpoint (vaddr addr,vaddr len,int type) +int hvf_arch_insert_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {return -ENOSYS ; } -int hvf_arch_remove_hw_breakpoint (vaddr addr,vaddr len,int type) +int hvf_arch_remove_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {return -ENOSYS ; } -void hvf_arch_remove_all_hw_breakpoints (void ) +void hvf_arch_remove_all_gdbstub_hw_breakpoints (void ) { }
target/i386/kvm/kvm.c +7 -5
@@ -6159,12 +6159,12 @@ int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)static struct {target_ulong addr;int len; -int type; +GdbBreakpointType type; } hw_breakpoint[4 ];static int nb_hw_breakpoint; -static int find_hw_breakpoint (target_ulong addr,int len,int type) +static int find_hw_breakpoint (target_ulong addr,int len,GdbBreakpointType type) {int n;
@@ -6177,7 +6177,8 @@ static int find_hw_breakpoint(target_ulong addr, int len, int type)return -1 ; } -int kvm_arch_insert_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_insert_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {switch (type) {case GDB_BREAKPOINT_HW :
@@ -6217,7 +6218,8 @@ int kvm_arch_insert_hw_breakpoint(vaddr addr, vaddr len, int type)return 0 ; } -int kvm_arch_remove_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_remove_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {int n;
@@ -6231,7 +6233,7 @@ int kvm_arch_remove_hw_breakpoint(vaddr addr, vaddr len, int type)return 0 ; } -void kvm_arch_remove_all_hw_breakpoints (void ) +void kvm_arch_remove_all_gdbstub_hw_breakpoints (void ) { nb_hw_breakpoint =0 ; }
target/loongarch/kvm/kvm.c +5 -3
@@ -1418,17 +1418,19 @@ int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)return 0 ; } -int kvm_arch_insert_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_insert_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {return -ENOSYS ; } -int kvm_arch_remove_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_remove_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {return -ENOSYS ; } -void kvm_arch_remove_all_hw_breakpoints (void ) +void kvm_arch_remove_all_gdbstub_hw_breakpoints (void ) { }
target/ppc/kvm.c +7 -5
@@ -455,7 +455,7 @@ unsigned long kvm_arch_vcpu_id(CPUState *cpu)static struct HWBreakpoint {target_ulong addr; -int type; +GdbBreakpointType type; } hw_debug_points[MAX_HW_BKPTS ];static CPUWatchpoint hw_watchpoint;
@@ -1412,7 +1412,7 @@ int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)return 0 ; } -static int find_hw_breakpoint (target_ulong addr,int type) +static int find_hw_breakpoint (target_ulong addr,GdbBreakpointType type) {int n;
@@ -1454,7 +1454,8 @@ static int find_hw_watchpoint(target_ulong addr, BreakpointFlags *flag)return -1 ; } -int kvm_arch_insert_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_insert_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {const unsigned breakpoint_index = nb_hw_breakpoint + nb_hw_watchpoint;if (breakpoint_index >=ARRAY_SIZE (hw_debug_points)) {
@@ -1498,7 +1499,8 @@ int kvm_arch_insert_hw_breakpoint(vaddr addr, vaddr len, int type)return 0 ; } -int kvm_arch_remove_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_remove_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {int n;
@@ -1526,7 +1528,7 @@ int kvm_arch_remove_hw_breakpoint(vaddr addr, vaddr len, int type)return 0 ; } -void kvm_arch_remove_all_hw_breakpoints (void ) +void kvm_arch_remove_all_gdbstub_hw_breakpoints (void ) { nb_hw_breakpoint = nb_hw_watchpoint =0 ; }
target/riscv/kvm/kvm-cpu.c +5 -3
@@ -2215,19 +2215,21 @@ int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct kvm_sw_breakpoint *bp)return 0 ; } -int kvm_arch_insert_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_insert_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {/* TODO; To be implemented later. */ return -EINVAL ; } -int kvm_arch_remove_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_remove_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {/* TODO; To be implemented later. */ return -EINVAL ; } -void kvm_arch_remove_all_hw_breakpoints (void ) +void kvm_arch_remove_all_gdbstub_hw_breakpoints (void ) {/* TODO; To be implemented later. */ }
target/s390x/kvm/kvm.c +5 -3
@@ -907,7 +907,8 @@ static int insert_hw_breakpoint(vaddr addr, int len, int type)return 0 ; } -int kvm_arch_insert_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_insert_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {switch (type) {case GDB_BREAKPOINT_HW :
@@ -925,7 +926,8 @@ int kvm_arch_insert_hw_breakpoint(vaddr addr, vaddr len, int type)return insert_hw_breakpoint (addr, len, type); } -int kvm_arch_remove_hw_breakpoint (vaddr addr,vaddr len,int type) +int kvm_arch_remove_gdbstub_hw_breakpoint (vaddr addr,vaddr len, +GdbBreakpointType type) {int size;struct kvm_hw_breakpoint *bp =find_hw_breakpoint (addr, len, type);
@@ -954,7 +956,7 @@ int kvm_arch_remove_hw_breakpoint(vaddr addr, vaddr len, int type)return 0 ; } -void kvm_arch_remove_all_hw_breakpoints (void ) +void kvm_arch_remove_all_gdbstub_hw_breakpoints (void ) { nb_hw_breakpoints =0 ;g_free (hw_breakpoints);
Signature · 1 line
2.53.0
PATCH v3 26/32 target/arm: Inline check_watchpoints() in arm_debug_check_watchpoint()
In reply to Philippe Mathieu-Daudécheck_watchpoints() is called once, by arm_debug_check_watchpoint(), which doesn't do more than this call. Merge both. No logical change intended.
--- target/arm/tcg/debug.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-)
target/arm/tcg/debug.c +17 -23
@@ -351,28 +351,6 @@ static bool bp_wp_matches(ARMCPU *cpu, int n, bool is_wp)return true; } -static bool check_watchpoints (ARMCPU *cpu) -{ -CPUARMState *env = &cpu->env; -int n; - -/* -* If watchpoints are disabled globally or we can't take debug -* exceptions here then watchpoint firings are ignored. -*/ -if (extract32 (env->cp15.mdscr_el1,15 ,1 ) ==0 - || !arm_generate_debug_exceptions (env)) { -return false; - } - -for (n =0 ; n <ARRAY_SIZE (env->cpu_watchpoint); n++) { -if (bp_wp_matches (cpu, n, true)) { -return true; - } - } -return false; -} -bool arm_debug_check_breakpoint (CPUState *cs) {ARMCPU *cpu =ARM_CPU (cs);
@@ -426,8 +404,24 @@ bool arm_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp)* is also an architectural watchpoint match. */ ARMCPU *cpu =ARM_CPU (cs); +CPUARMState *env = &cpu->env; +int n; -return check_watchpoints (cpu); +/* +* If watchpoints are disabled globally or we can't take debug +* exceptions here then watchpoint firings are ignored. +*/ +if (extract32 (env->cp15.mdscr_el1,15 ,1 ) ==0 + || !arm_generate_debug_exceptions (env)) { +return false; + } + +for (n =0 ; n <ARRAY_SIZE (env->cpu_watchpoint); n++) { +if (bp_wp_matches (cpu, n, true)) { +return true; + } + } +return false; }/*
Signature · 1 line
2.53.0
PATCH v3 27/32 target/ppc: Ensure TCG is used in ppc_update_daw()
In reply to Philippe Mathieu-DaudéPer commit d5ee641cfc5 ("target/ppc: Implement watchpoint debug facility for v2.07S"), only TCG is implemented:
ISA v2.07S introduced the watchpoint facility based on the DAWR0 and DAWRX0 SPRs. Implement this in TCG.
^^^^^^^^^^^^^^^^^^^^^
--- target/ppc/cpu.c | 2 ++ 1 file changed, 2 insertions(+)
target/ppc/cpu.c +2 -0
@@ -147,6 +147,8 @@ void ppc_update_daw(CPUPPCState *env, int rid)vaddr len;BreakpointFlags flags; +assert (tcg_enabled ()); +if (env->dawr_watchpoint[rid]) {cpu_watchpoint_remove_by_ref (cs, env->dawr_watchpoint[rid]); env->dawr_watchpoint[rid] =NULL ;
Signature · 1 line
2.53.0
PATCH v3 28/32 accel/tcg: Improve docstrings around TCGCPUOps::*watchpoint* handlers
In reply to Philippe Mathieu-DaudéCommit d5ee641cfc5 ("target/ppc: Implement watchpoint debug facility for v2.07S") also implemented TCGCPUOps::debug_check_watchpoint for
PPC: make the comment generic.
--- include/accel/tcg/cpu-ops.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
include/accel/tcg/cpu-ops.h +2 -3
@@ -250,14 +250,13 @@ struct TCGCPUOps { int mmu_idx, uintptr_t retaddr);/** -* @adjust_watchpoint_address: hack for cpu_check_watchpoint used by ARM +* @adjust_watchpoint_address: hack for cpu_check_watchpoint (used by ARM) */ vaddr (*adjust_watchpoint_address)(CPUState *cpu,vaddr addr,int len);/** * @debug_check_watchpoint: return true if the architectural -* watchpoint whose address has matched should really fire, used by ARM -* and RISC-V +* watchpoint whose address has matched should really fire. */ bool (*debug_check_watchpoint)(CPUState *cpu,CPUWatchpoint *wp);
Signature · 1 line
2.53.0
PATCH v3 29/32 cpu: Better name cpu_single_step() trace event
In reply to Philippe Mathieu-Daudécpu_single_step() is not related to breakpoints. Rename the trace event.
--- cpu-target.c | 4 ++-- trace-events | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
cpu-target.c +2 -2
@@ -31,6 +31,8 @@void cpu_single_step (CPUState *cpu,int enabled) {if (cpu->singlestep_enabled != enabled) { +trace_cpu_change_singlestep_flags (cpu->cpu_index, + cpu->singlestep_enabled, enabled); cpu->singlestep_enabled = enabled;#if !defined(CONFIG_USER_ONLY )
@@ -39,8 +41,6 @@ void cpu_single_step(CPUState *cpu, int enabled) ops->update_guest_debug(cpu); }#endif - -trace_breakpoint_singlestep (cpu->cpu_index, enabled); } }
trace-events +1 -1
@@ -28,7 +28,7 @@ # cpu.c breakpoint_insert(int cpu_index, uint64_t pc, int flags) "cpu=%d pc=0x%" PRIx64 " flags=0x%x" breakpoint_remove(int cpu_index, uint64_t pc, int flags) "cpu=%d pc=0x%" PRIx64 " flags=0x%x" -breakpoint_singlestep(int cpu_index, int enabled) "cpu=%d enable=%d" +cpu_change_singlestep_flags(int cpu_index, int old_flags, int new_flags) "cpu=%d flags=0x%x -> 0x%x" cpu_exec_start(int cpu_index) "cpu=%d" cpu_exec_end(int cpu_index) "cpu=%d"
Signature · 1 line
2.53.0
PATCH v3 30/32 cpu: Introduce cpu_single_stepping() helper
In reply to Philippe Mathieu-DaudéAccess CPUState::@singlestep_enabled field with a helper.
--- include/hw/core/cpu.h | 11 +++++++++++ accel/kvm/kvm-all.c | 2 +- accel/tcg/cpu-exec-common.c | 2 +- accel/tcg/cpu-exec.c | 8 ++++---- linux-user/riscv/cpu_loop.c | 2 +- linux-user/s390x/cpu_loop.c | 2 +- system/cpus.c | 2 +- target/arm/hvf/hvf.c | 8 ++++---- target/arm/kvm.c | 2 +- target/i386/kvm/kvm.c | 2 +- target/i386/whpx/whpx-all.c | 6 +++--- target/loongarch/kvm/kvm.c | 2 +- target/microblaze/translate.c | 2 +- target/ppc/kvm.c | 2 +- target/s390x/kvm/kvm.c | 2 +- 15 files changed, 33 insertions(+), 22 deletions(-)
include/hw/core/cpu.h +11 -0
@@ -1138,6 +1138,17 @@ void qemu_init_vcpu(CPUState *cpu);*/ void cpu_single_step (CPUState *cpu,int enabled); +/** +* cpu_single_stepping: +* @cpu: The vCPU to check +* +* Returns whether the vCPU has single-stepping enabled. +*/ +static inline bool cpu_single_stepping (const CPUState *cpu) +{ +return cpu->singlestep_enabled; +} +int cpu_breakpoint_insert (CPUState *cpu,vaddr pc,BreakpointFlags flags,CPUBreakpoint **breakpoint);int cpu_breakpoint_remove (CPUState *cpu,vaddr pc,BreakpointFlags flags);
accel/kvm/kvm-all.c +1 -1
@@ -3812,7 +3812,7 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap) data.dbg.control = reinject_trap; -if (cpu->singlestep_enabled) { +if (cpu_single_stepping (cpu)) { data.dbg.control |=KVM_GUESTDBG_ENABLE |KVM_GUESTDBG_SINGLESTEP ;if (cpu->singlestep_enabled &SSTEP_NOIRQ ) {
accel/tcg/cpu-exec-common.c +1 -1
@@ -47,7 +47,7 @@ uint32_t curr_cflags(CPUState *cpu)* For singlestep and -d nochain, suppress goto_tb so that * we can log -d cpu,exec after every TB. */ -if (unlikely (cpu->singlestep_enabled)) { +if (unlikely (cpu_single_stepping (cpu))) { cflags |=CF_NO_GOTO_TB |CF_NO_GOTO_PTR |CF_SINGLE_STEP |1 ; }else if (qatomic_read (&one_insn_per_tb)) { cflags |=CF_NO_GOTO_TB |1 ;
accel/tcg/cpu-exec.c +4 -4
@@ -308,7 +308,7 @@ static bool check_for_breakpoints_slow(CPUState *cpu, vaddr pc,* so that one could (gdb) singlestep into the guest kernel's * architectural breakpoint handler. */ -if (cpu->singlestep_enabled) { +if (cpu_single_stepping (cpu)) {return false; }
@@ -485,7 +485,7 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit)* raise a debug exception. Single-step with another exception * is handled in cpu_handle_exception. */ -if (unlikely (cpu->singlestep_enabled) && cpu->exception_index ==-1 ) { +if (unlikely (cpu_single_stepping (cpu)) && cpu->exception_index ==-1 ) { cpu->exception_index =EXCP_DEBUG ;cpu_loop_exit (cpu); }
@@ -732,7 +732,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret)bql_unlock (); cpu->exception_index =-1 ; -if (unlikely (cpu->singlestep_enabled)) { +if (unlikely (cpu_single_stepping (cpu))) {/* * After processing the exception, ensure an EXCP_DEBUG is * raised when single-stepping so that GDB doesn't miss the
@@ -849,7 +849,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,* raised when single-stepping so that GDB doesn't miss the * next instruction. */ -if (unlikely (cpu->singlestep_enabled)) { +if (unlikely (cpu_single_stepping (cpu))) { cpu->exception_index =EXCP_DEBUG ;bql_unlock ();return true;
linux-user/riscv/cpu_loop.c +1 -1
@@ -68,7 +68,7 @@ void cpu_loop(CPURISCVState *env) }else if (ret != -QEMU_ESIGRETURN && ret != -QEMU_ESETPC ) { env->gpr[xA0] = ret; } -if (cs->singlestep_enabled) { +if (cpu_single_stepping (cs)) { goto gdbstep; }break ;
linux-user/s390x/cpu_loop.c +1 -1
@@ -87,7 +87,7 @@ void cpu_loop(CPUS390XState *env) env->regs[2 ] = ret; } -if (unlikely (cs->singlestep_enabled)) { +if (unlikely (cpu_single_stepping (cs))) {/* * cpu_tb_exec() did not raise EXCP_DEBUG, because it has seen * that EXCP_SVC was already pending.
system/cpus.c +1 -1
@@ -344,7 +344,7 @@ bool cpu_can_run(CPUState *cpu)void cpu_handle_guest_debug (CPUState *cpu) {if (replay_running_debug ()) { -if (!cpu->singlestep_enabled) { +if (!cpu_single_stepping (cpu)) {/* * Report about the breakpoint and * make a single step to skip it
target/arm/hvf/hvf.c +4 -4
@@ -2340,7 +2340,7 @@ static int hvf_handle_exception(CPUState *cpu, hv_vcpu_exit_exception_t *excp)case EC_SOFTWARESTEP : { ret =EXCP_DEBUG ; -if (!cpu->singlestep_enabled) { +if (!cpu_single_stepping (cpu)) {error_report ("EC_SOFTWARESTEP but single-stepping not enabled" ); }break ;
@@ -2549,7 +2549,7 @@ static int hvf_handle_exception(CPUState *cpu, hv_vcpu_exit_exception_t *excp)assert_hvf_ok (r);/* Handle single-stepping over instructions which trigger a VM exit */ -if (cpu->singlestep_enabled) { +if (cpu_single_stepping (cpu)) { ret =EXCP_DEBUG ; } }
@@ -2868,7 +2868,7 @@ void hvf_arch_update_guest_debug(CPUState *cpu)CPUARMState *env = &arm_cpu->env;/* Check whether guest debugging is enabled */ - cpu->accel->guest_debug_enabled = cpu->singlestep_enabled || + cpu->accel->guest_debug_enabled =cpu_single_stepping (cpu) ||hvf_sw_breakpoints_active (cpu) ||hvf_arm_hw_debug_active (cpu);
@@ -2882,7 +2882,7 @@ void hvf_arch_update_guest_debug(CPUState *cpu)cpu_synchronize_state (cpu);/* Enable/disable single-stepping */ -if (cpu->singlestep_enabled) { +if (cpu_single_stepping (cpu)) { env->cp15.mdscr_el1 =deposit64 (env->cp15.mdscr_el1,MDSCR_EL1_SS_SHIFT ,1 ,1 );pstate_write (env,pstate_read (env) |PSTATE_SS );
target/arm/kvm.c +1 -1
@@ -1492,7 +1492,7 @@ static bool kvm_arm_handle_debug(ARMCPU *cpu,switch (hsr_ec) {case EC_SOFTWARESTEP : -if (cs->singlestep_enabled) { +if (cpu_single_stepping (cs)) {return true; }else {/*
target/i386/kvm/kvm.c +1 -1
@@ -6250,7 +6250,7 @@ static int kvm_handle_debug(X86CPU *cpu,if (arch_info->exception ==EXCP01_DB ) {if (arch_info->dr6 &DR6_BS ) { -if (cs->singlestep_enabled) { +if (cpu_single_stepping (cs)) { ret =EXCP_DEBUG ; } }else {
target/i386/whpx/whpx-all.c +3 -3
@@ -2266,7 +2266,7 @@ int whpx_vcpu_run(CPUState *cpu) } } -if (exclusive_step_mode !=WHPX_STEP_NONE || cpu->singlestep_enabled) { +if (exclusive_step_mode !=WHPX_STEP_NONE ||cpu_single_stepping (cpu)) {whpx_vcpu_configure_single_stepping (cpu, true,NULL ); }
@@ -2283,7 +2283,7 @@ int whpx_vcpu_run(CPUState *cpu)break ; } -if (exclusive_step_mode !=WHPX_STEP_NONE || cpu->singlestep_enabled) { +if (exclusive_step_mode !=WHPX_STEP_NONE ||cpu_single_stepping (cpu)) {whpx_vcpu_configure_single_stepping (cpu, false, &vcpu->exit_ctx.VpContext.Rflags);
@@ -2648,7 +2648,7 @@ int whpx_vcpu_run(CPUState *cpu) cpu->exception_index =EXCP_DEBUG ; }else if ((vcpu->exit_ctx.VpException.ExceptionType == WHvX64ExceptionTypeDebugTrapOrFault) && - !cpu->singlestep_enabled) { + !cpu_single_stepping (cpu)) {/* * Just finished stepping over a breakpoint, but the * gdb does not expect us to do single-stepping.
target/loongarch/kvm/kvm.c +1 -1
@@ -1440,7 +1440,7 @@ static bool kvm_loongarch_handle_debug(CPUState *cs, struct kvm_run *run)CPULoongArchState *env = &cpu->env;kvm_cpu_synchronize_state (cs); -if (cs->singlestep_enabled) { +if (cpu_single_stepping (cs)) {return true; }
target/microblaze/translate.c +1 -1
@@ -1772,7 +1772,7 @@ static void mb_tr_tb_stop(DisasContextBase *dcb, CPUState *cs) }/* Finish DISAS_EXIT_* */ -if (unlikely (cs->singlestep_enabled)) { +if (unlikely (cpu_single_stepping (cs))) {gen_raise_exception (dc,EXCP_DEBUG ); }else {tcg_gen_exit_tb (NULL ,0 );
target/ppc/kvm.c +1 -1
@@ -1616,7 +1616,7 @@ static int kvm_handle_debug(PowerPCCPU *cpu, struct kvm_run *run)CPUPPCState *env = &cpu->env;struct kvm_debug_exit_arch *arch_info = &run->debug.arch; -if (cs->singlestep_enabled) { +if (cpu_single_stepping (cs)) {return kvm_handle_singlestep (); }
target/s390x/kvm/kvm.c +1 -1
@@ -1874,7 +1874,7 @@ static int kvm_arch_handle_debug_exit(S390CPU *cpu) }break ;case KVM_SINGLESTEP : -if (cs->singlestep_enabled) { +if (cpu_single_stepping (cs)) { ret =EXCP_DEBUG ; }break ;
Signature · 1 line
2.53.0
PATCH v3 31/32 cpu: Rename CPUState @singlestep_enabled -> @singlestep_flags
In reply to Philippe Mathieu-DaudéCPUState::singlestep_enabled contains multiple flags since commit 60897d369f1 ("Debugger single step without interrupts"). Use an unsigned type and rename the field to avoid mistakes.
--- include/hw/core/cpu.h | 10 +++++----- accel/kvm/kvm-all.c | 2 +- accel/tcg/cpu-exec.c | 2 +- accel/tcg/tcg-accel-ops-rr.c | 2 +- cpu-target.c | 8 ++++---- target/arm/hvf/hvf.c | 2 +- target/ppc/translate.c | 16 ++++++++-------- 7 files changed, 21 insertions(+), 21 deletions(-)
include/hw/core/cpu.h +5 -5
@@ -440,7 +440,7 @@ struct qemu_work_item;* @stopped: Indicates the CPU has been artificially stopped. * @unplug: Indicates a pending CPU unplug request. * @crash_occurred: Indicates the OS reported a crash (panic) for this CPU -* @singlestep_enabled: Flags for single-stepping. +* @singlestep_flags: Flags for single-stepping. * @icount_extra: Instructions until next timer event. * @cpu_ases: Pointer to array of CPUAddressSpaces (which define the * AddressSpaces this CPU has)
@@ -505,7 +505,7 @@ struct CPUState {int exclusive_context_count;uint32_t cflags_next_tb;uint32_t interrupt_request; -int singlestep_enabled; +unsigned singlestep_flags;int64_t icount_budget;int64_t icount_extra;uint64_t random_seed;
@@ -1132,11 +1132,11 @@ void qemu_init_vcpu(CPUState *cpu);/** * cpu_single_step: * @cpu: CPU to the flags for. -* @enabled: Flags to enable. +* @flags: Flags to enable. * * Enables or disables single-stepping for @cpu. */ -void cpu_single_step (CPUState *cpu,int enabled); +void cpu_single_step (CPUState *cpu,unsigned flags);/** * cpu_single_stepping:
@@ -1146,7 +1146,7 @@ void cpu_single_step(CPUState *cpu, int enabled);*/ static inline bool cpu_single_stepping (const CPUState *cpu) { -return cpu->singlestep_enabled; +return cpu->singlestep_flags; } int cpu_breakpoint_insert(CPUState *cpu, vaddr pc, BreakpointFlags flags,
accel/kvm/kvm-all.c +1 -1
@@ -3815,7 +3815,7 @@ int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap)if (cpu_single_stepping (cpu)) { data.dbg.control |=KVM_GUESTDBG_ENABLE |KVM_GUESTDBG_SINGLESTEP ; -if (cpu->singlestep_enabled &SSTEP_NOIRQ ) { +if (cpu->singlestep_flags &SSTEP_NOIRQ ) { data.dbg.control |=KVM_GUESTDBG_BLOCKIRQ ; } }
accel/tcg/cpu-exec.c +1 -1
@@ -828,7 +828,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,return true; } -if (unlikely (cpu->singlestep_enabled &SSTEP_NOIRQ )) { +if (unlikely (cpu->singlestep_flags &SSTEP_NOIRQ )) {/* Mask out external interrupts for this step. */ interrupt_request &= ~CPU_INTERRUPT_SSTEP_MASK ; }
accel/tcg/tcg-accel-ops-rr.c +1 -1
@@ -274,7 +274,7 @@ static void *rr_cpu_thread_fn(void *arg) current_cpu = cpu;qemu_clock_enable (QEMU_CLOCK_VIRTUAL , - (cpu->singlestep_enabled &SSTEP_NOTIMER ) ==0 ); + (cpu->singlestep_flags &SSTEP_NOTIMER ) ==0 );if (cpu_can_run (cpu)) {int r;
cpu-target.c +4 -4
@@ -28,12 +28,12 @@/* enable or disable single step mode. EXCP_DEBUG is returned by the CPU loop after each instruction */ -void cpu_single_step (CPUState *cpu,int enabled) +void cpu_single_step (CPUState *cpu,unsigned flags) { -if (cpu->singlestep_enabled != enabled) { +if (cpu->singlestep_flags != flags) {trace_cpu_change_singlestep_flags (cpu->cpu_index, - cpu->singlestep_enabled, enabled); - cpu->singlestep_enabled = enabled; + cpu->singlestep_flags, flags); + cpu->singlestep_flags = flags;#if !defined(CONFIG_USER_ONLY )const AccelOpsClass *ops =cpus_get_accel ();
target/arm/hvf/hvf.c +1 -1
@@ -2603,7 +2603,7 @@ int hvf_arch_vcpu_exec(CPUState *cpu)flush_cpu_state (cpu); do { - if (!(cpu->singlestep_enabled & SSTEP_NOIRQ) && + if (!(cpu->singlestep_flags & SSTEP_NOIRQ) && hvf_inject_interrupts(cpu)) { return EXCP_INTERRUPT; }
target/ppc/translate.c +8 -8
@@ -198,7 +198,7 @@ struct DisasContext {bool pmu_insn_cnt;bool bhrb_enable;ppc_spr_t *spr_cb;/* Needed to check rights for mfspr/mtspr */ -int singlestep_enabled; +int singlestep_flags;uint32_t flags;uint64_t insns_flags;uint64_t insns_flags2;
@@ -367,7 +367,7 @@ static void gen_debug_exception(DisasContext *ctx, bool rfi_type)#if !defined(CONFIG_USER_ONLY )if (ctx->flags &POWERPC_FLAG_DE ) {target_ulong dbsr =0 ; -if (ctx->singlestep_enabled &CPU_SINGLE_STEP ) { +if (ctx->singlestep_flags &CPU_SINGLE_STEP ) { dbsr =DBCR0_ICMP ; }else {/* Must have been branch */
@@ -3645,7 +3645,7 @@ static void pmu_count_insns(DisasContext *ctx)static inline bool use_goto_tb (DisasContext *ctx,target_ulong dest) { -if (unlikely (ctx->singlestep_enabled)) { +if (unlikely (ctx->singlestep_flags)) {return false; }return translator_use_goto_tb (&ctx->base, dest);
@@ -3653,7 +3653,7 @@ static inline bool use_goto_tb(DisasContext *ctx, target_ulong dest)static void gen_lookup_and_goto_ptr (DisasContext *ctx) { -if (unlikely (ctx->singlestep_enabled)) { +if (unlikely (ctx->singlestep_flags)) {gen_debug_exception (ctx, false); }else {/*
@@ -6559,13 +6559,13 @@ static void ppc_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs) ctx->pmu_insn_cnt = (hflags >>HFLAGS_INSN_CNT ) &1 ; ctx->bhrb_enable = (hflags >>HFLAGS_BHRB_ENABLE ) &1 ; - ctx->singlestep_enabled =0 ; + ctx->singlestep_flags =0 ;if ((hflags >>HFLAGS_SE ) &1 ) { - ctx->singlestep_enabled |=CPU_SINGLE_STEP ; + ctx->singlestep_flags |=CPU_SINGLE_STEP ; ctx->base.max_insns =1 ; }if ((hflags >>HFLAGS_BE ) &1 ) { - ctx->singlestep_enabled |=CPU_BRANCH_STEP ; + ctx->singlestep_flags |=CPU_BRANCH_STEP ; } }
@@ -6641,7 +6641,7 @@ static void ppc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) }/* Honor single stepping. */ -if (unlikely (ctx->singlestep_enabled &CPU_SINGLE_STEP )) { +if (unlikely (ctx->singlestep_flags &CPU_SINGLE_STEP )) {bool rfi_type = false;switch (is_jmp) {
Signature · 1 line
2.53.0
PATCH v3 32/32 cpu: Only check SSTEP_ENABLE flag in cpu_single_stepping()
In reply to Philippe Mathieu-DaudéOnly the SSTEP_ENABLE bitmask means single-step is enabled.
--- include/hw/core/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/hw/core/cpu.h +1 -1
@@ -1146,7 +1146,7 @@ void cpu_single_step(CPUState *cpu, unsigned flags);*/ static inline bool cpu_single_stepping (const CPUState *cpu) { -return cpu->singlestep_flags; +return cpu->singlestep_flags &SSTEP_ENABLE ; } int cpu_breakpoint_insert(CPUState *cpu, vaddr pc, BreakpointFlags flags,
Signature · 1 line
2.53.0