softmmu: Restore use of CPU watchpoint for non-TCG accelerators
Subsystems (2)
v2 cover softmmu: Restore use of CPU watchpoint for non-TCG accelerators
Commit 2609ec2868 ("softmmu: Extract watchpoint API from physmem.c") restricted CPU watchpoints to TCG accelerator. This is wrong, as other accelerators such KVM do use watchpoints. Revert (partially) this commit.
Since v1:
- Include "hw/core/tcg-cpu-ops.h" where cpu_check_watchpoint() and cpu_watchpoint_address_matches() are called.
Philippe Mathieu-Daudé (3):
softmmu: Restrict cpu_check_watchpoint / address_matches to TCG accel softmmu/watchpoint: Add missing 'qemu/error-report.h' include
softmmu: Restore use of CPU watchpoint for all accelerators
include/hw/core/cpu.h | 39 +------------------------------ include/hw/core/tcg-cpu-ops.h | 43 +++++++++++++++++++++++++++++++++++ softmmu/watchpoint.c | 5 ++++ target/arm/tcg/mte_helper.c | 1 + target/arm/tcg/sve_helper.c | 1 + target/s390x/tcg/mem_helper.c | 1 + softmmu/meson.build | 2 +- 7 files changed, 53 insertions(+), 39 deletions(-)
Signature · 1 line
2.38.1
PATCH v2 1/3 softmmu: Restrict cpu_check_watchpoint / address_matches to TCG accel
Both cpu_check_watchpoint() and cpu_watchpoint_address_matches() are specific to TCG system emulation. Declare them in "tcg-cpu-ops.h" to be sure accessing them from non-TCG code is a compilation error.
--- include/hw/core/cpu.h | 37 ------------------------------ include/hw/core/tcg-cpu-ops.h | 43 +++++++++++++++++++++++++++++++++++ target/arm/tcg/mte_helper.c | 1 + target/arm/tcg/sve_helper.c | 1 + target/s390x/tcg/mem_helper.c | 1 + 5 files changed, 46 insertions(+), 37 deletions(-)
include/hw/core/cpu.h +0 -37
@@ -970,17 +970,6 @@ static inline void cpu_watchpoint_remove_by_ref(CPUState *cpu,static inline void cpu_watchpoint_remove_all (CPUState *cpu,int mask) { } - -static inline void cpu_check_watchpoint (CPUState *cpu,vaddr addr,vaddr len, -MemTxAttrs atr,int fl,uintptr_t ra) -{ -} - -static inline int cpu_watchpoint_address_matches (CPUState *cpu, -vaddr addr,vaddr len) -{ -return 0 ; -}#else int cpu_watchpoint_insert (CPUState *cpu,vaddr addr,vaddr len,int flags,CPUWatchpoint **watchpoint);
@@ -988,32 +977,6 @@ int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, vaddr len, int flags);void cpu_watchpoint_remove_by_ref (CPUState *cpu,CPUWatchpoint *watchpoint);void cpu_watchpoint_remove_all (CPUState *cpu,int mask); - -/** -* cpu_check_watchpoint: -* @cpu: cpu context -* @addr: guest virtual address -* @len: access length -* @attrs: memory access attributes -* @flags: watchpoint access type -* @ra: unwind return address -* -* Check for a watchpoint hit in [addr, addr+len) of the type -* 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); - -/** -* cpu_watchpoint_address_matches: -* @cpu: cpu context -* @addr: guest virtual address -* @len: access length -* -* 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);#endif /**
include/hw/core/tcg-cpu-ops.h +43 -0
47 lines not on this page · raw message
target/arm/tcg/mte_helper.c +1 -0
@@ -25,6 +25,7 @@#include "exec/ram_addr.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" +#include "hw/core/tcg-cpu-ops.h" #include "qapi/error.h" #include "qemu/guest-random.h"
target/arm/tcg/sve_helper.c +1 -0
@@ -27,6 +27,7 @@#include "tcg/tcg.h" #include "vec_internal.h" #include "sve_ldst_internal.h" +#include "hw/core/tcg-cpu-ops.h" /* Return a value for NZCV as per the ARM PredTest pseudofunction.
target/s390x/tcg/mem_helper.c +1 -0
@@ -26,6 +26,7 @@#include "exec/helper-proto.h" #include "exec/exec-all.h" #include "exec/cpu_ldst.h" +#include "hw/core/tcg-cpu-ops.h" #include "qemu/int128.h" #include "qemu/atomic128.h" #include "trace.h"
Signature · 1 line
2.38.1
Re: [PATCH-for-8.0 v2 1/3] softmmu: Restrict cpu_check_watchpoint / address_matches to TCG accel
Quoted 5 lines · Philippe Mathieu-Daudé
Both
cpu_check_watchpoint()andcpu_watchpoint_address_matches()are specific to TCG system emulation. Declare them in "tcg-cpu-ops.h" to be sure accessing them from non-TCG code is a compilation error.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
PATCH v2 2/3 softmmu/watchpoint: Add missing 'qemu/error-report.h' include
In reply to Philippe Mathieu-Daudécpu_watchpoint_insert() calls error_report() which is declared in "qemu/error-report.h". When moving this code in commit 2609ec2868 ("softmmu: Extract watchpoint API from physmem.c") we neglected to include this header. This works so far because it is indirectly included by TCG headers -> "qemu/plugin.h" -> "qemu/error-report.h".
Currently cpu_watchpoint_insert() is only built with the TCG accelerator. When building it with other ones (or without TCG) we get:
softmmu/watchpoint.c:38:9: error: implicit declaration of function 'error_report' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
error_report("tried to set invalid watchpoint at %"
^
Include "qemu/error-report.h" in order to fix this for non-TCG builds.
--- softmmu/watchpoint.c | 1 + 1 file changed, 1 insertion(+)
softmmu/watchpoint.c +1 -0
@@ -19,6 +19,7 @@#include "qemu/osdep.h" #include "qemu/main-loop.h" +#include "qemu/error-report.h" #include "exec/exec-all.h" #include "exec/translate-all.h" #include "sysemu/tcg.h"
Signature · 1 line
2.38.1
Re: [PATCH-for-8.0 v2 2/3] softmmu/watchpoint: Add missing 'qemu/error-report.h' include
Quoted 10 lines · Philippe Mathieu-Daudé
cpu_watchpoint_insert()callserror_report()which is declared in "qemu/error-report.h". When moving this code in commit2609ec2868("softmmu: Extract watchpoint API fromphysmem.c") we neglected to include this header. This works so far because it is indirectly included by TCG headers -> "qemu/plugin.h" -> "qemu/error-report.h".Currently
cpu_watchpoint_insert()is only built with the TCG accelerator. When building it with other ones (or without TCG) we get:
Quoted 8 lines
softmmu/watchpoint.c:38:9: error: implicit declaration of function 'error_report' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
error_report("tried to set invalid watchpoint at %"
^Include "
qemu/error-report.h" in order to fix this for non-TCG builds.Signed-off-by Philippe Mathieu-Daudé <[email protected]>
PATCH v2 3/3 softmmu: Restore use of CPU watchpoint for all accelerators
In reply to Philippe Mathieu-DaudéCPU watchpoints can be use by non-TCG accelerators.
KVM uses them:
$ git grep CPUWatchpoint|fgrep kvm target/arm/kvm64.c:1558: CPUWatchpoint *wp = find_hw_watchpoint(cs, debug_exit->far); target/i386/kvm/kvm.c:5216:static CPUWatchpoint hw_watchpoint; target/ppc/kvm.c:443:static CPUWatchpoint hw_watchpoint; target/s390x/kvm/kvm.c:139:static CPUWatchpoint hw_watchpoint;
See for example commit e4482ab7e3 ("target-arm: kvm - add support for HW assisted debug"):
This adds basic support for HW assisted debug. The ioctl interface to KVM allows us to pass an implementation defined number of break and watch point registers. [...]
This partially reverts commit 2609ec2868e6c286e755a73b4504714a0296a.
--- include/hw/core/cpu.h | 2 +- softmmu/watchpoint.c | 4 ++++ softmmu/meson.build | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)
include/hw/core/cpu.h +1 -1
@@ -949,7 +949,7 @@ static inline bool cpu_breakpoint_test(CPUState *cpu, vaddr pc, int mask)return false; } -#if !defined(CONFIG_TCG ) || defined(CONFIG_USER_ONLY ) +#if defined(CONFIG_USER_ONLY )static inline int cpu_watchpoint_insert (CPUState *cpu,vaddr addr,vaddr len,int flags,CPUWatchpoint **watchpoint) {
softmmu/watchpoint.c +4 -0
@@ -104,6 +104,8 @@ void cpu_watchpoint_remove_all(CPUState *cpu, int mask) } } +#ifdef CONFIG_TCG +/* * Return true if this watchpoint address matches the specified * access (ie the address range covered by the watchpoint overlaps
@@ -220,3 +222,5 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, } } } + +#endif /* CONFIG_TCG */
softmmu/meson.build +1 -1
@@ -5,11 +5,11 @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files( 'physmem.c', 'qtest.c', 'dirtylimit.c', + 'watchpoint.c', )]) specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files( 'icount.c', - 'watchpoint.c', )]) softmmu_ss.add(files(
Signature · 1 line
2.38.1
Re: [PATCH-for-8.0 v2 3/3] softmmu: Restore use of CPU watchpoint for all accelerators
Quoted 13 lines · Philippe Mathieu-Daudé
CPU watchpoints can be use by non-TCG accelerators.
KVM uses them:
$ git grep CPUWatchpoint|fgrep kvm target/arm/kvm64.c:1558: CPUWatchpoint *wp = find_hw_watchpoint(cs, debug_exit->far); target/i386/kvm/kvm.c:5216:static CPUWatchpoint hw_watchpoint; target/ppc/kvm.c:443:static CPUWatchpoint hw_watchpoint; target/s390x/kvm/kvm.c:139:static CPUWatchpoint hw_watchpoint;See for example commit
e4482ab7e3("target-arm: kvm - add support for HW assisted debug"):
Quoted 8 lines
This adds basic support for HW assisted debug. The ioctl interface to KVM allows us to pass an implementation defined number of break and watch point registers. [...]
This partially reverts commit
2609ec2868e6c286e755a73b4504714a0296a.Fixes 2609ec2868 ("softmmu: Extract watchpoint API from physmem.c")Signed-off-by Philippe Mathieu-Daudé <[email protected]>