| Message ID | 20231019102657.129512-17-akihiko.odaki@daynix.com |
|---|---|
| State | New |
| Headers | show |
| Series | plugins: Allow to read registers | expand |
Akihiko Odaki <akihiko.odaki@daynix.com> writes: > This avoids optimizations incompatible when reading registers. > > Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> > --- > accel/tcg/plugin-helpers.h | 3 ++- > include/exec/plugin-gen.h | 4 ++-- > include/hw/core/cpu.h | 4 ++-- > include/qemu/plugin.h | 3 +++ > plugins/plugin.h | 5 +++-- > accel/tcg/plugin-gen.c | 41 ++++++++++++++++++++++++++++---------- > accel/tcg/translator.c | 2 +- > plugins/api.c | 14 +++++++++++-- > plugins/core.c | 28 ++++++++++++++++---------- > 9 files changed, 72 insertions(+), 32 deletions(-) > > diff --git a/accel/tcg/plugin-helpers.h b/accel/tcg/plugin-helpers.h > index 8e685e0654..11796436f3 100644 > --- a/accel/tcg/plugin-helpers.h > +++ b/accel/tcg/plugin-helpers.h > @@ -1,4 +1,5 @@ <snip> > --- a/include/hw/core/cpu.h > +++ b/include/hw/core/cpu.h > @@ -437,7 +437,7 @@ struct qemu_work_item; > * @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes > * to @trace_dstate). > * @trace_dstate: Dynamic tracing state of events for this vCPU (bitmask). > - * @plugin_mask: Plugin event bitmap. Modified only via async work. > + * @plugin_flags: Plugin flags. Modified only via async work. > * @ignore_memory_transaction_failures: Cached copy of the MachineState > * flag of the same name: allows the board to suppress calling of the > * CPU do_transaction_failed hook function. > @@ -529,7 +529,7 @@ struct CPUState { > /* Use by accel-block: CPU is executing an ioctl() */ > QemuLockCnt in_ioctl_lock; > > - DECLARE_BITMAP(plugin_mask, QEMU_PLUGIN_EV_MAX); > + unsigned long plugin_flags; Why are we dropping DECLARE_BITMAP here? It does ensure we will always have the right size. > > #ifdef CONFIG_PLUGIN > GArray *plugin_mem_cbs; > diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h > index 7fdc3a4849..a534b9127b 100644 > --- a/include/qemu/plugin.h > +++ b/include/qemu/plugin.h > @@ -16,6 +16,9 @@ > #include "exec/memopidx.h" > #include "hw/core/cpu.h" > > +#define QEMU_PLUGIN_FLAG_TB_CB_READ QEMU_PLUGIN_EV_MAX > +#define QEMU_PLUGIN_FLAG_INSN_CB_READ (QEMU_PLUGIN_EV_MAX + 1) > + OK this seems like bad code smell. Are we overloading what was plugin_mask to indicate two different things? I can see we only really use the flags to indicate syscalls should generate callbacks so maybe this could be rationlised but at least split into two patches so the change to original behaviour isn't mixed up with new added behaviour. > /* > * Option parsing/processing. > * Note that we can load an arbitrary number of plugins. > diff --git a/plugins/plugin.h b/plugins/plugin.h > index 5eb2fdbc85..ba0417194f 100644 > --- a/plugins/plugin.h > +++ b/plugins/plugin.h > @@ -16,6 +16,7 @@ > #include "qemu/qht.h" > > #define QEMU_PLUGIN_MIN_VERSION 0 > +#define QEMU_PLUGIN_FLAG_INSIN_CB_READ QEMU_PLUGIN_EV_MAX Double definition. > > /* global state */ > struct qemu_plugin_state { > @@ -31,7 +32,7 @@ struct qemu_plugin_state { > * but with the HT we avoid adding a field to CPUState. > */ > GHashTable *cpu_ht; > - DECLARE_BITMAP(mask, QEMU_PLUGIN_EV_MAX); > + unsigned long flags; > /* > * @lock protects the struct as well as ctx->uninstalling. > * The lock must be acquired by all API ops. > @@ -86,7 +87,7 @@ plugin_register_cb_udata(qemu_plugin_id_t id, enum qemu_plugin_event ev, > void > plugin_register_dyn_cb__udata(GArray **arr, > qemu_plugin_vcpu_udata_cb_t cb, > - enum qemu_plugin_cb_flags flags, void *udata); > + unsigned int flags, void *udata); > > > void plugin_register_vcpu_mem_cb(GArray **arr, > diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c > index 78b331b251..3bddd4d3c5 100644 > --- a/accel/tcg/plugin-gen.c > +++ b/accel/tcg/plugin-gen.c > @@ -90,7 +90,10 @@ enum plugin_gen_cb { > * These helpers are stubs that get dynamically switched out for calls > * direct to the plugin if they are subscribed to. > */ > -void HELPER(plugin_vcpu_udata_cb)(uint32_t cpu_index, void *udata) > +void HELPER(plugin_vcpu_udata_cb_no_wg)(uint32_t cpu_index, void *udata) > +{ } > + > +void HELPER(plugin_vcpu_udata_cb_no_rwg)(uint32_t cpu_index, void *udata) > { } > > void HELPER(plugin_vcpu_mem_cb)(unsigned int vcpu_index, > @@ -98,7 +101,7 @@ void HELPER(plugin_vcpu_mem_cb)(unsigned int vcpu_index, > void *userdata) > { } > > -static void gen_empty_udata_cb(void) > +static void gen_empty_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr)) > { > TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); > TCGv_ptr udata = tcg_temp_ebb_new_ptr(); > @@ -106,12 +109,22 @@ static void gen_empty_udata_cb(void) > tcg_gen_movi_ptr(udata, 0); > tcg_gen_ld_i32(cpu_index, tcg_env, > -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); > - gen_helper_plugin_vcpu_udata_cb(cpu_index, udata); > + gen_helper(cpu_index, udata); > > tcg_temp_free_ptr(udata); > tcg_temp_free_i32(cpu_index); > } > > +static void gen_empty_udata_cb_no_wg(void) > +{ > + gen_empty_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_wg); > +} > + > +static void gen_empty_udata_cb_no_rwg(void) > +{ > + gen_empty_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_rwg); > +} > + > /* > * For now we only support addi_i64. > * When we support more ops, we can generate one empty inline cb for each. > @@ -176,7 +189,7 @@ static void gen_wrapped(enum plugin_gen_from from, > tcg_gen_plugin_cb_end(); > } > > -static void plugin_gen_empty_callback(enum plugin_gen_from from) > +static void plugin_gen_empty_callback(CPUState *cpu, enum plugin_gen_from from) > { > switch (from) { > case PLUGIN_GEN_AFTER_INSN: > @@ -190,9 +203,15 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) > */ > gen_wrapped(from, PLUGIN_GEN_ENABLE_MEM_HELPER, > gen_empty_mem_helper); > - /* fall through */ > + gen_wrapped(from, PLUGIN_GEN_CB_UDATA, > + cpu->plugin_flags & BIT(QEMU_PLUGIN_FLAG_INSN_CB_READ) ? > + gen_empty_udata_cb_no_wg : gen_empty_udata_cb_no_rwg); > + gen_wrapped(from, PLUGIN_GEN_CB_INLINE, gen_empty_inline_cb); > + break; > case PLUGIN_GEN_FROM_TB: > - gen_wrapped(from, PLUGIN_GEN_CB_UDATA, gen_empty_udata_cb); > + gen_wrapped(from, PLUGIN_GEN_CB_UDATA, > + cpu->plugin_flags & BIT(QEMU_PLUGIN_FLAG_TB_CB_READ) ? > + gen_empty_udata_cb_no_wg : > gen_empty_udata_cb_no_rwg); What stops us from generating two empty callbacks (one no_wg one no_rwg) and just discarding the unused ones after the instrumentation pass? > gen_wrapped(from, PLUGIN_GEN_CB_INLINE, gen_empty_inline_cb); > break; > default: > @@ -796,7 +815,7 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, > { > bool ret = false; > > - if (test_bit(QEMU_PLUGIN_EV_VCPU_TB_TRANS, cpu->plugin_mask)) { > + if (cpu->plugin_flags & BIT(QEMU_PLUGIN_EV_VCPU_TB_TRANS)) { > struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; > int i; > > @@ -817,7 +836,7 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, > ptb->mem_only = mem_only; > ptb->mem_helper = false; > > - plugin_gen_empty_callback(PLUGIN_GEN_FROM_TB); > + plugin_gen_empty_callback(cpu, PLUGIN_GEN_FROM_TB); > } > > tcg_ctx->plugin_insn = NULL; > @@ -832,7 +851,7 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) > > pinsn = qemu_plugin_tb_insn_get(ptb, db->pc_next); > tcg_ctx->plugin_insn = pinsn; > - plugin_gen_empty_callback(PLUGIN_GEN_FROM_INSN); > + plugin_gen_empty_callback(cpu, PLUGIN_GEN_FROM_INSN); > > /* > * Detect page crossing to get the new host address. > @@ -852,9 +871,9 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) > } > } > > -void plugin_gen_insn_end(void) > +void plugin_gen_insn_end(CPUState *cpu) > { > - plugin_gen_empty_callback(PLUGIN_GEN_AFTER_INSN); > + plugin_gen_empty_callback(cpu, PLUGIN_GEN_AFTER_INSN); > } > > /* > diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c > index 575b9812ad..bec58dd93f 100644 > --- a/accel/tcg/translator.c > +++ b/accel/tcg/translator.c > @@ -189,7 +189,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns, > * to accurately track instrumented helpers that might access memory. > */ > if (plugin_enabled) { > - plugin_gen_insn_end(); > + plugin_gen_insn_end(cpu); > } > > /* Stop translation if translate_insn so indicated. */ > diff --git a/plugins/api.c b/plugins/api.c > index 5521b0ad36..326e37cb73 100644 > --- a/plugins/api.c > +++ b/plugins/api.c > @@ -89,8 +89,13 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, > void *udata) > { > if (!tb->mem_only) { > + bool read = flags == QEMU_PLUGIN_CB_R_REGS || > + flags == QEMU_PLUGIN_CB_RW_REGS; > + > plugin_register_dyn_cb__udata(&tb->cbs[PLUGIN_CB_REGULAR], > - cb, flags, udata); > + cb, > + read ? BIT(QEMU_PLUGIN_FLAG_TB_CB_READ) : 0, > + udata); > } > } > > @@ -109,8 +114,13 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, > void *udata) > { > if (!insn->mem_only) { > + bool read = flags == QEMU_PLUGIN_CB_R_REGS || > + flags == QEMU_PLUGIN_CB_RW_REGS; > + > plugin_register_dyn_cb__udata(&insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR], > - cb, flags, udata); > + cb, > + read ? BIT(QEMU_PLUGIN_FLAG_INSN_CB_READ) : 0, > + udata); > } > } > > diff --git a/plugins/core.c b/plugins/core.c > index fcd33a2bff..f461e84473 100644 > --- a/plugins/core.c > +++ b/plugins/core.c > @@ -55,19 +55,19 @@ struct qemu_plugin_ctx *plugin_id_to_ctx_locked(qemu_plugin_id_t id) > > static void plugin_cpu_update__async(CPUState *cpu, run_on_cpu_data data) > { > - bitmap_copy(cpu->plugin_mask, &data.host_ulong, QEMU_PLUGIN_EV_MAX); > + cpu->plugin_flags = data.host_ulong; > tcg_flush_jmp_cache(cpu); > } > > static void plugin_cpu_update__locked(gpointer k, gpointer v, gpointer udata) > { > CPUState *cpu = container_of(k, CPUState, cpu_index); > - run_on_cpu_data mask = RUN_ON_CPU_HOST_ULONG(*plugin.mask); > + run_on_cpu_data flags = RUN_ON_CPU_HOST_ULONG(plugin.flags); > > if (DEVICE(cpu)->realized) { > - async_run_on_cpu(cpu, plugin_cpu_update__async, mask); > + async_run_on_cpu(cpu, plugin_cpu_update__async, flags); > } else { > - plugin_cpu_update__async(cpu, mask); > + plugin_cpu_update__async(cpu, flags); > } > } > > @@ -83,7 +83,7 @@ void plugin_unregister_cb__locked(struct qemu_plugin_ctx *ctx, > g_free(cb); > ctx->callbacks[ev] = NULL; > if (QLIST_EMPTY_RCU(&plugin.cb_lists[ev])) { > - clear_bit(ev, plugin.mask); > + plugin.flags &= ~BIT(ev); > g_hash_table_foreach(plugin.cpu_ht, plugin_cpu_update__locked, NULL); > } > } > @@ -186,8 +186,8 @@ do_plugin_register_cb(qemu_plugin_id_t id, enum qemu_plugin_event ev, > cb->udata = udata; > ctx->callbacks[ev] = cb; > QLIST_INSERT_HEAD_RCU(&plugin.cb_lists[ev], cb, entry); > - if (!test_bit(ev, plugin.mask)) { > - set_bit(ev, plugin.mask); > + if (!(plugin.flags & BIT(ev))) { > + plugin.flags |= BIT(ev); > g_hash_table_foreach(plugin.cpu_ht, plugin_cpu_update__locked, > NULL); > } > @@ -296,15 +296,20 @@ void plugin_register_inline_op(GArray **arr, > > void plugin_register_dyn_cb__udata(GArray **arr, > qemu_plugin_vcpu_udata_cb_t cb, > - enum qemu_plugin_cb_flags flags, > + unsigned int flags, > void *udata) > { > struct qemu_plugin_dyn_cb *dyn_cb = plugin_get_dyn_cb(arr); > > dyn_cb->userp = udata; > - /* Note flags are discarded as unused. */ > dyn_cb->f.vcpu_udata = cb; > dyn_cb->type = PLUGIN_CB_REGULAR; > + > + if (flags) { > + QEMU_LOCK_GUARD(&plugin.lock); > + plugin.flags |= flags; > + g_hash_table_foreach(plugin.cpu_ht, plugin_cpu_update__locked, NULL); > + } > } > > void plugin_register_vcpu_mem_cb(GArray **arr, > @@ -357,7 +362,7 @@ qemu_plugin_vcpu_syscall(CPUState *cpu, int64_t num, uint64_t a1, uint64_t a2, > struct qemu_plugin_cb *cb, *next; > enum qemu_plugin_event ev = QEMU_PLUGIN_EV_VCPU_SYSCALL; > > - if (!test_bit(ev, cpu->plugin_mask)) { > + if (!(cpu->plugin_flags & BIT(ev))) { > return; > } > > @@ -379,7 +384,7 @@ void qemu_plugin_vcpu_syscall_ret(CPUState *cpu, int64_t num, int64_t ret) > struct qemu_plugin_cb *cb, *next; > enum qemu_plugin_event ev = QEMU_PLUGIN_EV_VCPU_SYSCALL_RET; > > - if (!test_bit(ev, cpu->plugin_mask)) { > + if (!(cpu->plugin_flags & BIT(ev))) { > return; > } > > @@ -428,6 +433,7 @@ void qemu_plugin_flush_cb(void) > { > qht_iter_remove(&plugin.dyn_cb_arr_ht, free_dyn_cb_arr, NULL); > qht_reset(&plugin.dyn_cb_arr_ht); > + plugin.flags &= ~BIT(QEMU_PLUGIN_FLAG_INSIN_CB_READ); > > plugin_cb__simple(QEMU_PLUGIN_EV_FLUSH); > } I'm a bit confused about what we are trying to achieve here. I think split the changes and some better commentary would help.
On 2023/10/25 1:48, Alex Bennée wrote: > > Akihiko Odaki <akihiko.odaki@daynix.com> writes: > >> This avoids optimizations incompatible when reading registers. >> >> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> >> --- >> accel/tcg/plugin-helpers.h | 3 ++- >> include/exec/plugin-gen.h | 4 ++-- >> include/hw/core/cpu.h | 4 ++-- >> include/qemu/plugin.h | 3 +++ >> plugins/plugin.h | 5 +++-- >> accel/tcg/plugin-gen.c | 41 ++++++++++++++++++++++++++++---------- >> accel/tcg/translator.c | 2 +- >> plugins/api.c | 14 +++++++++++-- >> plugins/core.c | 28 ++++++++++++++++---------- >> 9 files changed, 72 insertions(+), 32 deletions(-) >> >> diff --git a/accel/tcg/plugin-helpers.h b/accel/tcg/plugin-helpers.h >> index 8e685e0654..11796436f3 100644 >> --- a/accel/tcg/plugin-helpers.h >> +++ b/accel/tcg/plugin-helpers.h >> @@ -1,4 +1,5 @@ > <snip> >> --- a/include/hw/core/cpu.h >> +++ b/include/hw/core/cpu.h >> @@ -437,7 +437,7 @@ struct qemu_work_item; >> * @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes >> * to @trace_dstate). >> * @trace_dstate: Dynamic tracing state of events for this vCPU (bitmask). >> - * @plugin_mask: Plugin event bitmap. Modified only via async work. >> + * @plugin_flags: Plugin flags. Modified only via async work. >> * @ignore_memory_transaction_failures: Cached copy of the MachineState >> * flag of the same name: allows the board to suppress calling of the >> * CPU do_transaction_failed hook function. >> @@ -529,7 +529,7 @@ struct CPUState { >> /* Use by accel-block: CPU is executing an ioctl() */ >> QemuLockCnt in_ioctl_lock; >> >> - DECLARE_BITMAP(plugin_mask, QEMU_PLUGIN_EV_MAX); >> + unsigned long plugin_flags; > > Why are we dropping DECLARE_BITMAP here? It does ensure we will always > have the right size. > >> >> #ifdef CONFIG_PLUGIN >> GArray *plugin_mem_cbs; >> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h >> index 7fdc3a4849..a534b9127b 100644 >> --- a/include/qemu/plugin.h >> +++ b/include/qemu/plugin.h >> @@ -16,6 +16,9 @@ >> #include "exec/memopidx.h" >> #include "hw/core/cpu.h" >> >> +#define QEMU_PLUGIN_FLAG_TB_CB_READ QEMU_PLUGIN_EV_MAX >> +#define QEMU_PLUGIN_FLAG_INSN_CB_READ (QEMU_PLUGIN_EV_MAX + 1) >> + > > OK this seems like bad code smell. Are we overloading what was > plugin_mask to indicate two different things? I can see we only really > use the flags to indicate syscalls should generate callbacks so maybe > this could be rationlised but at least split into two patches so the > change to original behaviour isn't mixed up with new added behaviour. I introduced new "flag" concept in v15 to avoid the overloading. > >> /* >> * Option parsing/processing. >> * Note that we can load an arbitrary number of plugins. >> diff --git a/plugins/plugin.h b/plugins/plugin.h >> index 5eb2fdbc85..ba0417194f 100644 >> --- a/plugins/plugin.h >> +++ b/plugins/plugin.h >> @@ -16,6 +16,7 @@ >> #include "qemu/qht.h" >> >> #define QEMU_PLUGIN_MIN_VERSION 0 >> +#define QEMU_PLUGIN_FLAG_INSIN_CB_READ QEMU_PLUGIN_EV_MAX > > Double definition. Removed in v15. > >> >> /* global state */ >> struct qemu_plugin_state { >> @@ -31,7 +32,7 @@ struct qemu_plugin_state { >> * but with the HT we avoid adding a field to CPUState. >> */ >> GHashTable *cpu_ht; >> - DECLARE_BITMAP(mask, QEMU_PLUGIN_EV_MAX); >> + unsigned long flags; >> /* >> * @lock protects the struct as well as ctx->uninstalling. >> * The lock must be acquired by all API ops. >> @@ -86,7 +87,7 @@ plugin_register_cb_udata(qemu_plugin_id_t id, enum qemu_plugin_event ev, >> void >> plugin_register_dyn_cb__udata(GArray **arr, >> qemu_plugin_vcpu_udata_cb_t cb, >> - enum qemu_plugin_cb_flags flags, void *udata); >> + unsigned int flags, void *udata); >> >> >> void plugin_register_vcpu_mem_cb(GArray **arr, >> diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c >> index 78b331b251..3bddd4d3c5 100644 >> --- a/accel/tcg/plugin-gen.c >> +++ b/accel/tcg/plugin-gen.c >> @@ -90,7 +90,10 @@ enum plugin_gen_cb { >> * These helpers are stubs that get dynamically switched out for calls >> * direct to the plugin if they are subscribed to. >> */ >> -void HELPER(plugin_vcpu_udata_cb)(uint32_t cpu_index, void *udata) >> +void HELPER(plugin_vcpu_udata_cb_no_wg)(uint32_t cpu_index, void *udata) >> +{ } >> + >> +void HELPER(plugin_vcpu_udata_cb_no_rwg)(uint32_t cpu_index, void *udata) >> { } >> >> void HELPER(plugin_vcpu_mem_cb)(unsigned int vcpu_index, >> @@ -98,7 +101,7 @@ void HELPER(plugin_vcpu_mem_cb)(unsigned int vcpu_index, >> void *userdata) >> { } >> >> -static void gen_empty_udata_cb(void) >> +static void gen_empty_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr)) >> { >> TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); >> TCGv_ptr udata = tcg_temp_ebb_new_ptr(); >> @@ -106,12 +109,22 @@ static void gen_empty_udata_cb(void) >> tcg_gen_movi_ptr(udata, 0); >> tcg_gen_ld_i32(cpu_index, tcg_env, >> -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); >> - gen_helper_plugin_vcpu_udata_cb(cpu_index, udata); >> + gen_helper(cpu_index, udata); >> >> tcg_temp_free_ptr(udata); >> tcg_temp_free_i32(cpu_index); >> } >> >> +static void gen_empty_udata_cb_no_wg(void) >> +{ >> + gen_empty_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_wg); >> +} >> + >> +static void gen_empty_udata_cb_no_rwg(void) >> +{ >> + gen_empty_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_rwg); >> +} >> + >> /* >> * For now we only support addi_i64. >> * When we support more ops, we can generate one empty inline cb for each. >> @@ -176,7 +189,7 @@ static void gen_wrapped(enum plugin_gen_from from, >> tcg_gen_plugin_cb_end(); >> } >> >> -static void plugin_gen_empty_callback(enum plugin_gen_from from) >> +static void plugin_gen_empty_callback(CPUState *cpu, enum plugin_gen_from from) >> { >> switch (from) { >> case PLUGIN_GEN_AFTER_INSN: >> @@ -190,9 +203,15 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) >> */ >> gen_wrapped(from, PLUGIN_GEN_ENABLE_MEM_HELPER, >> gen_empty_mem_helper); >> - /* fall through */ >> + gen_wrapped(from, PLUGIN_GEN_CB_UDATA, >> + cpu->plugin_flags & BIT(QEMU_PLUGIN_FLAG_INSN_CB_READ) ? >> + gen_empty_udata_cb_no_wg : gen_empty_udata_cb_no_rwg); >> + gen_wrapped(from, PLUGIN_GEN_CB_INLINE, gen_empty_inline_cb); >> + break; >> case PLUGIN_GEN_FROM_TB: >> - gen_wrapped(from, PLUGIN_GEN_CB_UDATA, gen_empty_udata_cb); >> + gen_wrapped(from, PLUGIN_GEN_CB_UDATA, >> + cpu->plugin_flags & BIT(QEMU_PLUGIN_FLAG_TB_CB_READ) ? >> + gen_empty_udata_cb_no_wg : >> gen_empty_udata_cb_no_rwg); > > What stops us from generating two empty callbacks (one no_wg one no_rwg) > and just discarding the unused ones after the instrumentation pass? There is nothing stopping us from doing that, but I see no reason to do so when we can pick one just with a ternary operator. > >> gen_wrapped(from, PLUGIN_GEN_CB_INLINE, gen_empty_inline_cb); >> break; >> default: >> @@ -796,7 +815,7 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, >> { >> bool ret = false; >> >> - if (test_bit(QEMU_PLUGIN_EV_VCPU_TB_TRANS, cpu->plugin_mask)) { >> + if (cpu->plugin_flags & BIT(QEMU_PLUGIN_EV_VCPU_TB_TRANS)) { >> struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; >> int i; >> >> @@ -817,7 +836,7 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, >> ptb->mem_only = mem_only; >> ptb->mem_helper = false; >> >> - plugin_gen_empty_callback(PLUGIN_GEN_FROM_TB); >> + plugin_gen_empty_callback(cpu, PLUGIN_GEN_FROM_TB); >> } >> >> tcg_ctx->plugin_insn = NULL; >> @@ -832,7 +851,7 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) >> >> pinsn = qemu_plugin_tb_insn_get(ptb, db->pc_next); >> tcg_ctx->plugin_insn = pinsn; >> - plugin_gen_empty_callback(PLUGIN_GEN_FROM_INSN); >> + plugin_gen_empty_callback(cpu, PLUGIN_GEN_FROM_INSN); >> >> /* >> * Detect page crossing to get the new host address. >> @@ -852,9 +871,9 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) >> } >> } >> >> -void plugin_gen_insn_end(void) >> +void plugin_gen_insn_end(CPUState *cpu) >> { >> - plugin_gen_empty_callback(PLUGIN_GEN_AFTER_INSN); >> + plugin_gen_empty_callback(cpu, PLUGIN_GEN_AFTER_INSN); >> } >> >> /* >> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c >> index 575b9812ad..bec58dd93f 100644 >> --- a/accel/tcg/translator.c >> +++ b/accel/tcg/translator.c >> @@ -189,7 +189,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns, >> * to accurately track instrumented helpers that might access memory. >> */ >> if (plugin_enabled) { >> - plugin_gen_insn_end(); >> + plugin_gen_insn_end(cpu); >> } >> >> /* Stop translation if translate_insn so indicated. */ >> diff --git a/plugins/api.c b/plugins/api.c >> index 5521b0ad36..326e37cb73 100644 >> --- a/plugins/api.c >> +++ b/plugins/api.c >> @@ -89,8 +89,13 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, >> void *udata) >> { >> if (!tb->mem_only) { >> + bool read = flags == QEMU_PLUGIN_CB_R_REGS || >> + flags == QEMU_PLUGIN_CB_RW_REGS; >> + >> plugin_register_dyn_cb__udata(&tb->cbs[PLUGIN_CB_REGULAR], >> - cb, flags, udata); >> + cb, >> + read ? BIT(QEMU_PLUGIN_FLAG_TB_CB_READ) : 0, >> + udata); >> } >> } >> >> @@ -109,8 +114,13 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, >> void *udata) >> { >> if (!insn->mem_only) { >> + bool read = flags == QEMU_PLUGIN_CB_R_REGS || >> + flags == QEMU_PLUGIN_CB_RW_REGS; >> + >> plugin_register_dyn_cb__udata(&insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR], >> - cb, flags, udata); >> + cb, >> + read ? BIT(QEMU_PLUGIN_FLAG_INSN_CB_READ) : 0, >> + udata); >> } >> } >> >> diff --git a/plugins/core.c b/plugins/core.c >> index fcd33a2bff..f461e84473 100644 >> --- a/plugins/core.c >> +++ b/plugins/core.c >> @@ -55,19 +55,19 @@ struct qemu_plugin_ctx *plugin_id_to_ctx_locked(qemu_plugin_id_t id) >> >> static void plugin_cpu_update__async(CPUState *cpu, run_on_cpu_data data) >> { >> - bitmap_copy(cpu->plugin_mask, &data.host_ulong, QEMU_PLUGIN_EV_MAX); >> + cpu->plugin_flags = data.host_ulong; >> tcg_flush_jmp_cache(cpu); >> } >> >> static void plugin_cpu_update__locked(gpointer k, gpointer v, gpointer udata) >> { >> CPUState *cpu = container_of(k, CPUState, cpu_index); >> - run_on_cpu_data mask = RUN_ON_CPU_HOST_ULONG(*plugin.mask); >> + run_on_cpu_data flags = RUN_ON_CPU_HOST_ULONG(plugin.flags); >> >> if (DEVICE(cpu)->realized) { >> - async_run_on_cpu(cpu, plugin_cpu_update__async, mask); >> + async_run_on_cpu(cpu, plugin_cpu_update__async, flags); >> } else { >> - plugin_cpu_update__async(cpu, mask); >> + plugin_cpu_update__async(cpu, flags); >> } >> } >> >> @@ -83,7 +83,7 @@ void plugin_unregister_cb__locked(struct qemu_plugin_ctx *ctx, >> g_free(cb); >> ctx->callbacks[ev] = NULL; >> if (QLIST_EMPTY_RCU(&plugin.cb_lists[ev])) { >> - clear_bit(ev, plugin.mask); >> + plugin.flags &= ~BIT(ev); >> g_hash_table_foreach(plugin.cpu_ht, plugin_cpu_update__locked, NULL); >> } >> } >> @@ -186,8 +186,8 @@ do_plugin_register_cb(qemu_plugin_id_t id, enum qemu_plugin_event ev, >> cb->udata = udata; >> ctx->callbacks[ev] = cb; >> QLIST_INSERT_HEAD_RCU(&plugin.cb_lists[ev], cb, entry); >> - if (!test_bit(ev, plugin.mask)) { >> - set_bit(ev, plugin.mask); >> + if (!(plugin.flags & BIT(ev))) { >> + plugin.flags |= BIT(ev); >> g_hash_table_foreach(plugin.cpu_ht, plugin_cpu_update__locked, >> NULL); >> } >> @@ -296,15 +296,20 @@ void plugin_register_inline_op(GArray **arr, >> >> void plugin_register_dyn_cb__udata(GArray **arr, >> qemu_plugin_vcpu_udata_cb_t cb, >> - enum qemu_plugin_cb_flags flags, >> + unsigned int flags, >> void *udata) >> { >> struct qemu_plugin_dyn_cb *dyn_cb = plugin_get_dyn_cb(arr); >> >> dyn_cb->userp = udata; >> - /* Note flags are discarded as unused. */ >> dyn_cb->f.vcpu_udata = cb; >> dyn_cb->type = PLUGIN_CB_REGULAR; >> + >> + if (flags) { >> + QEMU_LOCK_GUARD(&plugin.lock); >> + plugin.flags |= flags; >> + g_hash_table_foreach(plugin.cpu_ht, plugin_cpu_update__locked, NULL); >> + } >> } >> >> void plugin_register_vcpu_mem_cb(GArray **arr, >> @@ -357,7 +362,7 @@ qemu_plugin_vcpu_syscall(CPUState *cpu, int64_t num, uint64_t a1, uint64_t a2, >> struct qemu_plugin_cb *cb, *next; >> enum qemu_plugin_event ev = QEMU_PLUGIN_EV_VCPU_SYSCALL; >> >> - if (!test_bit(ev, cpu->plugin_mask)) { >> + if (!(cpu->plugin_flags & BIT(ev))) { >> return; >> } >> >> @@ -379,7 +384,7 @@ void qemu_plugin_vcpu_syscall_ret(CPUState *cpu, int64_t num, int64_t ret) >> struct qemu_plugin_cb *cb, *next; >> enum qemu_plugin_event ev = QEMU_PLUGIN_EV_VCPU_SYSCALL_RET; >> >> - if (!test_bit(ev, cpu->plugin_mask)) { >> + if (!(cpu->plugin_flags & BIT(ev))) { >> return; >> } >> >> @@ -428,6 +433,7 @@ void qemu_plugin_flush_cb(void) >> { >> qht_iter_remove(&plugin.dyn_cb_arr_ht, free_dyn_cb_arr, NULL); >> qht_reset(&plugin.dyn_cb_arr_ht); >> + plugin.flags &= ~BIT(QEMU_PLUGIN_FLAG_INSIN_CB_READ); >> >> plugin_cb__simple(QEMU_PLUGIN_EV_FLUSH); >> } > > > I'm a bit confused about what we are trying to achieve here. I think > split the changes and some better commentary would help. I extracted the change to introduce "flags" into a separate patch in v15.
On 2023/10/25 14:39, Akihiko Odaki wrote: > On 2023/10/25 1:48, Alex Bennée wrote: >> >> Akihiko Odaki <akihiko.odaki@daynix.com> writes: >> >>> This avoids optimizations incompatible when reading registers. >>> >>> Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> >>> --- >>> accel/tcg/plugin-helpers.h | 3 ++- >>> include/exec/plugin-gen.h | 4 ++-- >>> include/hw/core/cpu.h | 4 ++-- >>> include/qemu/plugin.h | 3 +++ >>> plugins/plugin.h | 5 +++-- >>> accel/tcg/plugin-gen.c | 41 ++++++++++++++++++++++++++++---------- >>> accel/tcg/translator.c | 2 +- >>> plugins/api.c | 14 +++++++++++-- >>> plugins/core.c | 28 ++++++++++++++++---------- >>> 9 files changed, 72 insertions(+), 32 deletions(-) >>> >>> diff --git a/accel/tcg/plugin-helpers.h b/accel/tcg/plugin-helpers.h >>> index 8e685e0654..11796436f3 100644 >>> --- a/accel/tcg/plugin-helpers.h >>> +++ b/accel/tcg/plugin-helpers.h >>> @@ -1,4 +1,5 @@ >> <snip> >>> --- a/include/hw/core/cpu.h >>> +++ b/include/hw/core/cpu.h >>> @@ -437,7 +437,7 @@ struct qemu_work_item; >>> * @trace_dstate_delayed: Delayed changes to trace_dstate (includes >>> all changes >>> * to @trace_dstate). >>> * @trace_dstate: Dynamic tracing state of events for this vCPU >>> (bitmask). >>> - * @plugin_mask: Plugin event bitmap. Modified only via async work. >>> + * @plugin_flags: Plugin flags. Modified only via async work. >>> * @ignore_memory_transaction_failures: Cached copy of the >>> MachineState >>> * flag of the same name: allows the board to suppress calling >>> of the >>> * CPU do_transaction_failed hook function. >>> @@ -529,7 +529,7 @@ struct CPUState { >>> /* Use by accel-block: CPU is executing an ioctl() */ >>> QemuLockCnt in_ioctl_lock; >>> - DECLARE_BITMAP(plugin_mask, QEMU_PLUGIN_EV_MAX); >>> + unsigned long plugin_flags; >> >> Why are we dropping DECLARE_BITMAP here? It does ensure we will always >> have the right size. >> >>> #ifdef CONFIG_PLUGIN >>> GArray *plugin_mem_cbs; >>> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h >>> index 7fdc3a4849..a534b9127b 100644 >>> --- a/include/qemu/plugin.h >>> +++ b/include/qemu/plugin.h >>> @@ -16,6 +16,9 @@ >>> #include "exec/memopidx.h" >>> #include "hw/core/cpu.h" >>> +#define QEMU_PLUGIN_FLAG_TB_CB_READ QEMU_PLUGIN_EV_MAX >>> +#define QEMU_PLUGIN_FLAG_INSN_CB_READ (QEMU_PLUGIN_EV_MAX + 1) >>> + >> >> OK this seems like bad code smell. Are we overloading what was >> plugin_mask to indicate two different things? I can see we only really >> use the flags to indicate syscalls should generate callbacks so maybe >> this could be rationlised but at least split into two patches so the >> change to original behaviour isn't mixed up with new added behaviour. > > I introduced new "flag" concept in v15 to avoid the overloading. > >> >>> /* >>> * Option parsing/processing. >>> * Note that we can load an arbitrary number of plugins. >>> diff --git a/plugins/plugin.h b/plugins/plugin.h >>> index 5eb2fdbc85..ba0417194f 100644 >>> --- a/plugins/plugin.h >>> +++ b/plugins/plugin.h >>> @@ -16,6 +16,7 @@ >>> #include "qemu/qht.h" >>> #define QEMU_PLUGIN_MIN_VERSION 0 >>> +#define QEMU_PLUGIN_FLAG_INSIN_CB_READ QEMU_PLUGIN_EV_MAX >> >> Double definition. > > Removed in v15. > >> >>> /* global state */ >>> struct qemu_plugin_state { >>> @@ -31,7 +32,7 @@ struct qemu_plugin_state { >>> * but with the HT we avoid adding a field to CPUState. >>> */ >>> GHashTable *cpu_ht; >>> - DECLARE_BITMAP(mask, QEMU_PLUGIN_EV_MAX); >>> + unsigned long flags; >>> /* >>> * @lock protects the struct as well as ctx->uninstalling. >>> * The lock must be acquired by all API ops. >>> @@ -86,7 +87,7 @@ plugin_register_cb_udata(qemu_plugin_id_t id, enum >>> qemu_plugin_event ev, >>> void >>> plugin_register_dyn_cb__udata(GArray **arr, >>> qemu_plugin_vcpu_udata_cb_t cb, >>> - enum qemu_plugin_cb_flags flags, void >>> *udata); >>> + unsigned int flags, void *udata); >>> void plugin_register_vcpu_mem_cb(GArray **arr, >>> diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c >>> index 78b331b251..3bddd4d3c5 100644 >>> --- a/accel/tcg/plugin-gen.c >>> +++ b/accel/tcg/plugin-gen.c >>> @@ -90,7 +90,10 @@ enum plugin_gen_cb { >>> * These helpers are stubs that get dynamically switched out for calls >>> * direct to the plugin if they are subscribed to. >>> */ >>> -void HELPER(plugin_vcpu_udata_cb)(uint32_t cpu_index, void *udata) >>> +void HELPER(plugin_vcpu_udata_cb_no_wg)(uint32_t cpu_index, void >>> *udata) >>> +{ } >>> + >>> +void HELPER(plugin_vcpu_udata_cb_no_rwg)(uint32_t cpu_index, void >>> *udata) >>> { } >>> void HELPER(plugin_vcpu_mem_cb)(unsigned int vcpu_index, >>> @@ -98,7 +101,7 @@ void HELPER(plugin_vcpu_mem_cb)(unsigned int >>> vcpu_index, >>> void *userdata) >>> { } >>> -static void gen_empty_udata_cb(void) >>> +static void gen_empty_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr)) >>> { >>> TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); >>> TCGv_ptr udata = tcg_temp_ebb_new_ptr(); >>> @@ -106,12 +109,22 @@ static void gen_empty_udata_cb(void) >>> tcg_gen_movi_ptr(udata, 0); >>> tcg_gen_ld_i32(cpu_index, tcg_env, >>> -offsetof(ArchCPU, env) + offsetof(CPUState, >>> cpu_index)); >>> - gen_helper_plugin_vcpu_udata_cb(cpu_index, udata); >>> + gen_helper(cpu_index, udata); >>> tcg_temp_free_ptr(udata); >>> tcg_temp_free_i32(cpu_index); >>> } >>> +static void gen_empty_udata_cb_no_wg(void) >>> +{ >>> + gen_empty_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_wg); >>> +} >>> + >>> +static void gen_empty_udata_cb_no_rwg(void) >>> +{ >>> + gen_empty_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_rwg); >>> +} >>> + >>> /* >>> * For now we only support addi_i64. >>> * When we support more ops, we can generate one empty inline cb >>> for each. >>> @@ -176,7 +189,7 @@ static void gen_wrapped(enum plugin_gen_from from, >>> tcg_gen_plugin_cb_end(); >>> } >>> -static void plugin_gen_empty_callback(enum plugin_gen_from from) >>> +static void plugin_gen_empty_callback(CPUState *cpu, enum >>> plugin_gen_from from) >>> { >>> switch (from) { >>> case PLUGIN_GEN_AFTER_INSN: >>> @@ -190,9 +203,15 @@ static void plugin_gen_empty_callback(enum >>> plugin_gen_from from) >>> */ >>> gen_wrapped(from, PLUGIN_GEN_ENABLE_MEM_HELPER, >>> gen_empty_mem_helper); >>> - /* fall through */ >>> + gen_wrapped(from, PLUGIN_GEN_CB_UDATA, >>> + cpu->plugin_flags & >>> BIT(QEMU_PLUGIN_FLAG_INSN_CB_READ) ? >>> + gen_empty_udata_cb_no_wg : >>> gen_empty_udata_cb_no_rwg); >>> + gen_wrapped(from, PLUGIN_GEN_CB_INLINE, gen_empty_inline_cb); >>> + break; >>> case PLUGIN_GEN_FROM_TB: >>> - gen_wrapped(from, PLUGIN_GEN_CB_UDATA, gen_empty_udata_cb); >>> + gen_wrapped(from, PLUGIN_GEN_CB_UDATA, >>> + cpu->plugin_flags & >>> BIT(QEMU_PLUGIN_FLAG_TB_CB_READ) ? >>> + gen_empty_udata_cb_no_wg : >>> gen_empty_udata_cb_no_rwg); >> >> What stops us from generating two empty callbacks (one no_wg one no_rwg) >> and just discarding the unused ones after the instrumentation pass? > > There is nothing stopping us from doing that, but I see no reason to do > so when we can pick one just with a ternary operator. I think I get the idea. Please check v16 and see if it does what you expect. It is indeed much simpler than the previous version.
diff --git a/accel/tcg/plugin-helpers.h b/accel/tcg/plugin-helpers.h index 8e685e0654..11796436f3 100644 --- a/accel/tcg/plugin-helpers.h +++ b/accel/tcg/plugin-helpers.h @@ -1,4 +1,5 @@ #ifdef CONFIG_PLUGIN -DEF_HELPER_FLAGS_2(plugin_vcpu_udata_cb, TCG_CALL_NO_RWG | TCG_CALL_PLUGIN, void, i32, ptr) +DEF_HELPER_FLAGS_2(plugin_vcpu_udata_cb_no_wg, TCG_CALL_NO_WG | TCG_CALL_PLUGIN, void, i32, ptr) +DEF_HELPER_FLAGS_2(plugin_vcpu_udata_cb_no_rwg, TCG_CALL_NO_RWG | TCG_CALL_PLUGIN, void, i32, ptr) DEF_HELPER_FLAGS_4(plugin_vcpu_mem_cb, TCG_CALL_NO_RWG | TCG_CALL_PLUGIN, void, i32, i32, i64, ptr) #endif diff --git a/include/exec/plugin-gen.h b/include/exec/plugin-gen.h index c4552b5061..b964e1eb5c 100644 --- a/include/exec/plugin-gen.h +++ b/include/exec/plugin-gen.h @@ -22,7 +22,7 @@ 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_insn_start(CPUState *cpu, const struct DisasContextBase *db); -void plugin_gen_insn_end(void); +void plugin_gen_insn_end(CPUState *cpu); void plugin_gen_disable_mem_helpers(void); void plugin_gen_empty_mem_callback(TCGv_i64 addr, uint32_t info); @@ -39,7 +39,7 @@ static inline void plugin_gen_insn_start(CPUState *cpu, const struct DisasContextBase *db) { } -static inline void plugin_gen_insn_end(void) +static inline void plugin_gen_insn_end(CPUState *cpu) { } static inline void plugin_gen_tb_end(CPUState *cpu, size_t num_insns) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index d2e70643f2..dbdca8b105 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -437,7 +437,7 @@ struct qemu_work_item; * @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes * to @trace_dstate). * @trace_dstate: Dynamic tracing state of events for this vCPU (bitmask). - * @plugin_mask: Plugin event bitmap. Modified only via async work. + * @plugin_flags: Plugin flags. Modified only via async work. * @ignore_memory_transaction_failures: Cached copy of the MachineState * flag of the same name: allows the board to suppress calling of the * CPU do_transaction_failed hook function. @@ -529,7 +529,7 @@ struct CPUState { /* Use by accel-block: CPU is executing an ioctl() */ QemuLockCnt in_ioctl_lock; - DECLARE_BITMAP(plugin_mask, QEMU_PLUGIN_EV_MAX); + unsigned long plugin_flags; #ifdef CONFIG_PLUGIN GArray *plugin_mem_cbs; diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index 7fdc3a4849..a534b9127b 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -16,6 +16,9 @@ #include "exec/memopidx.h" #include "hw/core/cpu.h" +#define QEMU_PLUGIN_FLAG_TB_CB_READ QEMU_PLUGIN_EV_MAX +#define QEMU_PLUGIN_FLAG_INSN_CB_READ (QEMU_PLUGIN_EV_MAX + 1) + /* * Option parsing/processing. * Note that we can load an arbitrary number of plugins. diff --git a/plugins/plugin.h b/plugins/plugin.h index 5eb2fdbc85..ba0417194f 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -16,6 +16,7 @@ #include "qemu/qht.h" #define QEMU_PLUGIN_MIN_VERSION 0 +#define QEMU_PLUGIN_FLAG_INSIN_CB_READ QEMU_PLUGIN_EV_MAX /* global state */ struct qemu_plugin_state { @@ -31,7 +32,7 @@ struct qemu_plugin_state { * but with the HT we avoid adding a field to CPUState. */ GHashTable *cpu_ht; - DECLARE_BITMAP(mask, QEMU_PLUGIN_EV_MAX); + unsigned long flags; /* * @lock protects the struct as well as ctx->uninstalling. * The lock must be acquired by all API ops. @@ -86,7 +87,7 @@ plugin_register_cb_udata(qemu_plugin_id_t id, enum qemu_plugin_event ev, void plugin_register_dyn_cb__udata(GArray **arr, qemu_plugin_vcpu_udata_cb_t cb, - enum qemu_plugin_cb_flags flags, void *udata); + unsigned int flags, void *udata); void plugin_register_vcpu_mem_cb(GArray **arr, diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 78b331b251..3bddd4d3c5 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -90,7 +90,10 @@ enum plugin_gen_cb { * These helpers are stubs that get dynamically switched out for calls * direct to the plugin if they are subscribed to. */ -void HELPER(plugin_vcpu_udata_cb)(uint32_t cpu_index, void *udata) +void HELPER(plugin_vcpu_udata_cb_no_wg)(uint32_t cpu_index, void *udata) +{ } + +void HELPER(plugin_vcpu_udata_cb_no_rwg)(uint32_t cpu_index, void *udata) { } void HELPER(plugin_vcpu_mem_cb)(unsigned int vcpu_index, @@ -98,7 +101,7 @@ void HELPER(plugin_vcpu_mem_cb)(unsigned int vcpu_index, void *userdata) { } -static void gen_empty_udata_cb(void) +static void gen_empty_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr)) { TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); TCGv_ptr udata = tcg_temp_ebb_new_ptr(); @@ -106,12 +109,22 @@ static void gen_empty_udata_cb(void) tcg_gen_movi_ptr(udata, 0); tcg_gen_ld_i32(cpu_index, tcg_env, -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); - gen_helper_plugin_vcpu_udata_cb(cpu_index, udata); + gen_helper(cpu_index, udata); tcg_temp_free_ptr(udata); tcg_temp_free_i32(cpu_index); } +static void gen_empty_udata_cb_no_wg(void) +{ + gen_empty_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_wg); +} + +static void gen_empty_udata_cb_no_rwg(void) +{ + gen_empty_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_rwg); +} + /* * For now we only support addi_i64. * When we support more ops, we can generate one empty inline cb for each. @@ -176,7 +189,7 @@ static void gen_wrapped(enum plugin_gen_from from, tcg_gen_plugin_cb_end(); } -static void plugin_gen_empty_callback(enum plugin_gen_from from) +static void plugin_gen_empty_callback(CPUState *cpu, enum plugin_gen_from from) { switch (from) { case PLUGIN_GEN_AFTER_INSN: @@ -190,9 +203,15 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) */ gen_wrapped(from, PLUGIN_GEN_ENABLE_MEM_HELPER, gen_empty_mem_helper); - /* fall through */ + gen_wrapped(from, PLUGIN_GEN_CB_UDATA, + cpu->plugin_flags & BIT(QEMU_PLUGIN_FLAG_INSN_CB_READ) ? + gen_empty_udata_cb_no_wg : gen_empty_udata_cb_no_rwg); + gen_wrapped(from, PLUGIN_GEN_CB_INLINE, gen_empty_inline_cb); + break; case PLUGIN_GEN_FROM_TB: - gen_wrapped(from, PLUGIN_GEN_CB_UDATA, gen_empty_udata_cb); + gen_wrapped(from, PLUGIN_GEN_CB_UDATA, + cpu->plugin_flags & BIT(QEMU_PLUGIN_FLAG_TB_CB_READ) ? + gen_empty_udata_cb_no_wg : gen_empty_udata_cb_no_rwg); gen_wrapped(from, PLUGIN_GEN_CB_INLINE, gen_empty_inline_cb); break; default: @@ -796,7 +815,7 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, { bool ret = false; - if (test_bit(QEMU_PLUGIN_EV_VCPU_TB_TRANS, cpu->plugin_mask)) { + if (cpu->plugin_flags & BIT(QEMU_PLUGIN_EV_VCPU_TB_TRANS)) { struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb; int i; @@ -817,7 +836,7 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, ptb->mem_only = mem_only; ptb->mem_helper = false; - plugin_gen_empty_callback(PLUGIN_GEN_FROM_TB); + plugin_gen_empty_callback(cpu, PLUGIN_GEN_FROM_TB); } tcg_ctx->plugin_insn = NULL; @@ -832,7 +851,7 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) pinsn = qemu_plugin_tb_insn_get(ptb, db->pc_next); tcg_ctx->plugin_insn = pinsn; - plugin_gen_empty_callback(PLUGIN_GEN_FROM_INSN); + plugin_gen_empty_callback(cpu, PLUGIN_GEN_FROM_INSN); /* * Detect page crossing to get the new host address. @@ -852,9 +871,9 @@ void plugin_gen_insn_start(CPUState *cpu, const DisasContextBase *db) } } -void plugin_gen_insn_end(void) +void plugin_gen_insn_end(CPUState *cpu) { - plugin_gen_empty_callback(PLUGIN_GEN_AFTER_INSN); + plugin_gen_empty_callback(cpu, PLUGIN_GEN_AFTER_INSN); } /* diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 575b9812ad..bec58dd93f 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -189,7 +189,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns, * to accurately track instrumented helpers that might access memory. */ if (plugin_enabled) { - plugin_gen_insn_end(); + plugin_gen_insn_end(cpu); } /* Stop translation if translate_insn so indicated. */ diff --git a/plugins/api.c b/plugins/api.c index 5521b0ad36..326e37cb73 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -89,8 +89,13 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, void *udata) { if (!tb->mem_only) { + bool read = flags == QEMU_PLUGIN_CB_R_REGS || + flags == QEMU_PLUGIN_CB_RW_REGS; + plugin_register_dyn_cb__udata(&tb->cbs[PLUGIN_CB_REGULAR], - cb, flags, udata); + cb, + read ? BIT(QEMU_PLUGIN_FLAG_TB_CB_READ) : 0, + udata); } } @@ -109,8 +114,13 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, void *udata) { if (!insn->mem_only) { + bool read = flags == QEMU_PLUGIN_CB_R_REGS || + flags == QEMU_PLUGIN_CB_RW_REGS; + plugin_register_dyn_cb__udata(&insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR], - cb, flags, udata); + cb, + read ? BIT(QEMU_PLUGIN_FLAG_INSN_CB_READ) : 0, + udata); } } diff --git a/plugins/core.c b/plugins/core.c index fcd33a2bff..f461e84473 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -55,19 +55,19 @@ struct qemu_plugin_ctx *plugin_id_to_ctx_locked(qemu_plugin_id_t id) static void plugin_cpu_update__async(CPUState *cpu, run_on_cpu_data data) { - bitmap_copy(cpu->plugin_mask, &data.host_ulong, QEMU_PLUGIN_EV_MAX); + cpu->plugin_flags = data.host_ulong; tcg_flush_jmp_cache(cpu); } static void plugin_cpu_update__locked(gpointer k, gpointer v, gpointer udata) { CPUState *cpu = container_of(k, CPUState, cpu_index); - run_on_cpu_data mask = RUN_ON_CPU_HOST_ULONG(*plugin.mask); + run_on_cpu_data flags = RUN_ON_CPU_HOST_ULONG(plugin.flags); if (DEVICE(cpu)->realized) { - async_run_on_cpu(cpu, plugin_cpu_update__async, mask); + async_run_on_cpu(cpu, plugin_cpu_update__async, flags); } else { - plugin_cpu_update__async(cpu, mask); + plugin_cpu_update__async(cpu, flags); } } @@ -83,7 +83,7 @@ void plugin_unregister_cb__locked(struct qemu_plugin_ctx *ctx, g_free(cb); ctx->callbacks[ev] = NULL; if (QLIST_EMPTY_RCU(&plugin.cb_lists[ev])) { - clear_bit(ev, plugin.mask); + plugin.flags &= ~BIT(ev); g_hash_table_foreach(plugin.cpu_ht, plugin_cpu_update__locked, NULL); } } @@ -186,8 +186,8 @@ do_plugin_register_cb(qemu_plugin_id_t id, enum qemu_plugin_event ev, cb->udata = udata; ctx->callbacks[ev] = cb; QLIST_INSERT_HEAD_RCU(&plugin.cb_lists[ev], cb, entry); - if (!test_bit(ev, plugin.mask)) { - set_bit(ev, plugin.mask); + if (!(plugin.flags & BIT(ev))) { + plugin.flags |= BIT(ev); g_hash_table_foreach(plugin.cpu_ht, plugin_cpu_update__locked, NULL); } @@ -296,15 +296,20 @@ void plugin_register_inline_op(GArray **arr, void plugin_register_dyn_cb__udata(GArray **arr, qemu_plugin_vcpu_udata_cb_t cb, - enum qemu_plugin_cb_flags flags, + unsigned int flags, void *udata) { struct qemu_plugin_dyn_cb *dyn_cb = plugin_get_dyn_cb(arr); dyn_cb->userp = udata; - /* Note flags are discarded as unused. */ dyn_cb->f.vcpu_udata = cb; dyn_cb->type = PLUGIN_CB_REGULAR; + + if (flags) { + QEMU_LOCK_GUARD(&plugin.lock); + plugin.flags |= flags; + g_hash_table_foreach(plugin.cpu_ht, plugin_cpu_update__locked, NULL); + } } void plugin_register_vcpu_mem_cb(GArray **arr, @@ -357,7 +362,7 @@ qemu_plugin_vcpu_syscall(CPUState *cpu, int64_t num, uint64_t a1, uint64_t a2, struct qemu_plugin_cb *cb, *next; enum qemu_plugin_event ev = QEMU_PLUGIN_EV_VCPU_SYSCALL; - if (!test_bit(ev, cpu->plugin_mask)) { + if (!(cpu->plugin_flags & BIT(ev))) { return; } @@ -379,7 +384,7 @@ void qemu_plugin_vcpu_syscall_ret(CPUState *cpu, int64_t num, int64_t ret) struct qemu_plugin_cb *cb, *next; enum qemu_plugin_event ev = QEMU_PLUGIN_EV_VCPU_SYSCALL_RET; - if (!test_bit(ev, cpu->plugin_mask)) { + if (!(cpu->plugin_flags & BIT(ev))) { return; } @@ -428,6 +433,7 @@ void qemu_plugin_flush_cb(void) { qht_iter_remove(&plugin.dyn_cb_arr_ht, free_dyn_cb_arr, NULL); qht_reset(&plugin.dyn_cb_arr_ht); + plugin.flags &= ~BIT(QEMU_PLUGIN_FLAG_INSIN_CB_READ); plugin_cb__simple(QEMU_PLUGIN_EV_FLUSH); }
This avoids optimizations incompatible when reading registers. Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> --- accel/tcg/plugin-helpers.h | 3 ++- include/exec/plugin-gen.h | 4 ++-- include/hw/core/cpu.h | 4 ++-- include/qemu/plugin.h | 3 +++ plugins/plugin.h | 5 +++-- accel/tcg/plugin-gen.c | 41 ++++++++++++++++++++++++++++---------- accel/tcg/translator.c | 2 +- plugins/api.c | 14 +++++++++++-- plugins/core.c | 28 ++++++++++++++++---------- 9 files changed, 72 insertions(+), 32 deletions(-)