mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plugins: Read mem_only directly from TB cflags

Browse Source 
Do not pass around a boolean between multiple structures,
just read it from the TranslationBlock in the TCGContext.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-04-03 09:31:49 -10:00
parent 36bc99bc78
commit e501325991
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accel/tcg/plugin-gen.c
View File

@ -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 plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db)
bool mem_only)
{ {
bool ret = false; bool ret = false;
@ -323,7 +322,6 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db,
ptb->vaddr2 = -1; ptb->vaddr2 = -1;
ptb->haddr1 = db->host_addr[0]; ptb->haddr1 = db->host_addr[0];
ptb->haddr2 = NULL; ptb->haddr2 = NULL;
ptb->mem_only = mem_only;
ptb->mem_helper = false; ptb->mem_helper = false;
tcg_gen_plugin_cb(PLUGIN_GEN_FROM_TB); tcg_gen_plugin_cb(PLUGIN_GEN_FROM_TB);

2
accel/tcg/translator.c
View File

@ -144,7 +144,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
ops->tb_start(db, cpu); ops->tb_start(db, cpu);
tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */ 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; db->plugin_enabled = plugin_enabled;
while (true) { while (true) {

7
include/exec/plugin-gen.h
View File

@ -18,8 +18,7 @@ struct DisasContextBase;
#ifdef CONFIG_PLUGIN #ifdef CONFIG_PLUGIN
bool plugin_gen_tb_start(CPUState *cpu, const struct DisasContextBase *db, bool plugin_gen_tb_start(CPUState *cpu, const struct DisasContextBase *db);
bool supress);
void plugin_gen_tb_end(CPUState *cpu, size_t num_insns); 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_start(CPUState *cpu, const struct DisasContextBase *db);
void plugin_gen_insn_end(void); void plugin_gen_insn_end(void);
@ -28,8 +27,8 @@ void plugin_gen_disable_mem_helpers(void);
#else /* !CONFIG_PLUGIN */ #else /* !CONFIG_PLUGIN */
static inline bool static inline
plugin_gen_tb_start(CPUState *cpu, const struct DisasContextBase *db, bool sup) bool plugin_gen_tb_start(CPUState *cpu, const struct DisasContextBase *db)
{ {
return false; return false;
} }

3
include/qemu/plugin.h
View File

@ -107,8 +107,6 @@ struct qemu_plugin_insn {
/* if set, the instruction calls helpers that might access guest memory */ /* if set, the instruction calls helpers that might access guest memory */
bool mem_helper; bool mem_helper;
bool mem_only;
}; };
/* A scoreboard is an array of values, indexed by vcpu_index */ /* A scoreboard is an array of values, indexed by vcpu_index */
@ -125,7 +123,6 @@ struct qemu_plugin_tb {
uint64_t vaddr2; uint64_t vaddr2;
void *haddr1; void *haddr1;
void *haddr2; void *haddr2;
bool mem_only;
/* if set, the TB calls helpers that might access guest memory */ /* if set, the TB calls helpers that might access guest memory */
bool mem_helper; bool mem_helper;

14
plugins/api.c
View File

@ -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); 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, void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb,
qemu_plugin_vcpu_udata_cb_t cb, qemu_plugin_vcpu_udata_cb_t cb,
enum qemu_plugin_cb_flags flags, enum qemu_plugin_cb_flags flags,
void *udata) void *udata)
{ {
if (!tb->mem_only) { if (!tb_is_mem_only()) {
plugin_register_dyn_cb__udata(&tb->cbs, cb, flags, udata); 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, qemu_plugin_u64 entry,
uint64_t imm) uint64_t imm)
{ {
if (!tb->mem_only) { if (!tb_is_mem_only()) {
plugin_register_inline_op_on_entry(&tb->cbs, 0, op, entry, imm); 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, enum qemu_plugin_cb_flags flags,
void *udata) void *udata)
{ {
if (!insn->mem_only) { if (!tb_is_mem_only()) {
plugin_register_dyn_cb__udata(&insn->insn_cbs, cb, flags, udata); 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, qemu_plugin_u64 entry,
uint64_t imm) 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); 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; return NULL;
} }
insn = g_ptr_array_index(tb->insns, idx); insn = g_ptr_array_index(tb->insns, idx);
insn->mem_only = tb->mem_only;
return insn; return insn;
} }