* [PATCH v2 1/7] tcg: Clear plugin_mem_cbs on TB exit
2023-03-10 19:52 [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Richard Henderson
@ 2023-03-10 19:52 ` Richard Henderson
2023-03-10 19:52 ` [PATCH v2 2/7] tcg: Drop plugin_gen_disable_mem_helpers from tcg_gen_exit_tb Richard Henderson
` (7 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Richard Henderson @ 2023-03-10 19:52 UTC (permalink / raw)
To: qemu-devel; +Cc: cota, alex.bennee
Do this in cpu_tb_exec (normal exit) and cpu_loop_exit (exception),
adjacent to where we reset can_do_io.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1381
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/cpu-exec-common.c | 2 ++
accel/tcg/cpu-exec.c | 5 +----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c
index c7bc8c6efa..176ea57281 100644
--- a/accel/tcg/cpu-exec-common.c
+++ b/accel/tcg/cpu-exec-common.c
@@ -65,6 +65,8 @@ void cpu_loop_exit(CPUState *cpu)
{
/* Undo the setting in cpu_tb_exec. */
cpu->can_do_io = 1;
+ /* Undo any setting in generated code. */
+ qemu_plugin_disable_mem_helpers(cpu);
siglongjmp(cpu->jmp_env, 1);
}
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 56aaf58b9d..c815f2dbfd 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -459,6 +459,7 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit)
qemu_thread_jit_execute();
ret = tcg_qemu_tb_exec(env, tb_ptr);
cpu->can_do_io = 1;
+ qemu_plugin_disable_mem_helpers(cpu);
/*
* TODO: Delay swapping back to the read-write region of the TB
* until we actually need to modify the TB. The read-only copy,
@@ -526,7 +527,6 @@ static void cpu_exec_exit(CPUState *cpu)
if (cc->tcg_ops->cpu_exec_exit) {
cc->tcg_ops->cpu_exec_exit(cpu);
}
- QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL);
}
void cpu_exec_step_atomic(CPUState *cpu)
@@ -580,7 +580,6 @@ void cpu_exec_step_atomic(CPUState *cpu)
qemu_mutex_unlock_iothread();
}
assert_no_pages_locked();
- qemu_plugin_disable_mem_helpers(cpu);
}
/*
@@ -1004,7 +1003,6 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc)
cpu_loop_exec_tb(cpu, tb, pc, &last_tb, &tb_exit);
- QEMU_PLUGIN_ASSERT(cpu->plugin_mem_cbs == NULL);
/* Try to align the host and virtual clocks
if the guest is in advance */
align_clocks(sc, cpu);
@@ -1029,7 +1027,6 @@ static int cpu_exec_setjmp(CPUState *cpu, SyncClocks *sc)
if (qemu_mutex_iothread_locked()) {
qemu_mutex_unlock_iothread();
}
- qemu_plugin_disable_mem_helpers(cpu);
assert_no_pages_locked();
}
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v2 2/7] tcg: Drop plugin_gen_disable_mem_helpers from tcg_gen_exit_tb
2023-03-10 19:52 [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Richard Henderson
2023-03-10 19:52 ` [PATCH v2 1/7] tcg: Clear " Richard Henderson
@ 2023-03-10 19:52 ` Richard Henderson
2023-03-10 19:52 ` [PATCH v2 3/7] include/qemu/plugin: Remove QEMU_PLUGIN_ASSERT Richard Henderson
` (6 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Richard Henderson @ 2023-03-10 19:52 UTC (permalink / raw)
To: qemu-devel; +Cc: cota, alex.bennee
Now that we call qemu_plugin_disable_mem_helpers in cpu_tb_exec,
we don't need to do this in generated code as well.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/tcg-op.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 77658a88f0..cc8fdb0e46 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -2813,7 +2813,6 @@ void tcg_gen_exit_tb(const TranslationBlock *tb, unsigned idx)
tcg_debug_assert(idx == TB_EXIT_REQUESTED);
}
- plugin_gen_disable_mem_helpers();
tcg_gen_op1i(INDEX_op_exit_tb, val);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v2 3/7] include/qemu/plugin: Remove QEMU_PLUGIN_ASSERT
2023-03-10 19:52 [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Richard Henderson
2023-03-10 19:52 ` [PATCH v2 1/7] tcg: Clear " Richard Henderson
2023-03-10 19:52 ` [PATCH v2 2/7] tcg: Drop plugin_gen_disable_mem_helpers from tcg_gen_exit_tb Richard Henderson
@ 2023-03-10 19:52 ` Richard Henderson
2023-03-10 19:52 ` [PATCH v2 4/7] *: Add missing includes of qemu/error-report.h Richard Henderson
` (5 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Richard Henderson @ 2023-03-10 19:52 UTC (permalink / raw)
To: qemu-devel; +Cc: cota, alex.bennee
This macro is no longer used.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/qemu/plugin.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h
index fb338ba576..e0ebedef84 100644
--- a/include/qemu/plugin.h
+++ b/include/qemu/plugin.h
@@ -59,8 +59,6 @@ get_plugin_meminfo_rw(qemu_plugin_meminfo_t i)
#ifdef CONFIG_PLUGIN
extern QemuOptsList qemu_plugin_opts;
-#define QEMU_PLUGIN_ASSERT(cond) g_assert(cond)
-
static inline void qemu_plugin_add_opts(void)
{
qemu_add_opts(&qemu_plugin_opts);
@@ -252,8 +250,6 @@ void qemu_plugin_user_postfork(bool is_child);
#else /* !CONFIG_PLUGIN */
-#define QEMU_PLUGIN_ASSERT(cond)
-
static inline void qemu_plugin_add_opts(void)
{ }
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v2 4/7] *: Add missing includes of qemu/error-report.h
2023-03-10 19:52 [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Richard Henderson
` (2 preceding siblings ...)
2023-03-10 19:52 ` [PATCH v2 3/7] include/qemu/plugin: Remove QEMU_PLUGIN_ASSERT Richard Henderson
@ 2023-03-10 19:52 ` Richard Henderson
2023-03-10 22:03 ` Philippe Mathieu-Daudé
2023-03-10 19:52 ` [PATCH v2 5/7] *: Add missing includes of qemu/plugin.h Richard Henderson
` (4 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Richard Henderson @ 2023-03-10 19:52 UTC (permalink / raw)
To: qemu-devel; +Cc: cota, alex.bennee
This had been pulled in via qemu/plugin.h from hw/core/cpu.h,
but that will be removed.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/accel-softmmu.c | 2 +-
block/monitor/block-hmp-cmds.c | 1 +
dump/dump.c | 1 +
dump/win_dump.c | 1 +
hw/arm/collie.c | 2 ++
hw/arm/cubieboard.c | 1 +
hw/arm/musicpal.c | 2 ++
hw/arm/npcm7xx_boards.c | 2 ++
hw/arm/nseries.c | 2 ++
hw/arm/omap_sx1.c | 2 ++
hw/arm/orangepi.c | 1 +
hw/arm/palm.c | 2 ++
hw/core/machine-smp.c | 2 ++
hw/i386/sgx.c | 1 +
hw/loongarch/acpi-build.c | 1 +
hw/loongarch/virt.c | 2 ++
hw/m68k/next-cube.c | 1 +
hw/m68k/q800.c | 1 +
hw/m68k/virt.c | 1 +
hw/openrisc/boot.c | 1 +
hw/ppc/spapr_softmmu.c | 2 ++
hw/riscv/opentitan.c | 1 +
hw/riscv/shakti_c.c | 1 +
hw/riscv/virt-acpi-build.c | 1 +
linux-user/elfload.c | 1 +
target/i386/cpu.c | 1 +
target/i386/host-cpu.c | 1 +
target/s390x/cpu_models.c | 1 +
target/s390x/diag.c | 2 ++
29 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/accel/accel-softmmu.c b/accel/accel-softmmu.c
index f9cdafb148..9c804ba9e3 100644
--- a/accel/accel-softmmu.c
+++ b/accel/accel-softmmu.c
@@ -27,7 +27,7 @@
#include "qemu/accel.h"
#include "hw/boards.h"
#include "sysemu/cpus.h"
-
+#include "qemu/error-report.h"
#include "accel-softmmu.h"
int accel_init_machine(AccelState *accel, MachineState *ms)
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index 6aa5f1be0c..2846083546 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -48,6 +48,7 @@
#include "qemu/option.h"
#include "qemu/sockets.h"
#include "qemu/cutils.h"
+#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "monitor/hmp.h"
diff --git a/dump/dump.c b/dump/dump.c
index 544d5bce3a..1f1a6edcab 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -24,6 +24,7 @@
#include "qapi/qapi-commands-dump.h"
#include "qapi/qapi-events-dump.h"
#include "qapi/qmp/qerror.h"
+#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "hw/misc/vmcoreinfo.h"
#include "migration/blocker.h"
diff --git a/dump/win_dump.c b/dump/win_dump.c
index 0152f7330a..b7bfaff379 100644
--- a/dump/win_dump.c
+++ b/dump/win_dump.c
@@ -11,6 +11,7 @@
#include "qemu/osdep.h"
#include "sysemu/dump.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "qapi/qmp/qerror.h"
#include "exec/cpu-defs.h"
#include "hw/core/cpu.h"
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 9edff59370..a0ad1b8dc7 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -19,6 +19,8 @@
#include "exec/address-spaces.h"
#include "cpu.h"
#include "qom/object.h"
+#include "qemu/error-report.h"
+
#define RAM_SIZE (512 * MiB)
#define FLASH_SIZE (32 * MiB)
diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index 71a7df1508..8c7fa91529 100644
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -17,6 +17,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "hw/arm/allwinner-a10.h"
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 06d9add7c7..c9010b2ffb 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -37,6 +37,8 @@
#include "qemu/cutils.h"
#include "qom/object.h"
#include "hw/net/mv88w8618_eth.h"
+#include "qemu/error-report.h"
+
#define MP_MISC_BASE 0x80002000
#define MP_MISC_SIZE 0x00001000
diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index 9b31207a06..2aef579aac 100644
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -30,6 +30,8 @@
#include "sysemu/blockdev.h"
#include "sysemu/sysemu.h"
#include "sysemu/block-backend.h"
+#include "qemu/error-report.h"
+
#define NPCM7XX_POWER_ON_STRAPS_DEFAULT ( \
NPCM7XX_PWRON_STRAP_SPI0F18 | \
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index c9df063a08..9e49e9e177 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -45,6 +45,8 @@
#include "hw/loader.h"
#include "hw/sysbus.h"
#include "qemu/log.h"
+#include "qemu/error-report.h"
+
/* Nokia N8x0 support */
struct n800_s {
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index e721292079..4bf1579f8c 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -37,6 +37,8 @@
#include "exec/address-spaces.h"
#include "cpu.h"
#include "qemu/cutils.h"
+#include "qemu/error-report.h"
+
/*****************************************************************************/
/* Siemens SX1 Cellphone V1 */
diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
index 3ace474870..10653361ed 100644
--- a/hw/arm/orangepi.c
+++ b/hw/arm/orangepi.c
@@ -21,6 +21,7 @@
#include "qemu/units.h"
#include "exec/address-spaces.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "hw/arm/allwinner-h3.h"
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 1457f10c83..17c11ac4ce 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -32,6 +32,8 @@
#include "cpu.h"
#include "qemu/cutils.h"
#include "qom/object.h"
+#include "qemu/error-report.h"
+
static uint64_t static_read(void *opaque, hwaddr offset, unsigned size)
{
diff --git a/hw/core/machine-smp.c b/hw/core/machine-smp.c
index c3dab007da..89fe0cda42 100644
--- a/hw/core/machine-smp.c
+++ b/hw/core/machine-smp.c
@@ -20,6 +20,8 @@
#include "qemu/osdep.h"
#include "hw/boards.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
+
/*
* Report information of a machine's supported CPU topology hierarchy.
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
index db004d17a6..70305547d4 100644
--- a/hw/i386/sgx.c
+++ b/hw/i386/sgx.c
@@ -18,6 +18,7 @@
#include "monitor/monitor.h"
#include "monitor/hmp-target.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "qapi/qapi-commands-misc-target.h"
#include "exec/address-spaces.h"
#include "sysemu/hw_accel.h"
diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
index 6cb2472d33..8e3ce07367 100644
--- a/hw/loongarch/acpi-build.c
+++ b/hw/loongarch/acpi-build.c
@@ -7,6 +7,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "qemu/bitmap.h"
#include "hw/pci/pci.h"
#include "hw/core/cpu.h"
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index 38ef7cc49f..b702c3f51e 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -44,6 +44,8 @@
#include "sysemu/tpm.h"
#include "sysemu/block-backend.h"
#include "hw/block/flash.h"
+#include "qemu/error-report.h"
+
static void virt_flash_create(LoongArchMachineState *lams)
{
diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c
index e0d4a94f9d..ce8ee50b9e 100644
--- a/hw/m68k/next-cube.c
+++ b/hw/m68k/next-cube.c
@@ -24,6 +24,7 @@
#include "hw/block/fdc.h"
#include "hw/qdev-properties.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "ui/console.h"
#include "target/m68k/cpu.h"
#include "migration/vmstate.h"
diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index 9d52ca6613..b35ecafbc7 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -45,6 +45,7 @@
#include "hw/block/swim.h"
#include "net/net.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "sysemu/qtest.h"
#include "sysemu/runstate.h"
#include "sysemu/reset.h"
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c
index 4cb5beef1a..754b9bdfcc 100644
--- a/hw/m68k/virt.c
+++ b/hw/m68k/virt.c
@@ -23,6 +23,7 @@
#include "bootinfo.h"
#include "net/net.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "sysemu/qtest.h"
#include "sysemu/runstate.h"
#include "sysemu/reset.h"
diff --git a/hw/openrisc/boot.c b/hw/openrisc/boot.c
index 007e80cd5a..55475aa6d6 100644
--- a/hw/openrisc/boot.c
+++ b/hw/openrisc/boot.c
@@ -15,6 +15,7 @@
#include "sysemu/device_tree.h"
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
+#include "qemu/error-report.h"
#include <libfdt.h>
diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_softmmu.c
index 5170a33369..278666317e 100644
--- a/hw/ppc/spapr_softmmu.c
+++ b/hw/ppc/spapr_softmmu.c
@@ -1,12 +1,14 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qemu/memalign.h"
+#include "qemu/error-report.h"
#include "cpu.h"
#include "helper_regs.h"
#include "hw/ppc/spapr.h"
#include "mmu-hash64.h"
#include "mmu-book3s-v3.h"
+
static inline bool valid_ptex(PowerPCCPU *cpu, target_ulong ptex)
{
/*
diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
index b06944d382..bc678766e7 100644
--- a/hw/riscv/opentitan.c
+++ b/hw/riscv/opentitan.c
@@ -22,6 +22,7 @@
#include "qemu/cutils.h"
#include "hw/riscv/opentitan.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "hw/boards.h"
#include "hw/misc/unimp.h"
#include "hw/riscv/boot.h"
diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
index e43cc9445c..12ea74b032 100644
--- a/hw/riscv/shakti_c.c
+++ b/hw/riscv/shakti_c.c
@@ -20,6 +20,7 @@
#include "hw/boards.h"
#include "hw/riscv/shakti_c.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "hw/intc/sifive_plic.h"
#include "hw/intc/riscv_aclint.h"
#include "sysemu/sysemu.h"
diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c
index 82da0a238c..7331248f59 100644
--- a/hw/riscv/virt-acpi-build.c
+++ b/hw/riscv/virt-acpi-build.c
@@ -29,6 +29,7 @@
#include "hw/acpi/aml-build.h"
#include "hw/acpi/utils.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "sysemu/reset.h"
#include "migration/vmstate.h"
#include "hw/riscv/virt.h"
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 5928c14dfc..8c794586c8 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -18,6 +18,7 @@
#include "qemu/units.h"
#include "qemu/selfmap.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "target_signal.h"
#include "accel/tcg/debuginfo.h"
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index cab1e2a957..6576287e5b 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -29,6 +29,7 @@
#include "kvm/kvm_i386.h"
#include "sev.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "qapi/qapi-visit-machine.h"
#include "qapi/qmp/qerror.h"
#include "standard-headers/asm-x86/kvm_para.h"
diff --git a/target/i386/host-cpu.c b/target/i386/host-cpu.c
index 10f8aba86e..92ecb7254b 100644
--- a/target/i386/host-cpu.c
+++ b/target/i386/host-cpu.c
@@ -11,6 +11,7 @@
#include "cpu.h"
#include "host-cpu.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
/* Note: Only safe for use on x86(-64) hosts */
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 065ec6d66c..457b5cb10c 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -17,6 +17,7 @@
#include "sysemu/kvm.h"
#include "sysemu/tcg.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
#include "qemu/hw-version.h"
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index 76b01dcd68..e5f0df19e7 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -22,6 +22,8 @@
#include "hw/s390x/pv.h"
#include "sysemu/kvm.h"
#include "kvm/kvm_s390x.h"
+#include "qemu/error-report.h"
+
int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)
{
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v2 4/7] *: Add missing includes of qemu/error-report.h
2023-03-10 19:52 ` [PATCH v2 4/7] *: Add missing includes of qemu/error-report.h Richard Henderson
@ 2023-03-10 22:03 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-03-10 22:03 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: cota, alex.bennee
On 10/3/23 20:52, Richard Henderson wrote:
> This had been pulled in via qemu/plugin.h from hw/core/cpu.h,
> but that will be removed.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/accel-softmmu.c | 2 +-
> block/monitor/block-hmp-cmds.c | 1 +
> dump/dump.c | 1 +
> dump/win_dump.c | 1 +
> hw/arm/collie.c | 2 ++
> hw/arm/cubieboard.c | 1 +
> hw/arm/musicpal.c | 2 ++
> hw/arm/npcm7xx_boards.c | 2 ++
> hw/arm/nseries.c | 2 ++
> hw/arm/omap_sx1.c | 2 ++
> hw/arm/orangepi.c | 1 +
> hw/arm/palm.c | 2 ++
> hw/core/machine-smp.c | 2 ++
> hw/i386/sgx.c | 1 +
> hw/loongarch/acpi-build.c | 1 +
> hw/loongarch/virt.c | 2 ++
> hw/m68k/next-cube.c | 1 +
> hw/m68k/q800.c | 1 +
> hw/m68k/virt.c | 1 +
> hw/openrisc/boot.c | 1 +
> hw/ppc/spapr_softmmu.c | 2 ++
> hw/riscv/opentitan.c | 1 +
> hw/riscv/shakti_c.c | 1 +
> hw/riscv/virt-acpi-build.c | 1 +
> linux-user/elfload.c | 1 +
> target/i386/cpu.c | 1 +
> target/i386/host-cpu.c | 1 +
> target/s390x/cpu_models.c | 1 +
> target/s390x/diag.c | 2 ++
> 29 files changed, 39 insertions(+), 1 deletion(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 5/7] *: Add missing includes of qemu/plugin.h
2023-03-10 19:52 [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Richard Henderson
` (3 preceding siblings ...)
2023-03-10 19:52 ` [PATCH v2 4/7] *: Add missing includes of qemu/error-report.h Richard Henderson
@ 2023-03-10 19:52 ` Richard Henderson
2023-03-10 22:03 ` Philippe Mathieu-Daudé
2023-03-10 19:52 ` [PATCH v2 6/7] include/qemu: Split out plugin-event.h Richard Henderson
` (3 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Richard Henderson @ 2023-03-10 19:52 UTC (permalink / raw)
To: qemu-devel; +Cc: cota, alex.bennee
This had been pulled in from hw/core/cpu.h,
but that will be removed.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/cpu-exec-common.c | 1 +
cpu.c | 1 +
linux-user/exit.c | 1 +
linux-user/syscall.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/accel/tcg/cpu-exec-common.c b/accel/tcg/cpu-exec-common.c
index 176ea57281..e7962c9348 100644
--- a/accel/tcg/cpu-exec-common.c
+++ b/accel/tcg/cpu-exec-common.c
@@ -21,6 +21,7 @@
#include "sysemu/cpus.h"
#include "sysemu/tcg.h"
#include "exec/exec-all.h"
+#include "qemu/plugin.h"
bool tcg_allowed;
diff --git a/cpu.c b/cpu.c
index 567b23af46..849bac062c 100644
--- a/cpu.c
+++ b/cpu.c
@@ -42,6 +42,7 @@
#include "hw/core/accel-cpu.h"
#include "trace/trace-root.h"
#include "qemu/accel.h"
+#include "qemu/plugin.h"
uintptr_t qemu_host_page_size;
intptr_t qemu_host_page_mask;
diff --git a/linux-user/exit.c b/linux-user/exit.c
index fd49d76f45..3017d28a3c 100644
--- a/linux-user/exit.c
+++ b/linux-user/exit.c
@@ -21,6 +21,7 @@
#include "gdbstub/syscalls.h"
#include "qemu.h"
#include "user-internals.h"
+#include "qemu/plugin.h"
#ifdef CONFIG_GPROF
#include <sys/gmon.h>
#endif
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index a6c426d73c..38f3f5f784 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -22,6 +22,7 @@
#include "qemu/path.h"
#include "qemu/memfd.h"
#include "qemu/queue.h"
+#include "qemu/plugin.h"
#include <elf.h>
#include <endian.h>
#include <grp.h>
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH v2 6/7] include/qemu: Split out plugin-event.h
2023-03-10 19:52 [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Richard Henderson
` (4 preceding siblings ...)
2023-03-10 19:52 ` [PATCH v2 5/7] *: Add missing includes of qemu/plugin.h Richard Henderson
@ 2023-03-10 19:52 ` Richard Henderson
2023-03-10 22:04 ` Philippe Mathieu-Daudé
2023-03-10 19:52 ` [PATCH v2 7/7] include/qemu/plugin: Inline qemu_plugin_disable_mem_helpers Richard Henderson
` (2 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Richard Henderson @ 2023-03-10 19:52 UTC (permalink / raw)
To: qemu-devel; +Cc: cota, alex.bennee
The usage in hw/core/cpu.h only requires QEMU_PLUGIN_EV_MAX.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/core/cpu.h | 2 +-
include/qemu/plugin-event.h | 26 ++++++++++++++++++++++++++
include/qemu/plugin.h | 17 +----------------
3 files changed, 28 insertions(+), 17 deletions(-)
create mode 100644 include/qemu/plugin-event.h
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 75689bff02..821e937020 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -30,7 +30,7 @@
#include "qemu/rcu_queue.h"
#include "qemu/queue.h"
#include "qemu/thread.h"
-#include "qemu/plugin.h"
+#include "qemu/plugin-event.h"
#include "qom/object.h"
typedef int (*WriteCoreDumpFunction)(const void *buf, size_t size,
diff --git a/include/qemu/plugin-event.h b/include/qemu/plugin-event.h
new file mode 100644
index 0000000000..7056d8427b
--- /dev/null
+++ b/include/qemu/plugin-event.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2017, Emilio G. Cota <cota@braap.org>
+ *
+ * License: GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#ifndef QEMU_PLUGIN_EVENT_H
+#define QEMU_PLUGIN_EVENT_H
+
+/*
+ * Events that plugins can subscribe to.
+ */
+enum qemu_plugin_event {
+ QEMU_PLUGIN_EV_VCPU_INIT,
+ QEMU_PLUGIN_EV_VCPU_EXIT,
+ QEMU_PLUGIN_EV_VCPU_TB_TRANS,
+ QEMU_PLUGIN_EV_VCPU_IDLE,
+ QEMU_PLUGIN_EV_VCPU_RESUME,
+ QEMU_PLUGIN_EV_VCPU_SYSCALL,
+ QEMU_PLUGIN_EV_VCPU_SYSCALL_RET,
+ QEMU_PLUGIN_EV_FLUSH,
+ QEMU_PLUGIN_EV_ATEXIT,
+ QEMU_PLUGIN_EV_MAX, /* total number of plugin events we support */
+};
+
+#endif /* QEMU_PLUGIN_EVENT_H */
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h
index e0ebedef84..6bf4bce188 100644
--- a/include/qemu/plugin.h
+++ b/include/qemu/plugin.h
@@ -12,24 +12,9 @@
#include "qemu/error-report.h"
#include "qemu/queue.h"
#include "qemu/option.h"
+#include "qemu/plugin-event.h"
#include "exec/memopidx.h"
-/*
- * Events that plugins can subscribe to.
- */
-enum qemu_plugin_event {
- QEMU_PLUGIN_EV_VCPU_INIT,
- QEMU_PLUGIN_EV_VCPU_EXIT,
- QEMU_PLUGIN_EV_VCPU_TB_TRANS,
- QEMU_PLUGIN_EV_VCPU_IDLE,
- QEMU_PLUGIN_EV_VCPU_RESUME,
- QEMU_PLUGIN_EV_VCPU_SYSCALL,
- QEMU_PLUGIN_EV_VCPU_SYSCALL_RET,
- QEMU_PLUGIN_EV_FLUSH,
- QEMU_PLUGIN_EV_ATEXIT,
- QEMU_PLUGIN_EV_MAX, /* total number of plugin events we support */
-};
-
/*
* Option parsing/processing.
* Note that we can load an arbitrary number of plugins.
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v2 6/7] include/qemu: Split out plugin-event.h
2023-03-10 19:52 ` [PATCH v2 6/7] include/qemu: Split out plugin-event.h Richard Henderson
@ 2023-03-10 22:04 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-03-10 22:04 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: cota, alex.bennee
On 10/3/23 20:52, Richard Henderson wrote:
> The usage in hw/core/cpu.h only requires QEMU_PLUGIN_EV_MAX.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/hw/core/cpu.h | 2 +-
> include/qemu/plugin-event.h | 26 ++++++++++++++++++++++++++
> include/qemu/plugin.h | 17 +----------------
> 3 files changed, 28 insertions(+), 17 deletions(-)
> create mode 100644 include/qemu/plugin-event.h
>
> diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
> index 75689bff02..821e937020 100644
> --- a/include/hw/core/cpu.h
> +++ b/include/hw/core/cpu.h
> @@ -30,7 +30,7 @@
> #include "qemu/rcu_queue.h"
> #include "qemu/queue.h"
> #include "qemu/thread.h"
> -#include "qemu/plugin.h"
\o/
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 7/7] include/qemu/plugin: Inline qemu_plugin_disable_mem_helpers
2023-03-10 19:52 [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Richard Henderson
` (5 preceding siblings ...)
2023-03-10 19:52 ` [PATCH v2 6/7] include/qemu: Split out plugin-event.h Richard Henderson
@ 2023-03-10 19:52 ` Richard Henderson
2023-03-10 22:04 ` Philippe Mathieu-Daudé
2023-03-13 10:47 ` [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Alex Bennée
2023-03-19 14:06 ` Emilio Cota
8 siblings, 1 reply; 15+ messages in thread
From: Richard Henderson @ 2023-03-10 19:52 UTC (permalink / raw)
To: qemu-devel; +Cc: cota, alex.bennee
Now that we've broken the include loop with cpu.h,
we can bring this inline.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/qemu/plugin.h | 6 +++++-
plugins/core.c | 11 -----------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h
index 6bf4bce188..bc0781cab8 100644
--- a/include/qemu/plugin.h
+++ b/include/qemu/plugin.h
@@ -14,6 +14,7 @@
#include "qemu/option.h"
#include "qemu/plugin-event.h"
#include "exec/memopidx.h"
+#include "hw/core/cpu.h"
/*
* Option parsing/processing.
@@ -204,7 +205,10 @@ void qemu_plugin_atexit_cb(void);
void qemu_plugin_add_dyn_cb_arr(GArray *arr);
-void qemu_plugin_disable_mem_helpers(CPUState *cpu);
+static inline void qemu_plugin_disable_mem_helpers(CPUState *cpu)
+{
+ cpu->plugin_mem_cbs = NULL;
+}
/**
* qemu_plugin_user_exit(): clean-up callbacks before calling exit callbacks
diff --git a/plugins/core.c b/plugins/core.c
index 04632886b9..9912f2cfdb 100644
--- a/plugins/core.c
+++ b/plugins/core.c
@@ -553,17 +553,6 @@ void qemu_plugin_user_postfork(bool is_child)
}
}
-
-/*
- * Call this function after longjmp'ing to the main loop. It's possible that the
- * last instruction of a TB might have used helpers, and therefore the
- * "disable" instruction will never execute because it ended up as dead code.
- */
-void qemu_plugin_disable_mem_helpers(CPUState *cpu)
-{
- cpu->plugin_mem_cbs = NULL;
-}
-
static bool plugin_dyn_cb_arr_cmp(const void *ap, const void *bp)
{
return ap == bp;
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit
2023-03-10 19:52 [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Richard Henderson
` (6 preceding siblings ...)
2023-03-10 19:52 ` [PATCH v2 7/7] include/qemu/plugin: Inline qemu_plugin_disable_mem_helpers Richard Henderson
@ 2023-03-13 10:47 ` Alex Bennée
2023-03-19 14:06 ` Emilio Cota
8 siblings, 0 replies; 15+ messages in thread
From: Alex Bennée @ 2023-03-13 10:47 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, cota
Richard Henderson <richard.henderson@linaro.org> writes:
> Changes for v2:
> * Use plugin_gen_disable_mem_helpers,
> * Remove plugin_gen_disable_mem_helpers from tcg_gen_exit_tb.
> * Break include loop with hw/core/cpu.h and qemu/plugins.h.
> * Inline plugin_gen_disable_mem_helpers.
Queued to for-8.0/tweaks-and-fixes, thanks.
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit
2023-03-10 19:52 [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Richard Henderson
` (7 preceding siblings ...)
2023-03-13 10:47 ` [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit Alex Bennée
@ 2023-03-19 14:06 ` Emilio Cota
2023-03-20 17:31 ` Alex Bennée
8 siblings, 1 reply; 15+ messages in thread
From: Emilio Cota @ 2023-03-19 14:06 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, alex.bennee
On Fri, Mar 10, 2023 at 11:52:45 -0800, Richard Henderson wrote:
> Changes for v2:
(snip)
> Richard Henderson (7):
> tcg: Clear plugin_mem_cbs on TB exit
> tcg: Drop plugin_gen_disable_mem_helpers from tcg_gen_exit_tb
> include/qemu/plugin: Remove QEMU_PLUGIN_ASSERT
> *: Add missing includes of qemu/error-report.h
> *: Add missing includes of qemu/plugin.h
> include/qemu: Split out plugin-event.h
> include/qemu/plugin: Inline qemu_plugin_disable_mem_helpers
Reviewed-by: Emilio Cota <cota@braap.org>
Thanks, Richard!
Alex: is it too late to add my R-b tags to the series?
Emilio
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH v2 0/7] plugin: fix clearing of plugin_mem_cbs on TB exit
2023-03-19 14:06 ` Emilio Cota
@ 2023-03-20 17:31 ` Alex Bennée
0 siblings, 0 replies; 15+ messages in thread
From: Alex Bennée @ 2023-03-20 17:31 UTC (permalink / raw)
To: Emilio Cota; +Cc: Richard Henderson, qemu-devel
Emilio Cota <cota@braap.org> writes:
> On Fri, Mar 10, 2023 at 11:52:45 -0800, Richard Henderson wrote:
>> Changes for v2:
> (snip)
>> Richard Henderson (7):
>> tcg: Clear plugin_mem_cbs on TB exit
>> tcg: Drop plugin_gen_disable_mem_helpers from tcg_gen_exit_tb
>> include/qemu/plugin: Remove QEMU_PLUGIN_ASSERT
>> *: Add missing includes of qemu/error-report.h
>> *: Add missing includes of qemu/plugin.h
>> include/qemu: Split out plugin-event.h
>> include/qemu/plugin: Inline qemu_plugin_disable_mem_helpers
>
> Reviewed-by: Emilio Cota <cota@braap.org>
>
> Thanks, Richard!
>
> Alex: is it too late to add my R-b tags to the series?
I have to re-roll so I'll do that now.
>
> Emilio
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 15+ messages in thread