[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/32] plugins: Read mem_only directly from TB cflags
From: |
Richard Henderson |
Subject: |
[PATCH 12/32] plugins: Read mem_only directly from TB cflags |
Date: |
Fri, 5 Apr 2024 00:24:39 -1000 |
Do not pass around a boolean between multiple structures,
just read it from the TranslationBlock in the TCGContext.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/plugin-gen.h | 7 +++----
include/qemu/plugin.h | 3 ---
accel/tcg/plugin-gen.c | 4 +---
accel/tcg/translator.c | 2 +-
plugins/api.c | 14 +++++++++-----
5 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/include/exec/plugin-gen.h b/include/exec/plugin-gen.h
index f333f33198..cbb2ca2131 100644
--- a/include/exec/plugin-gen.h
+++ b/include/exec/plugin-gen.h
@@ -18,8 +18,7 @@ struct DisasContextBase;
#ifdef CONFIG_PLUGIN
-bool plugin_gen_tb_start(CPUState *cpu, const struct DisasContextBase *db,
- bool supress);
+bool plugin_gen_tb_start(CPUState *cpu, const struct DisasContextBase *db);
void plugin_gen_tb_end(CPUState *cpu, size_t num_insns);
void plugin_gen_insn_start(CPUState *cpu, const struct DisasContextBase *db);
void plugin_gen_insn_end(void);
@@ -28,8 +27,8 @@ void plugin_gen_disable_mem_helpers(void);
#else /* !CONFIG_PLUGIN */
-static inline bool
-plugin_gen_tb_start(CPUState *cpu, const struct DisasContextBase *db, bool sup)
+static inline
+bool plugin_gen_tb_start(CPUState *cpu, const struct DisasContextBase *db)
{
return false;
}
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h
index c32bb97667..03081be543 100644
--- a/include/qemu/plugin.h
+++ b/include/qemu/plugin.h
@@ -106,8 +106,6 @@ struct qemu_plugin_insn {
/* if set, the instruction calls helpers that might access guest memory */
bool mem_helper;
-
- bool mem_only;
};
/* A scoreboard is an array of values, indexed by vcpu_index */
@@ -124,7 +122,6 @@ struct qemu_plugin_tb {
uint64_t vaddr2;
void *haddr1;
void *haddr2;
- bool mem_only;
/* if set, the TB calls helpers that might access guest memory */
bool mem_helper;
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
index be2451be58..a4656859c6 100644
--- a/accel/tcg/plugin-gen.c
+++ b/accel/tcg/plugin-gen.c
@@ -303,8 +303,7 @@ static void plugin_gen_inject(struct qemu_plugin_tb
*plugin_tb)
}
}
-bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db,
- bool mem_only)
+bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db)
{
bool ret = false;
@@ -323,7 +322,6 @@ bool plugin_gen_tb_start(CPUState *cpu, const
DisasContextBase *db,
ptb->vaddr2 = -1;
ptb->haddr1 = db->host_addr[0];
ptb->haddr2 = NULL;
- ptb->mem_only = mem_only;
ptb->mem_helper = false;
tcg_gen_plugin_cb(PLUGIN_GEN_FROM_TB);
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 0a1d26b2e8..46483414d2 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -155,7 +155,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb,
int *max_insns,
ops->tb_start(db, cpu);
tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */
- plugin_enabled = plugin_gen_tb_start(cpu, db, cflags & CF_MEMI_ONLY);
+ plugin_enabled = plugin_gen_tb_start(cpu, db);
db->plugin_enabled = plugin_enabled;
while (true) {
diff --git a/plugins/api.c b/plugins/api.c
index 7b8b7523b3..39895a1cb1 100644
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -87,12 +87,17 @@ void qemu_plugin_register_vcpu_exit_cb(qemu_plugin_id_t id,
plugin_register_cb(id, QEMU_PLUGIN_EV_VCPU_EXIT, cb);
}
+static bool tb_is_mem_only(void)
+{
+ return tb_cflags(tcg_ctx->gen_tb) & CF_MEMI_ONLY;
+}
+
void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb,
qemu_plugin_vcpu_udata_cb_t cb,
enum qemu_plugin_cb_flags flags,
void *udata)
{
- if (!tb->mem_only) {
+ if (!tb_is_mem_only()) {
plugin_register_dyn_cb__udata(&tb->cbs, cb, flags, udata);
}
}
@@ -103,7 +108,7 @@ void qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu(
qemu_plugin_u64 entry,
uint64_t imm)
{
- if (!tb->mem_only) {
+ if (!tb_is_mem_only()) {
plugin_register_inline_op_on_entry(&tb->cbs, 0, op, entry, imm);
}
}
@@ -113,7 +118,7 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct
qemu_plugin_insn *insn,
enum qemu_plugin_cb_flags flags,
void *udata)
{
- if (!insn->mem_only) {
+ if (!tb_is_mem_only()) {
plugin_register_dyn_cb__udata(&insn->insn_cbs, cb, flags, udata);
}
}
@@ -124,7 +129,7 @@ void qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu(
qemu_plugin_u64 entry,
uint64_t imm)
{
- if (!insn->mem_only) {
+ if (!tb_is_mem_only()) {
plugin_register_inline_op_on_entry(&insn->insn_cbs, 0, op, entry, imm);
}
}
@@ -206,7 +211,6 @@ qemu_plugin_tb_get_insn(const struct qemu_plugin_tb *tb,
size_t idx)
return NULL;
}
insn = g_ptr_array_index(tb->insns, idx);
- insn->mem_only = tb->mem_only;
return insn;
}
--
2.34.1
- [PATCH 09/32] plugins: Copy memory in qemu_plugin_insn_data, (continued)
- [PATCH 09/32] plugins: Copy memory in qemu_plugin_insn_data, Richard Henderson, 2024/04/05
- [PATCH 10/32] accel/tcg: Implement translator_st, Richard Henderson, 2024/04/05
- [PATCH 08/32] accel/tcg: Record DisasContextBase in tcg_ctx for plugins, Richard Henderson, 2024/04/05
- [PATCH 11/32] plugins: Use translator_st for qemu_plugin_insn_data, Richard Henderson, 2024/04/05
- [PATCH 15/32] plugins: Merge alloc_tcg_plugin_context into plugin_gen_tb_start, Richard Henderson, 2024/04/05
- [PATCH 03/32] accel/tcg: Pass DisasContextBase to translator_fake_ldb, Richard Henderson, 2024/04/05
- [PATCH 01/32] accel/tcg: Use vaddr in translator_ld*, Richard Henderson, 2024/04/05
- [PATCH 06/32] accel/tcg: Record mmio bytes during translation, Richard Henderson, 2024/04/05
- [PATCH 12/32] plugins: Read mem_only directly from TB cflags,
Richard Henderson <=
- [PATCH 13/32] plugins: Use DisasContextBase for qemu_plugin_insn_haddr, Richard Henderson, 2024/04/05
- [PATCH 14/32] plugins: Use DisasContextBase for qemu_plugin_tb_vaddr, Richard Henderson, 2024/04/05
- [PATCH 19/32] disas: Use translator_st to get disassembly data, Richard Henderson, 2024/04/05
- [PATCH 17/32] accel/tcg: Return bool from TranslatorOps.disas_log, Richard Henderson, 2024/04/05
- [PATCH 16/32] accel/tcg: Provide default implementation of disas_log, Richard Henderson, 2024/04/05
- [PATCH 20/32] accel/tcg: Introduce translator_fake_ld, Richard Henderson, 2024/04/05