[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/15] softmmu: Restore use of CPU watchpoint for all accelerators
From: |
Richard Henderson |
Subject: |
[PULL 15/15] softmmu: Restore use of CPU watchpoint for all accelerators |
Date: |
Tue, 28 Mar 2023 15:58:06 -0700 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
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.
Fixes: 2609ec2868 ("softmmu: Extract watchpoint API from physmem.c")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230328173117.15226-4-philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/core/cpu.h | 2 +-
softmmu/watchpoint.c | 4 ++++
softmmu/meson.build | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index ce312745d5..397fd3ac68 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -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)
{
diff --git a/softmmu/watchpoint.c b/softmmu/watchpoint.c
index 9d6ae68499..5350163385 100644
--- a/softmmu/watchpoint.c
+++ b/softmmu/watchpoint.c
@@ -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 */
diff --git a/softmmu/meson.build b/softmmu/meson.build
index 0180577517..1a7c7ac089 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -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(
--
2.34.1
- [PULL 06/15] accel/tcg: Pass last not end to PAGE_FOR_EACH_TB, (continued)
- [PULL 06/15] accel/tcg: Pass last not end to PAGE_FOR_EACH_TB, Richard Henderson, 2023/03/28
- [PULL 01/15] util: import GTree as QTree, Richard Henderson, 2023/03/28
- [PULL 04/15] accel/tcg: Pass last not end to page_set_flags, Richard Henderson, 2023/03/28
- [PULL 05/15] accel/tcg: Pass last not end to page_reset_target_data, Richard Henderson, 2023/03/28
- [PULL 07/15] accel/tcg: Pass last not end to page_collection_lock, Richard Henderson, 2023/03/28
- [PULL 08/15] accel/tcg: Pass last not end to tb_invalidate_phys_page_range__locked, Richard Henderson, 2023/03/28
- [PULL 10/15] linux-user: Pass last not end to probe_guest_base, Richard Henderson, 2023/03/28
- [PULL 09/15] accel/tcg: Pass last not end to tb_invalidate_phys_range, Richard Henderson, 2023/03/28
- [PULL 11/15] include/exec: Change reserved_va semantics to last byte, Richard Henderson, 2023/03/28
- [PULL 13/15] softmmu: Restrict cpu_check_watchpoint / address_matches to TCG accel, Richard Henderson, 2023/03/28
- [PULL 15/15] softmmu: Restore use of CPU watchpoint for all accelerators,
Richard Henderson <=
- [PULL 12/15] linux-user/arm: Take more care allocating commpage, Richard Henderson, 2023/03/28
- [PULL 14/15] softmmu/watchpoint: Add missing 'qemu/error-report.h' include, Richard Henderson, 2023/03/28
- Re: [PULL 00/15] tcg patch queue, Peter Maydell, 2023/03/29
- Re: [PULL 00/15] tcg patch queue, Joel Stanley, 2023/03/30