| Message ID | 20240229055359.972151-5-pierrick.bouvier@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | TCG plugins new inline operations | expand |
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes: > Extend plugins API to support callback called with a given criteria > (evaluated inline). > > Added functions: > - qemu_plugin_register_vcpu_tb_exec_cond_cb > - qemu_plugin_register_vcpu_insn_exec_cond_cb > > They expect as parameter a condition, a qemu_plugin_u64_t (op1) and an > immediate (op2). Callback is called if op1 |cond| op2 is true. > > Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > --- > include/qemu/plugin.h | 7 ++ > include/qemu/qemu-plugin.h | 76 +++++++++++++++ > plugins/plugin.h | 8 ++ > accel/tcg/plugin-gen.c | 174 ++++++++++++++++++++++++++++++++++- > plugins/api.c | 51 ++++++++++ > plugins/core.c | 19 ++++ > plugins/qemu-plugins.symbols | 2 + > 7 files changed, 334 insertions(+), 3 deletions(-) > > diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h > index d92d64744e6..056102b2361 100644 > --- a/include/qemu/plugin.h > +++ b/include/qemu/plugin.h > @@ -74,6 +74,8 @@ enum plugin_dyn_cb_type { > enum plugin_dyn_cb_subtype { > PLUGIN_CB_REGULAR, > PLUGIN_CB_REGULAR_R, > + PLUGIN_CB_COND, > + PLUGIN_CB_COND_R, > PLUGIN_CB_INLINE_ADD_U64, > PLUGIN_CB_INLINE_STORE_U64, > PLUGIN_N_CB_SUBTYPES, > @@ -97,6 +99,11 @@ struct qemu_plugin_dyn_cb { > enum qemu_plugin_op op; > uint64_t imm; > } inline_insn; > + struct { > + qemu_plugin_u64 entry; > + enum qemu_plugin_cond cond; > + uint64_t imm; > + } cond_cb; > }; > }; > > diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h > index c5cac897a0b..337de25ece7 100644 > --- a/include/qemu/qemu-plugin.h > +++ b/include/qemu/qemu-plugin.h > @@ -262,6 +262,29 @@ enum qemu_plugin_mem_rw { > QEMU_PLUGIN_MEM_RW, > }; > > +/** > + * enum qemu_plugin_cond - condition to enable callback > + * > + * @QEMU_PLUGIN_COND_NEVER: false > + * @QEMU_PLUGIN_COND_ALWAYS: true > + * @QEMU_PLUGIN_COND_EQ: is equal? > + * @QEMU_PLUGIN_COND_NE: is not equal? > + * @QEMU_PLUGIN_COND_LT: is less than? > + * @QEMU_PLUGIN_COND_LE: is less than or equal? > + * @QEMU_PLUGIN_COND_GT: is greater than? > + * @QEMU_PLUGIN_COND_GE: is greater than or equal? > + */ > +enum qemu_plugin_cond { > + QEMU_PLUGIN_COND_NEVER, > + QEMU_PLUGIN_COND_ALWAYS, > + QEMU_PLUGIN_COND_EQ, > + QEMU_PLUGIN_COND_NE, > + QEMU_PLUGIN_COND_LT, > + QEMU_PLUGIN_COND_LE, > + QEMU_PLUGIN_COND_GT, > + QEMU_PLUGIN_COND_GE, > +}; > + > /** > * typedef qemu_plugin_vcpu_tb_trans_cb_t - translation callback > * @id: unique plugin id > @@ -301,6 +324,32 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, > enum qemu_plugin_cb_flags flags, > void *userdata); > > +/** > + * qemu_plugin_register_vcpu_tb_exec_cond_cb() - register conditional callback > + * @tb: the opaque qemu_plugin_tb handle for the translation > + * @cb: callback function > + * @cond: condition to enable callback > + * @entry: first operand for condition > + * @imm: second operand for condition > + * @flags: does the plugin read or write the CPU's registers? > + * @userdata: any plugin data to pass to the @cb? > + * > + * The @cb function is called when a translated unit executes if > + * entry @cond imm is true. > + * If condition is QEMU_PLUGIN_COND_ALWAYS, condition is never interpreted and > + * this function is equivalent to qemu_plugin_register_vcpu_tb_exec_cb. > + * If condition QEMU_PLUGIN_COND_NEVER, condition is never interpreted and > + * callback is never installed. > + */ > +QEMU_PLUGIN_API > +void qemu_plugin_register_vcpu_tb_exec_cond_cb(struct qemu_plugin_tb *tb, > + qemu_plugin_vcpu_udata_cb_t cb, > + enum qemu_plugin_cb_flags flags, > + enum qemu_plugin_cond cond, > + qemu_plugin_u64 entry, Is this a fixed entry or part of a scoreboard? I'm trying to write a control flow plugin with a structure like: /* We use this to track the current execution state */ typedef struct { /* address of start of block */ uint64_t block_start; /* address of end of block */ uint64_t block_end; /* address of last executed PC */ uint64_t last_pc; } VCPUScoreBoard; And I want to check to see if last_pc (set by STORE_U64 for each insn) == block_end (set at start of TB with what we know). Is this something I need to get with: last_pc = qemu_plugin_scoreboard_u64_in_struct(state, VCPUScoreBoard, last_pc); ? > + uint64_t imm, > + void *userdata); > + > /** > * enum qemu_plugin_op - describes an inline op > * > @@ -344,6 +393,33 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, > enum qemu_plugin_cb_flags flags, > void *userdata); > > +/** > + * qemu_plugin_register_vcpu_insn_exec_cond_cb() - conditional insn execution cb > + * @insn: the opaque qemu_plugin_insn handle for an instruction > + * @cb: callback function > + * @flags: does the plugin read or write the CPU's registers? > + * @cond: condition to enable callback > + * @entry: first operand for condition > + * @imm: second operand for condition > + * @userdata: any plugin data to pass to the @cb? > + * > + * The @cb function is called when an instruction executes if > + * entry @cond imm is true. > + * If condition is QEMU_PLUGIN_COND_ALWAYS, condition is never interpreted and > + * this function is equivalent to qemu_plugin_register_vcpu_insn_exec_cb. > + * If condition QEMU_PLUGIN_COND_NEVER, condition is never interpreted and > + * callback is never installed. > + */ > +QEMU_PLUGIN_API > +void qemu_plugin_register_vcpu_insn_exec_cond_cb( > + struct qemu_plugin_insn *insn, > + qemu_plugin_vcpu_udata_cb_t cb, > + enum qemu_plugin_cb_flags flags, > + enum qemu_plugin_cond cond, > + qemu_plugin_u64 entry, > + uint64_t imm, > + void *userdata); > + > /** > * qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu() - insn exec inline op > * @insn: the opaque qemu_plugin_insn handle for an instruction > diff --git a/plugins/plugin.h b/plugins/plugin.h > index 696b1fa38b0..118cc99bb2a 100644 > --- a/plugins/plugin.h > +++ b/plugins/plugin.h > @@ -94,6 +94,14 @@ plugin_register_dyn_cb__udata(GArray **arr, > qemu_plugin_vcpu_udata_cb_t cb, > enum qemu_plugin_cb_flags flags, void *udata); > > +void > +plugin_register_dyn_cond_cb__udata(GArray **arr, > + qemu_plugin_vcpu_udata_cb_t cb, > + enum qemu_plugin_cb_flags flags, > + enum qemu_plugin_cond cond, > + qemu_plugin_u64 entry, > + uint64_t imm, > + void *udata); > > void plugin_register_vcpu_mem_cb(GArray **arr, > void *cb, > diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c > index 02c894106e2..15762a26439 100644 > --- a/accel/tcg/plugin-gen.c > +++ b/accel/tcg/plugin-gen.c > @@ -46,6 +46,7 @@ > #include "qemu/plugin.h" > #include "cpu.h" > #include "tcg/tcg.h" > +#include "tcg/tcg-cond.h" > #include "tcg/tcg-internal.h" > #include "tcg/tcg-op.h" > #include "tcg/tcg-temp-internal.h" > @@ -82,6 +83,8 @@ enum plugin_gen_from { > enum plugin_gen_cb { > PLUGIN_GEN_CB_UDATA, > PLUGIN_GEN_CB_UDATA_R, > + PLUGIN_GEN_CB_COND_UDATA, > + PLUGIN_GEN_CB_COND_UDATA_R, > PLUGIN_GEN_CB_INLINE_ADD_U64, > PLUGIN_GEN_CB_INLINE_STORE_U64, > PLUGIN_GEN_CB_MEM, > @@ -119,16 +122,58 @@ static void gen_empty_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr)) > tcg_temp_free_i32(cpu_index); > } > > +static void gen_empty_cond_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr)) > +{ > + TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); > + TCGv_i32 cpu_offset = tcg_temp_ebb_new_i32(); > + TCGv_ptr cpu_index_as_ptr = tcg_temp_ebb_new_ptr(); > + TCGv_i64 val = tcg_temp_ebb_new_i64(); > + TCGv_ptr ptr = tcg_temp_ebb_new_ptr(); > + TCGv_ptr udata = tcg_temp_ebb_new_ptr(); > + TCGLabel *after_cb = gen_new_label(); > + > + tcg_gen_movi_ptr(udata, 0); > + tcg_gen_ld_i32(cpu_index, tcg_env, > + -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); > + /* second operand will be replaced by immediate value */ > + tcg_gen_mul_i32(cpu_offset, cpu_index, cpu_index); > + tcg_gen_ext_i32_ptr(cpu_index_as_ptr, cpu_offset); > + tcg_gen_movi_ptr(ptr, 0); > + tcg_gen_add_ptr(ptr, ptr, cpu_index_as_ptr); > + tcg_gen_ld_i64(val, ptr, 0); > + > + tcg_gen_brcondi_i64(TCG_COND_EQ, val, 0, after_cb); > + gen_helper(cpu_index, udata); > + gen_set_label(after_cb); > + > + tcg_temp_free_ptr(udata); > + tcg_temp_free_ptr(ptr); > + tcg_temp_free_i64(val); > + tcg_temp_free_ptr(cpu_index_as_ptr); > + tcg_temp_free_i32(cpu_offset); > + 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_cond_udata_cb_no_wg(void) > +{ > + gen_empty_cond_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); > } > > +static void gen_empty_cond_udata_cb_no_rwg(void) > +{ > + gen_empty_cond_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_rwg); > +} > + > static void gen_empty_inline_cb_add_u64(void) > { > TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); > @@ -248,6 +293,10 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) > gen_empty_inline_cb_store_u64); > gen_wrapped(from, PLUGIN_GEN_CB_UDATA, gen_empty_udata_cb_no_rwg); > gen_wrapped(from, PLUGIN_GEN_CB_UDATA_R, gen_empty_udata_cb_no_wg); > + gen_wrapped(from, PLUGIN_GEN_CB_COND_UDATA, > + gen_empty_cond_udata_cb_no_rwg); > + gen_wrapped(from, PLUGIN_GEN_CB_COND_UDATA_R, > + gen_empty_cond_udata_cb_no_wg); > break; > default: > g_assert_not_reached(); > @@ -456,6 +505,29 @@ static TCGOp *copy_call(TCGOp **begin_op, TCGOp *op, void *func, int *cb_idx) > return op; > } > > +static TCGOp *copy_brcondi_i64(TCGOp **begin_op, TCGOp *op, TCGCond cond, > + uint64_t imm) > +{ > + if (TCG_TARGET_REG_BITS == 32) { > + op = copy_op(begin_op, op, INDEX_op_brcond2_i32); > + /* low(arg1), high(arg1), 32(arg2), 32(arg2 >> 32), cond, label */ > + op->args[2] = tcgv_i32_arg(tcg_constant_i32(imm)); > + op->args[3] = tcgv_i32_arg(tcg_constant_i32(imm >> 32)); > + op->args[4] = cond; > + } else { > + op = copy_op(begin_op, op, INDEX_op_brcond_i64); > + /* arg1, arg2, cond, label */ > + op->args[1] = tcgv_i64_arg(tcg_constant_i64(imm)); > + op->args[2] = cond; > + } > + return op; > +} > + > +static TCGOp *copy_set_label(TCGOp **begin_op, TCGOp *op) > +{ > + return copy_op(begin_op, op, INDEX_op_set_label); > +} > + > /* > * When we append/replace ops here we are sensitive to changing patterns of > * TCGOps generated by the tcg_gen_FOO calls when we generated the > @@ -482,6 +554,50 @@ static TCGOp *append_udata_cb(const struct qemu_plugin_dyn_cb *cb, > return op; > } > > +static TCGCond plugin_cond_to_tcgcond(enum qemu_plugin_cond cond) > +{ > + switch (cond) { > + case QEMU_PLUGIN_COND_EQ: > + return TCG_COND_EQ; > + case QEMU_PLUGIN_COND_NE: > + return TCG_COND_NE; > + case QEMU_PLUGIN_COND_LT: > + return TCG_COND_LTU; > + case QEMU_PLUGIN_COND_LE: > + return TCG_COND_LEU; > + case QEMU_PLUGIN_COND_GT: > + return TCG_COND_GTU; > + case QEMU_PLUGIN_COND_GE: > + return TCG_COND_GEU; > + default: > + /* ALWAYS and NEVER conditions should never reach */ > + g_assert_not_reached(); > + } > +} > + > +static TCGOp *append_cond_udata_cb(const struct qemu_plugin_dyn_cb *cb, > + TCGOp *begin_op, TCGOp *op, int *cb_idx) > +{ > + char *ptr = cb->cond_cb.entry.score->data->data; > + size_t elem_size = g_array_get_element_size( > + cb->cond_cb.entry.score->data); > + size_t offset = cb->cond_cb.entry.offset; > + /* Condition should be negated, as calling the cb is the "else" path */ > + TCGCond cond = tcg_invert_cond(plugin_cond_to_tcgcond(cb->cond_cb.cond)); > + > + op = copy_const_ptr(&begin_op, op, ptr); > + op = copy_ld_i32(&begin_op, op); > + op = copy_mul_i32(&begin_op, op, elem_size); > + op = copy_ext_i32_ptr(&begin_op, op); > + op = copy_const_ptr(&begin_op, op, ptr + offset); > + op = copy_add_ptr(&begin_op, op); > + op = copy_ld_i64(&begin_op, op); > + op = copy_brcondi_i64(&begin_op, op, cond, cb->cond_cb.imm); > + op = copy_call(&begin_op, op, cb->f.vcpu_udata, cb_idx); > + op = copy_set_label(&begin_op, op); > + return op; > +} > + > static TCGOp *append_inline_cb_add_u64(const struct qemu_plugin_dyn_cb *cb, > TCGOp *begin_op, TCGOp *op, > int *unused) > @@ -601,6 +717,12 @@ inject_udata_cb(const GArray *cbs, TCGOp *begin_op) > inject_cb_type(cbs, begin_op, append_udata_cb, op_ok); > } > > +static void > +inject_cond_udata_cb(const GArray *cbs, TCGOp *begin_op) > +{ > + inject_cb_type(cbs, begin_op, append_cond_udata_cb, op_ok); > +} > + > static void > inject_inline_cb_add_u64(const GArray *cbs, TCGOp *begin_op, op_ok_fn ok) > { > @@ -654,7 +776,7 @@ static void inject_mem_enable_helper(struct qemu_plugin_tb *ptb, > struct qemu_plugin_insn *plugin_insn, > TCGOp *begin_op) > { > - GArray *cbs[3]; > + GArray *cbs[4]; > GArray *arr; > size_t n_cbs, i; > > @@ -662,6 +784,7 @@ static void inject_mem_enable_helper(struct qemu_plugin_tb *ptb, > cbs[0] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_INLINE_ADD_U64]; > cbs[1] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_INLINE_STORE_U64]; > cbs[2] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_REGULAR]; > + cbs[3] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_COND]; > > n_cbs = 0; > for (i = 0; i < ARRAY_SIZE(cbs); i++) { > @@ -727,6 +850,18 @@ static void plugin_gen_tb_udata_r(const struct qemu_plugin_tb *ptb, > inject_udata_cb(ptb->cbs[PLUGIN_CB_REGULAR_R], begin_op); > } > > +static void plugin_gen_tb_cond_udata(const struct qemu_plugin_tb *ptb, > + TCGOp *begin_op) > +{ > + inject_cond_udata_cb(ptb->cbs[PLUGIN_CB_COND], begin_op); > +} > + > +static void plugin_gen_tb_cond_udata_r(const struct qemu_plugin_tb *ptb, > + TCGOp *begin_op) > +{ > + inject_cond_udata_cb(ptb->cbs[PLUGIN_CB_COND_R], begin_op); > +} > + > static void plugin_gen_tb_inline_add_u64(const struct qemu_plugin_tb *ptb, > TCGOp *begin_op) > { > @@ -745,7 +880,6 @@ static void plugin_gen_insn_udata(const struct qemu_plugin_tb *ptb, > TCGOp *begin_op, int insn_idx) > { > struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); > - > inject_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR], begin_op); > } > > @@ -753,10 +887,23 @@ static void plugin_gen_insn_udata_r(const struct qemu_plugin_tb *ptb, > TCGOp *begin_op, int insn_idx) > { > struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); > - > inject_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR_R], begin_op); > } > > +static void plugin_gen_insn_cond_udata(const struct qemu_plugin_tb *ptb, > + TCGOp *begin_op, int insn_idx) > +{ > + struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); > + inject_cond_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_COND], begin_op); > +} > + > +static void plugin_gen_insn_cond_udata_r(const struct qemu_plugin_tb *ptb, > + TCGOp *begin_op, int insn_idx) > +{ > + struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); > + inject_cond_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_COND_R], begin_op); > +} > + > static void plugin_gen_insn_inline_add_u64(const struct qemu_plugin_tb *ptb, > TCGOp *begin_op, int insn_idx) > { > @@ -843,6 +990,15 @@ static void pr_ops(void) > case PLUGIN_GEN_CB_UDATA: > type = "udata"; > break; > + case PLUGIN_GEN_CB_UDATA_R: > + type = "udata (read)"; > + break; > + case PLUGIN_GEN_CB_COND_UDATA: > + type = "cond udata"; > + break; > + case PLUGIN_GEN_CB_COND_UDATA_R: > + type = "cond udata (read)"; > + break; > case PLUGIN_GEN_CB_INLINE_ADD_U64: > type = "inline add u64"; > break; > @@ -897,6 +1053,12 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) > case PLUGIN_GEN_CB_UDATA_R: > plugin_gen_tb_udata_r(plugin_tb, op); > break; > + case PLUGIN_GEN_CB_COND_UDATA: > + plugin_gen_tb_cond_udata(plugin_tb, op); > + break; > + case PLUGIN_GEN_CB_COND_UDATA_R: > + plugin_gen_tb_cond_udata_r(plugin_tb, op); > + break; > case PLUGIN_GEN_CB_INLINE_ADD_U64: > plugin_gen_tb_inline_add_u64(plugin_tb, op); > break; > @@ -919,6 +1081,12 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) > case PLUGIN_GEN_CB_UDATA_R: > plugin_gen_insn_udata_r(plugin_tb, op, insn_idx); > break; > + case PLUGIN_GEN_CB_COND_UDATA: > + plugin_gen_insn_cond_udata(plugin_tb, op, insn_idx); > + break; > + case PLUGIN_GEN_CB_COND_UDATA_R: > + plugin_gen_insn_cond_udata_r(plugin_tb, op, insn_idx); > + break; > case PLUGIN_GEN_CB_INLINE_ADD_U64: > plugin_gen_insn_inline_add_u64(plugin_tb, op, insn_idx); > break; > diff --git a/plugins/api.c b/plugins/api.c > index 4a033c16f83..f24d68d7a68 100644 > --- a/plugins/api.c > +++ b/plugins/api.c > @@ -113,6 +113,31 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, > } > } > > +void qemu_plugin_register_vcpu_tb_exec_cond_cb(struct qemu_plugin_tb *tb, > + qemu_plugin_vcpu_udata_cb_t cb, > + enum qemu_plugin_cb_flags flags, > + enum qemu_plugin_cond cond, > + qemu_plugin_u64 entry, > + uint64_t imm, > + void *udata) > +{ > + if (cond == QEMU_PLUGIN_COND_NEVER || tb->mem_only) { > + return; > + } > + if (cond == QEMU_PLUGIN_COND_ALWAYS) { > + qemu_plugin_register_vcpu_tb_exec_cb(tb, cb, flags, udata); > + return; > + } > + int index = flags == QEMU_PLUGIN_CB_R_REGS || > + flags == QEMU_PLUGIN_CB_RW_REGS ? > + PLUGIN_CB_COND_R : PLUGIN_CB_COND; > + > + plugin_register_dyn_cond_cb__udata(&tb->cbs[index], > + cb, flags, > + cond, entry, imm, > + udata); > +} > + > void qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu( > struct qemu_plugin_tb *tb, > enum qemu_plugin_op op, > @@ -141,6 +166,32 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, > } > } > > +void qemu_plugin_register_vcpu_insn_exec_cond_cb( > + struct qemu_plugin_insn *insn, > + qemu_plugin_vcpu_udata_cb_t cb, > + enum qemu_plugin_cb_flags flags, > + enum qemu_plugin_cond cond, > + qemu_plugin_u64 entry, > + uint64_t imm, > + void *udata) > +{ > + if (cond == QEMU_PLUGIN_COND_NEVER || insn->mem_only) { > + return; > + } > + if (cond == QEMU_PLUGIN_COND_ALWAYS) { > + qemu_plugin_register_vcpu_insn_exec_cb(insn, cb, flags, udata); > + return; > + } > + int index = flags == QEMU_PLUGIN_CB_R_REGS || > + flags == QEMU_PLUGIN_CB_RW_REGS ? > + PLUGIN_CB_COND_R : PLUGIN_CB_COND; > + > + plugin_register_dyn_cond_cb__udata(&insn->cbs[PLUGIN_CB_INSN][index], > + cb, flags, > + cond, entry, imm, > + udata); > +} > + > void qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu( > struct qemu_plugin_insn *insn, > enum qemu_plugin_op op, > diff --git a/plugins/core.c b/plugins/core.c > index 11f72594229..82d5f17438e 100644 > --- a/plugins/core.c > +++ b/plugins/core.c > @@ -347,6 +347,25 @@ void plugin_register_dyn_cb__udata(GArray **arr, > dyn_cb->type = PLUGIN_CB_REGULAR; > } > > +void plugin_register_dyn_cond_cb__udata(GArray **arr, > + qemu_plugin_vcpu_udata_cb_t cb, > + enum qemu_plugin_cb_flags flags, > + enum qemu_plugin_cond cond, > + qemu_plugin_u64 entry, > + uint64_t imm, > + 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_COND; > + dyn_cb->cond_cb.cond = cond; > + dyn_cb->cond_cb.entry = entry; > + dyn_cb->cond_cb.imm = imm; > +} > + > void plugin_register_vcpu_mem_cb(GArray **arr, > void *cb, > enum qemu_plugin_cb_flags flags, > diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols > index a9fac056c7f..aa0a77a319f 100644 > --- a/plugins/qemu-plugins.symbols > +++ b/plugins/qemu-plugins.symbols > @@ -27,6 +27,7 @@ > qemu_plugin_register_vcpu_idle_cb; > qemu_plugin_register_vcpu_init_cb; > qemu_plugin_register_vcpu_insn_exec_cb; > + qemu_plugin_register_vcpu_insn_exec_cond_cb; > qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu; > qemu_plugin_register_vcpu_mem_cb; > qemu_plugin_register_vcpu_mem_inline_per_vcpu; > @@ -34,6 +35,7 @@ > qemu_plugin_register_vcpu_syscall_cb; > qemu_plugin_register_vcpu_syscall_ret_cb; > qemu_plugin_register_vcpu_tb_exec_cb; > + qemu_plugin_register_vcpu_tb_exec_cond_cb; > qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu; > qemu_plugin_register_vcpu_tb_trans_cb; > qemu_plugin_reset;
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes: > Extend plugins API to support callback called with a given criteria > (evaluated inline). > > Added functions: > - qemu_plugin_register_vcpu_tb_exec_cond_cb > - qemu_plugin_register_vcpu_insn_exec_cond_cb > > They expect as parameter a condition, a qemu_plugin_u64_t (op1) and an > immediate (op2). Callback is called if op1 |cond| op2 is true. > > Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> <snip> > > +static TCGCond plugin_cond_to_tcgcond(enum qemu_plugin_cond cond) > +{ > + switch (cond) { > + case QEMU_PLUGIN_COND_EQ: > + return TCG_COND_EQ; > + case QEMU_PLUGIN_COND_NE: > + return TCG_COND_NE; > + case QEMU_PLUGIN_COND_LT: > + return TCG_COND_LTU; > + case QEMU_PLUGIN_COND_LE: > + return TCG_COND_LEU; > + case QEMU_PLUGIN_COND_GT: > + return TCG_COND_GTU; > + case QEMU_PLUGIN_COND_GE: > + return TCG_COND_GEU; > + default: > + /* ALWAYS and NEVER conditions should never reach */ > + g_assert_not_reached(); > + } > +} > + > +static TCGOp *append_cond_udata_cb(const struct qemu_plugin_dyn_cb *cb, > + TCGOp *begin_op, TCGOp *op, int *cb_idx) > +{ > + char *ptr = cb->cond_cb.entry.score->data->data; > + size_t elem_size = g_array_get_element_size( > + cb->cond_cb.entry.score->data); > + size_t offset = cb->cond_cb.entry.offset; > + /* Condition should be negated, as calling the cb is the "else" path */ > + TCGCond cond = tcg_invert_cond(plugin_cond_to_tcgcond(cb->cond_cb.cond)); > + > + op = copy_const_ptr(&begin_op, op, ptr); > + op = copy_ld_i32(&begin_op, op); > + op = copy_mul_i32(&begin_op, op, elem_size); > + op = copy_ext_i32_ptr(&begin_op, op); > + op = copy_const_ptr(&begin_op, op, ptr + offset); > + op = copy_add_ptr(&begin_op, op); > + op = copy_ld_i64(&begin_op, op); > + op = copy_brcondi_i64(&begin_op, op, cond, cb->cond_cb.imm); > + op = copy_call(&begin_op, op, cb->f.vcpu_udata, cb_idx); > + op = copy_set_label(&begin_op, op); > + return op; I think we are missing something here to ensure that udata is set correctly for the callback, see my RFC: Subject: [RFC PATCH] contrib/plugins: control flow plugin (WIP!) Date: Mon, 11 Mar 2024 15:34:32 +0000 Message-Id: <20240311153432.1395190-1-alex.bennee@linaro.org> which is seeing the same value every time in the callback.
On 3/11/24 14:08, Alex Bennée wrote: > Pierrick Bouvier <pierrick.bouvier@linaro.org> writes: > >> Extend plugins API to support callback called with a given criteria >> (evaluated inline). >> >> Added functions: >> - qemu_plugin_register_vcpu_tb_exec_cond_cb >> - qemu_plugin_register_vcpu_insn_exec_cond_cb >> >> They expect as parameter a condition, a qemu_plugin_u64_t (op1) and an >> immediate (op2). Callback is called if op1 |cond| op2 is true. >> >> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> >> --- >> include/qemu/plugin.h | 7 ++ >> include/qemu/qemu-plugin.h | 76 +++++++++++++++ >> plugins/plugin.h | 8 ++ >> accel/tcg/plugin-gen.c | 174 ++++++++++++++++++++++++++++++++++- >> plugins/api.c | 51 ++++++++++ >> plugins/core.c | 19 ++++ >> plugins/qemu-plugins.symbols | 2 + >> 7 files changed, 334 insertions(+), 3 deletions(-) >> >> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h >> index d92d64744e6..056102b2361 100644 >> --- a/include/qemu/plugin.h >> +++ b/include/qemu/plugin.h >> @@ -74,6 +74,8 @@ enum plugin_dyn_cb_type { >> enum plugin_dyn_cb_subtype { >> PLUGIN_CB_REGULAR, >> PLUGIN_CB_REGULAR_R, >> + PLUGIN_CB_COND, >> + PLUGIN_CB_COND_R, >> PLUGIN_CB_INLINE_ADD_U64, >> PLUGIN_CB_INLINE_STORE_U64, >> PLUGIN_N_CB_SUBTYPES, >> @@ -97,6 +99,11 @@ struct qemu_plugin_dyn_cb { >> enum qemu_plugin_op op; >> uint64_t imm; >> } inline_insn; >> + struct { >> + qemu_plugin_u64 entry; >> + enum qemu_plugin_cond cond; >> + uint64_t imm; >> + } cond_cb; >> }; >> }; >> >> diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h >> index c5cac897a0b..337de25ece7 100644 >> --- a/include/qemu/qemu-plugin.h >> +++ b/include/qemu/qemu-plugin.h >> @@ -262,6 +262,29 @@ enum qemu_plugin_mem_rw { >> QEMU_PLUGIN_MEM_RW, >> }; >> >> +/** >> + * enum qemu_plugin_cond - condition to enable callback >> + * >> + * @QEMU_PLUGIN_COND_NEVER: false >> + * @QEMU_PLUGIN_COND_ALWAYS: true >> + * @QEMU_PLUGIN_COND_EQ: is equal? >> + * @QEMU_PLUGIN_COND_NE: is not equal? >> + * @QEMU_PLUGIN_COND_LT: is less than? >> + * @QEMU_PLUGIN_COND_LE: is less than or equal? >> + * @QEMU_PLUGIN_COND_GT: is greater than? >> + * @QEMU_PLUGIN_COND_GE: is greater than or equal? >> + */ >> +enum qemu_plugin_cond { >> + QEMU_PLUGIN_COND_NEVER, >> + QEMU_PLUGIN_COND_ALWAYS, >> + QEMU_PLUGIN_COND_EQ, >> + QEMU_PLUGIN_COND_NE, >> + QEMU_PLUGIN_COND_LT, >> + QEMU_PLUGIN_COND_LE, >> + QEMU_PLUGIN_COND_GT, >> + QEMU_PLUGIN_COND_GE, >> +}; >> + >> /** >> * typedef qemu_plugin_vcpu_tb_trans_cb_t - translation callback >> * @id: unique plugin id >> @@ -301,6 +324,32 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, >> enum qemu_plugin_cb_flags flags, >> void *userdata); >> >> +/** >> + * qemu_plugin_register_vcpu_tb_exec_cond_cb() - register conditional callback >> + * @tb: the opaque qemu_plugin_tb handle for the translation >> + * @cb: callback function >> + * @cond: condition to enable callback >> + * @entry: first operand for condition >> + * @imm: second operand for condition >> + * @flags: does the plugin read or write the CPU's registers? >> + * @userdata: any plugin data to pass to the @cb? >> + * >> + * The @cb function is called when a translated unit executes if >> + * entry @cond imm is true. >> + * If condition is QEMU_PLUGIN_COND_ALWAYS, condition is never interpreted and >> + * this function is equivalent to qemu_plugin_register_vcpu_tb_exec_cb. >> + * If condition QEMU_PLUGIN_COND_NEVER, condition is never interpreted and >> + * callback is never installed. >> + */ >> +QEMU_PLUGIN_API >> +void qemu_plugin_register_vcpu_tb_exec_cond_cb(struct qemu_plugin_tb *tb, >> + qemu_plugin_vcpu_udata_cb_t cb, >> + enum qemu_plugin_cb_flags flags, >> + enum qemu_plugin_cond cond, >> + qemu_plugin_u64 entry, > > Is this a fixed entry or part of a scoreboard? > entry is an entry of scoreboard (automatically associated to each vcpu using vcpu_index) and can be modified by any other inline op, or callback. @imm (next parameter) is fixed yes. callback will be called only if entry <cond> imm true. tests/plugin/inline.c has tests for this, and store operation. > I'm trying to write a control flow plugin with a structure like: > > /* We use this to track the current execution state */ > typedef struct { > /* address of start of block */ > uint64_t block_start; > /* address of end of block */ > uint64_t block_end; > /* address of last executed PC */ > uint64_t last_pc; > } VCPUScoreBoard; > Seems ok. > And I want to check to see if last_pc (set by STORE_U64 for each insn) == block_end > (set at start of TB with what we know). > > Is this something I need to get with: > > last_pc = qemu_plugin_scoreboard_u64_in_struct(state, VCPUScoreBoard, last_pc); > Yes. > ? > >> + uint64_t imm, >> + void *userdata); >> + >> /** >> * enum qemu_plugin_op - describes an inline op >> * >> @@ -344,6 +393,33 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, >> enum qemu_plugin_cb_flags flags, >> void *userdata); >> >> +/** >> + * qemu_plugin_register_vcpu_insn_exec_cond_cb() - conditional insn execution cb >> + * @insn: the opaque qemu_plugin_insn handle for an instruction >> + * @cb: callback function >> + * @flags: does the plugin read or write the CPU's registers? >> + * @cond: condition to enable callback >> + * @entry: first operand for condition >> + * @imm: second operand for condition >> + * @userdata: any plugin data to pass to the @cb? >> + * >> + * The @cb function is called when an instruction executes if >> + * entry @cond imm is true. >> + * If condition is QEMU_PLUGIN_COND_ALWAYS, condition is never interpreted and >> + * this function is equivalent to qemu_plugin_register_vcpu_insn_exec_cb. >> + * If condition QEMU_PLUGIN_COND_NEVER, condition is never interpreted and >> + * callback is never installed. >> + */ >> +QEMU_PLUGIN_API >> +void qemu_plugin_register_vcpu_insn_exec_cond_cb( >> + struct qemu_plugin_insn *insn, >> + qemu_plugin_vcpu_udata_cb_t cb, >> + enum qemu_plugin_cb_flags flags, >> + enum qemu_plugin_cond cond, >> + qemu_plugin_u64 entry, >> + uint64_t imm, >> + void *userdata); >> + >> /** >> * qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu() - insn exec inline op >> * @insn: the opaque qemu_plugin_insn handle for an instruction >> diff --git a/plugins/plugin.h b/plugins/plugin.h >> index 696b1fa38b0..118cc99bb2a 100644 >> --- a/plugins/plugin.h >> +++ b/plugins/plugin.h >> @@ -94,6 +94,14 @@ plugin_register_dyn_cb__udata(GArray **arr, >> qemu_plugin_vcpu_udata_cb_t cb, >> enum qemu_plugin_cb_flags flags, void *udata); >> >> +void >> +plugin_register_dyn_cond_cb__udata(GArray **arr, >> + qemu_plugin_vcpu_udata_cb_t cb, >> + enum qemu_plugin_cb_flags flags, >> + enum qemu_plugin_cond cond, >> + qemu_plugin_u64 entry, >> + uint64_t imm, >> + void *udata); >> >> void plugin_register_vcpu_mem_cb(GArray **arr, >> void *cb, >> diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c >> index 02c894106e2..15762a26439 100644 >> --- a/accel/tcg/plugin-gen.c >> +++ b/accel/tcg/plugin-gen.c >> @@ -46,6 +46,7 @@ >> #include "qemu/plugin.h" >> #include "cpu.h" >> #include "tcg/tcg.h" >> +#include "tcg/tcg-cond.h" >> #include "tcg/tcg-internal.h" >> #include "tcg/tcg-op.h" >> #include "tcg/tcg-temp-internal.h" >> @@ -82,6 +83,8 @@ enum plugin_gen_from { >> enum plugin_gen_cb { >> PLUGIN_GEN_CB_UDATA, >> PLUGIN_GEN_CB_UDATA_R, >> + PLUGIN_GEN_CB_COND_UDATA, >> + PLUGIN_GEN_CB_COND_UDATA_R, >> PLUGIN_GEN_CB_INLINE_ADD_U64, >> PLUGIN_GEN_CB_INLINE_STORE_U64, >> PLUGIN_GEN_CB_MEM, >> @@ -119,16 +122,58 @@ static void gen_empty_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr)) >> tcg_temp_free_i32(cpu_index); >> } >> >> +static void gen_empty_cond_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr)) >> +{ >> + TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); >> + TCGv_i32 cpu_offset = tcg_temp_ebb_new_i32(); >> + TCGv_ptr cpu_index_as_ptr = tcg_temp_ebb_new_ptr(); >> + TCGv_i64 val = tcg_temp_ebb_new_i64(); >> + TCGv_ptr ptr = tcg_temp_ebb_new_ptr(); >> + TCGv_ptr udata = tcg_temp_ebb_new_ptr(); >> + TCGLabel *after_cb = gen_new_label(); >> + >> + tcg_gen_movi_ptr(udata, 0); >> + tcg_gen_ld_i32(cpu_index, tcg_env, >> + -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); >> + /* second operand will be replaced by immediate value */ >> + tcg_gen_mul_i32(cpu_offset, cpu_index, cpu_index); >> + tcg_gen_ext_i32_ptr(cpu_index_as_ptr, cpu_offset); >> + tcg_gen_movi_ptr(ptr, 0); >> + tcg_gen_add_ptr(ptr, ptr, cpu_index_as_ptr); >> + tcg_gen_ld_i64(val, ptr, 0); >> + >> + tcg_gen_brcondi_i64(TCG_COND_EQ, val, 0, after_cb); >> + gen_helper(cpu_index, udata); >> + gen_set_label(after_cb); >> + >> + tcg_temp_free_ptr(udata); >> + tcg_temp_free_ptr(ptr); >> + tcg_temp_free_i64(val); >> + tcg_temp_free_ptr(cpu_index_as_ptr); >> + tcg_temp_free_i32(cpu_offset); >> + 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_cond_udata_cb_no_wg(void) >> +{ >> + gen_empty_cond_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); >> } >> >> +static void gen_empty_cond_udata_cb_no_rwg(void) >> +{ >> + gen_empty_cond_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_rwg); >> +} >> + >> static void gen_empty_inline_cb_add_u64(void) >> { >> TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); >> @@ -248,6 +293,10 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) >> gen_empty_inline_cb_store_u64); >> gen_wrapped(from, PLUGIN_GEN_CB_UDATA, gen_empty_udata_cb_no_rwg); >> gen_wrapped(from, PLUGIN_GEN_CB_UDATA_R, gen_empty_udata_cb_no_wg); >> + gen_wrapped(from, PLUGIN_GEN_CB_COND_UDATA, >> + gen_empty_cond_udata_cb_no_rwg); >> + gen_wrapped(from, PLUGIN_GEN_CB_COND_UDATA_R, >> + gen_empty_cond_udata_cb_no_wg); >> break; >> default: >> g_assert_not_reached(); >> @@ -456,6 +505,29 @@ static TCGOp *copy_call(TCGOp **begin_op, TCGOp *op, void *func, int *cb_idx) >> return op; >> } >> >> +static TCGOp *copy_brcondi_i64(TCGOp **begin_op, TCGOp *op, TCGCond cond, >> + uint64_t imm) >> +{ >> + if (TCG_TARGET_REG_BITS == 32) { >> + op = copy_op(begin_op, op, INDEX_op_brcond2_i32); >> + /* low(arg1), high(arg1), 32(arg2), 32(arg2 >> 32), cond, label */ >> + op->args[2] = tcgv_i32_arg(tcg_constant_i32(imm)); >> + op->args[3] = tcgv_i32_arg(tcg_constant_i32(imm >> 32)); >> + op->args[4] = cond; >> + } else { >> + op = copy_op(begin_op, op, INDEX_op_brcond_i64); >> + /* arg1, arg2, cond, label */ >> + op->args[1] = tcgv_i64_arg(tcg_constant_i64(imm)); >> + op->args[2] = cond; >> + } >> + return op; >> +} >> + >> +static TCGOp *copy_set_label(TCGOp **begin_op, TCGOp *op) >> +{ >> + return copy_op(begin_op, op, INDEX_op_set_label); >> +} >> + >> /* >> * When we append/replace ops here we are sensitive to changing patterns of >> * TCGOps generated by the tcg_gen_FOO calls when we generated the >> @@ -482,6 +554,50 @@ static TCGOp *append_udata_cb(const struct qemu_plugin_dyn_cb *cb, >> return op; >> } >> >> +static TCGCond plugin_cond_to_tcgcond(enum qemu_plugin_cond cond) >> +{ >> + switch (cond) { >> + case QEMU_PLUGIN_COND_EQ: >> + return TCG_COND_EQ; >> + case QEMU_PLUGIN_COND_NE: >> + return TCG_COND_NE; >> + case QEMU_PLUGIN_COND_LT: >> + return TCG_COND_LTU; >> + case QEMU_PLUGIN_COND_LE: >> + return TCG_COND_LEU; >> + case QEMU_PLUGIN_COND_GT: >> + return TCG_COND_GTU; >> + case QEMU_PLUGIN_COND_GE: >> + return TCG_COND_GEU; >> + default: >> + /* ALWAYS and NEVER conditions should never reach */ >> + g_assert_not_reached(); >> + } >> +} >> + >> +static TCGOp *append_cond_udata_cb(const struct qemu_plugin_dyn_cb *cb, >> + TCGOp *begin_op, TCGOp *op, int *cb_idx) >> +{ >> + char *ptr = cb->cond_cb.entry.score->data->data; >> + size_t elem_size = g_array_get_element_size( >> + cb->cond_cb.entry.score->data); >> + size_t offset = cb->cond_cb.entry.offset; >> + /* Condition should be negated, as calling the cb is the "else" path */ >> + TCGCond cond = tcg_invert_cond(plugin_cond_to_tcgcond(cb->cond_cb.cond)); >> + >> + op = copy_const_ptr(&begin_op, op, ptr); >> + op = copy_ld_i32(&begin_op, op); >> + op = copy_mul_i32(&begin_op, op, elem_size); >> + op = copy_ext_i32_ptr(&begin_op, op); >> + op = copy_const_ptr(&begin_op, op, ptr + offset); >> + op = copy_add_ptr(&begin_op, op); >> + op = copy_ld_i64(&begin_op, op); >> + op = copy_brcondi_i64(&begin_op, op, cond, cb->cond_cb.imm); >> + op = copy_call(&begin_op, op, cb->f.vcpu_udata, cb_idx); >> + op = copy_set_label(&begin_op, op); >> + return op; >> +} >> + >> static TCGOp *append_inline_cb_add_u64(const struct qemu_plugin_dyn_cb *cb, >> TCGOp *begin_op, TCGOp *op, >> int *unused) >> @@ -601,6 +717,12 @@ inject_udata_cb(const GArray *cbs, TCGOp *begin_op) >> inject_cb_type(cbs, begin_op, append_udata_cb, op_ok); >> } >> >> +static void >> +inject_cond_udata_cb(const GArray *cbs, TCGOp *begin_op) >> +{ >> + inject_cb_type(cbs, begin_op, append_cond_udata_cb, op_ok); >> +} >> + >> static void >> inject_inline_cb_add_u64(const GArray *cbs, TCGOp *begin_op, op_ok_fn ok) >> { >> @@ -654,7 +776,7 @@ static void inject_mem_enable_helper(struct qemu_plugin_tb *ptb, >> struct qemu_plugin_insn *plugin_insn, >> TCGOp *begin_op) >> { >> - GArray *cbs[3]; >> + GArray *cbs[4]; >> GArray *arr; >> size_t n_cbs, i; >> >> @@ -662,6 +784,7 @@ static void inject_mem_enable_helper(struct qemu_plugin_tb *ptb, >> cbs[0] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_INLINE_ADD_U64]; >> cbs[1] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_INLINE_STORE_U64]; >> cbs[2] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_REGULAR]; >> + cbs[3] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_COND]; >> >> n_cbs = 0; >> for (i = 0; i < ARRAY_SIZE(cbs); i++) { >> @@ -727,6 +850,18 @@ static void plugin_gen_tb_udata_r(const struct qemu_plugin_tb *ptb, >> inject_udata_cb(ptb->cbs[PLUGIN_CB_REGULAR_R], begin_op); >> } >> >> +static void plugin_gen_tb_cond_udata(const struct qemu_plugin_tb *ptb, >> + TCGOp *begin_op) >> +{ >> + inject_cond_udata_cb(ptb->cbs[PLUGIN_CB_COND], begin_op); >> +} >> + >> +static void plugin_gen_tb_cond_udata_r(const struct qemu_plugin_tb *ptb, >> + TCGOp *begin_op) >> +{ >> + inject_cond_udata_cb(ptb->cbs[PLUGIN_CB_COND_R], begin_op); >> +} >> + >> static void plugin_gen_tb_inline_add_u64(const struct qemu_plugin_tb *ptb, >> TCGOp *begin_op) >> { >> @@ -745,7 +880,6 @@ static void plugin_gen_insn_udata(const struct qemu_plugin_tb *ptb, >> TCGOp *begin_op, int insn_idx) >> { >> struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); >> - >> inject_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR], begin_op); >> } >> >> @@ -753,10 +887,23 @@ static void plugin_gen_insn_udata_r(const struct qemu_plugin_tb *ptb, >> TCGOp *begin_op, int insn_idx) >> { >> struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); >> - >> inject_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR_R], begin_op); >> } >> >> +static void plugin_gen_insn_cond_udata(const struct qemu_plugin_tb *ptb, >> + TCGOp *begin_op, int insn_idx) >> +{ >> + struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); >> + inject_cond_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_COND], begin_op); >> +} >> + >> +static void plugin_gen_insn_cond_udata_r(const struct qemu_plugin_tb *ptb, >> + TCGOp *begin_op, int insn_idx) >> +{ >> + struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); >> + inject_cond_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_COND_R], begin_op); >> +} >> + >> static void plugin_gen_insn_inline_add_u64(const struct qemu_plugin_tb *ptb, >> TCGOp *begin_op, int insn_idx) >> { >> @@ -843,6 +990,15 @@ static void pr_ops(void) >> case PLUGIN_GEN_CB_UDATA: >> type = "udata"; >> break; >> + case PLUGIN_GEN_CB_UDATA_R: >> + type = "udata (read)"; >> + break; >> + case PLUGIN_GEN_CB_COND_UDATA: >> + type = "cond udata"; >> + break; >> + case PLUGIN_GEN_CB_COND_UDATA_R: >> + type = "cond udata (read)"; >> + break; >> case PLUGIN_GEN_CB_INLINE_ADD_U64: >> type = "inline add u64"; >> break; >> @@ -897,6 +1053,12 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) >> case PLUGIN_GEN_CB_UDATA_R: >> plugin_gen_tb_udata_r(plugin_tb, op); >> break; >> + case PLUGIN_GEN_CB_COND_UDATA: >> + plugin_gen_tb_cond_udata(plugin_tb, op); >> + break; >> + case PLUGIN_GEN_CB_COND_UDATA_R: >> + plugin_gen_tb_cond_udata_r(plugin_tb, op); >> + break; >> case PLUGIN_GEN_CB_INLINE_ADD_U64: >> plugin_gen_tb_inline_add_u64(plugin_tb, op); >> break; >> @@ -919,6 +1081,12 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) >> case PLUGIN_GEN_CB_UDATA_R: >> plugin_gen_insn_udata_r(plugin_tb, op, insn_idx); >> break; >> + case PLUGIN_GEN_CB_COND_UDATA: >> + plugin_gen_insn_cond_udata(plugin_tb, op, insn_idx); >> + break; >> + case PLUGIN_GEN_CB_COND_UDATA_R: >> + plugin_gen_insn_cond_udata_r(plugin_tb, op, insn_idx); >> + break; >> case PLUGIN_GEN_CB_INLINE_ADD_U64: >> plugin_gen_insn_inline_add_u64(plugin_tb, op, insn_idx); >> break; >> diff --git a/plugins/api.c b/plugins/api.c >> index 4a033c16f83..f24d68d7a68 100644 >> --- a/plugins/api.c >> +++ b/plugins/api.c >> @@ -113,6 +113,31 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, >> } >> } >> >> +void qemu_plugin_register_vcpu_tb_exec_cond_cb(struct qemu_plugin_tb *tb, >> + qemu_plugin_vcpu_udata_cb_t cb, >> + enum qemu_plugin_cb_flags flags, >> + enum qemu_plugin_cond cond, >> + qemu_plugin_u64 entry, >> + uint64_t imm, >> + void *udata) >> +{ >> + if (cond == QEMU_PLUGIN_COND_NEVER || tb->mem_only) { >> + return; >> + } >> + if (cond == QEMU_PLUGIN_COND_ALWAYS) { >> + qemu_plugin_register_vcpu_tb_exec_cb(tb, cb, flags, udata); >> + return; >> + } >> + int index = flags == QEMU_PLUGIN_CB_R_REGS || >> + flags == QEMU_PLUGIN_CB_RW_REGS ? >> + PLUGIN_CB_COND_R : PLUGIN_CB_COND; >> + >> + plugin_register_dyn_cond_cb__udata(&tb->cbs[index], >> + cb, flags, >> + cond, entry, imm, >> + udata); >> +} >> + >> void qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu( >> struct qemu_plugin_tb *tb, >> enum qemu_plugin_op op, >> @@ -141,6 +166,32 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, >> } >> } >> >> +void qemu_plugin_register_vcpu_insn_exec_cond_cb( >> + struct qemu_plugin_insn *insn, >> + qemu_plugin_vcpu_udata_cb_t cb, >> + enum qemu_plugin_cb_flags flags, >> + enum qemu_plugin_cond cond, >> + qemu_plugin_u64 entry, >> + uint64_t imm, >> + void *udata) >> +{ >> + if (cond == QEMU_PLUGIN_COND_NEVER || insn->mem_only) { >> + return; >> + } >> + if (cond == QEMU_PLUGIN_COND_ALWAYS) { >> + qemu_plugin_register_vcpu_insn_exec_cb(insn, cb, flags, udata); >> + return; >> + } >> + int index = flags == QEMU_PLUGIN_CB_R_REGS || >> + flags == QEMU_PLUGIN_CB_RW_REGS ? >> + PLUGIN_CB_COND_R : PLUGIN_CB_COND; >> + >> + plugin_register_dyn_cond_cb__udata(&insn->cbs[PLUGIN_CB_INSN][index], >> + cb, flags, >> + cond, entry, imm, >> + udata); >> +} >> + >> void qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu( >> struct qemu_plugin_insn *insn, >> enum qemu_plugin_op op, >> diff --git a/plugins/core.c b/plugins/core.c >> index 11f72594229..82d5f17438e 100644 >> --- a/plugins/core.c >> +++ b/plugins/core.c >> @@ -347,6 +347,25 @@ void plugin_register_dyn_cb__udata(GArray **arr, >> dyn_cb->type = PLUGIN_CB_REGULAR; >> } >> >> +void plugin_register_dyn_cond_cb__udata(GArray **arr, >> + qemu_plugin_vcpu_udata_cb_t cb, >> + enum qemu_plugin_cb_flags flags, >> + enum qemu_plugin_cond cond, >> + qemu_plugin_u64 entry, >> + uint64_t imm, >> + 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_COND; >> + dyn_cb->cond_cb.cond = cond; >> + dyn_cb->cond_cb.entry = entry; >> + dyn_cb->cond_cb.imm = imm; >> +} >> + >> void plugin_register_vcpu_mem_cb(GArray **arr, >> void *cb, >> enum qemu_plugin_cb_flags flags, >> diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols >> index a9fac056c7f..aa0a77a319f 100644 >> --- a/plugins/qemu-plugins.symbols >> +++ b/plugins/qemu-plugins.symbols >> @@ -27,6 +27,7 @@ >> qemu_plugin_register_vcpu_idle_cb; >> qemu_plugin_register_vcpu_init_cb; >> qemu_plugin_register_vcpu_insn_exec_cb; >> + qemu_plugin_register_vcpu_insn_exec_cond_cb; >> qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu; >> qemu_plugin_register_vcpu_mem_cb; >> qemu_plugin_register_vcpu_mem_inline_per_vcpu; >> @@ -34,6 +35,7 @@ >> qemu_plugin_register_vcpu_syscall_cb; >> qemu_plugin_register_vcpu_syscall_ret_cb; >> qemu_plugin_register_vcpu_tb_exec_cb; >> + qemu_plugin_register_vcpu_tb_exec_cond_cb; >> qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu; >> qemu_plugin_register_vcpu_tb_trans_cb; >> qemu_plugin_reset; >
On 3/11/24 19:43, Alex Bennée wrote: > Pierrick Bouvier <pierrick.bouvier@linaro.org> writes: > >> Extend plugins API to support callback called with a given criteria >> (evaluated inline). >> >> Added functions: >> - qemu_plugin_register_vcpu_tb_exec_cond_cb >> - qemu_plugin_register_vcpu_insn_exec_cond_cb >> >> They expect as parameter a condition, a qemu_plugin_u64_t (op1) and an >> immediate (op2). Callback is called if op1 |cond| op2 is true. >> >> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > <snip> >> >> +static TCGCond plugin_cond_to_tcgcond(enum qemu_plugin_cond cond) >> +{ >> + switch (cond) { >> + case QEMU_PLUGIN_COND_EQ: >> + return TCG_COND_EQ; >> + case QEMU_PLUGIN_COND_NE: >> + return TCG_COND_NE; >> + case QEMU_PLUGIN_COND_LT: >> + return TCG_COND_LTU; >> + case QEMU_PLUGIN_COND_LE: >> + return TCG_COND_LEU; >> + case QEMU_PLUGIN_COND_GT: >> + return TCG_COND_GTU; >> + case QEMU_PLUGIN_COND_GE: >> + return TCG_COND_GEU; >> + default: >> + /* ALWAYS and NEVER conditions should never reach */ >> + g_assert_not_reached(); >> + } >> +} >> + >> +static TCGOp *append_cond_udata_cb(const struct qemu_plugin_dyn_cb *cb, >> + TCGOp *begin_op, TCGOp *op, int *cb_idx) >> +{ >> + char *ptr = cb->cond_cb.entry.score->data->data; >> + size_t elem_size = g_array_get_element_size( >> + cb->cond_cb.entry.score->data); >> + size_t offset = cb->cond_cb.entry.offset; >> + /* Condition should be negated, as calling the cb is the "else" path */ >> + TCGCond cond = tcg_invert_cond(plugin_cond_to_tcgcond(cb->cond_cb.cond)); >> + >> + op = copy_const_ptr(&begin_op, op, ptr); >> + op = copy_ld_i32(&begin_op, op); >> + op = copy_mul_i32(&begin_op, op, elem_size); >> + op = copy_ext_i32_ptr(&begin_op, op); >> + op = copy_const_ptr(&begin_op, op, ptr + offset); >> + op = copy_add_ptr(&begin_op, op); >> + op = copy_ld_i64(&begin_op, op); >> + op = copy_brcondi_i64(&begin_op, op, cond, cb->cond_cb.imm); >> + op = copy_call(&begin_op, op, cb->f.vcpu_udata, cb_idx); >> + op = copy_set_label(&begin_op, op); >> + return op; > > I think we are missing something here to ensure that udata is set > correctly for the callback, see my RFC: > > Subject: [RFC PATCH] contrib/plugins: control flow plugin (WIP!) > Date: Mon, 11 Mar 2024 15:34:32 +0000 > Message-Id: <20240311153432.1395190-1-alex.bennee@linaro.org> > > which is seeing the same value every time in the callback. > I'm trying to reproduce and will answer on this thread.
On 3/12/24 10:03, Pierrick Bouvier wrote: > On 3/11/24 19:43, Alex Bennée wrote: >> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes: >> >>> Extend plugins API to support callback called with a given criteria >>> (evaluated inline). >>> >>> Added functions: >>> - qemu_plugin_register_vcpu_tb_exec_cond_cb >>> - qemu_plugin_register_vcpu_insn_exec_cond_cb >>> >>> They expect as parameter a condition, a qemu_plugin_u64_t (op1) and an >>> immediate (op2). Callback is called if op1 |cond| op2 is true. >>> >>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> >> <snip> >>> >>> +static TCGCond plugin_cond_to_tcgcond(enum qemu_plugin_cond cond) >>> +{ >>> + switch (cond) { >>> + case QEMU_PLUGIN_COND_EQ: >>> + return TCG_COND_EQ; >>> + case QEMU_PLUGIN_COND_NE: >>> + return TCG_COND_NE; >>> + case QEMU_PLUGIN_COND_LT: >>> + return TCG_COND_LTU; >>> + case QEMU_PLUGIN_COND_LE: >>> + return TCG_COND_LEU; >>> + case QEMU_PLUGIN_COND_GT: >>> + return TCG_COND_GTU; >>> + case QEMU_PLUGIN_COND_GE: >>> + return TCG_COND_GEU; >>> + default: >>> + /* ALWAYS and NEVER conditions should never reach */ >>> + g_assert_not_reached(); >>> + } >>> +} >>> + >>> +static TCGOp *append_cond_udata_cb(const struct qemu_plugin_dyn_cb *cb, >>> + TCGOp *begin_op, TCGOp *op, int *cb_idx) >>> +{ >>> + char *ptr = cb->cond_cb.entry.score->data->data; >>> + size_t elem_size = g_array_get_element_size( >>> + cb->cond_cb.entry.score->data); >>> + size_t offset = cb->cond_cb.entry.offset; >>> + /* Condition should be negated, as calling the cb is the "else" path */ >>> + TCGCond cond = tcg_invert_cond(plugin_cond_to_tcgcond(cb->cond_cb.cond)); >>> + >>> + op = copy_const_ptr(&begin_op, op, ptr); This line was wrong, and cb->userp should be copied instead. I'll fix this, add a test specifically checking udata for conditional callback and resend the series. >>> + op = copy_ld_i32(&begin_op, op); >>> + op = copy_mul_i32(&begin_op, op, elem_size); >>> + op = copy_ext_i32_ptr(&begin_op, op); >>> + op = copy_const_ptr(&begin_op, op, ptr + offset); >>> + op = copy_add_ptr(&begin_op, op); >>> + op = copy_ld_i64(&begin_op, op); >>> + op = copy_brcondi_i64(&begin_op, op, cond, cb->cond_cb.imm); >>> + op = copy_call(&begin_op, op, cb->f.vcpu_udata, cb_idx); >>> + op = copy_set_label(&begin_op, op); >>> + return op; >> >> I think we are missing something here to ensure that udata is set >> correctly for the callback, see my RFC: >> >> Subject: [RFC PATCH] contrib/plugins: control flow plugin (WIP!) >> Date: Mon, 11 Mar 2024 15:34:32 +0000 >> Message-Id: <20240311153432.1395190-1-alex.bennee@linaro.org> >> >> which is seeing the same value every time in the callback. >> > > I'm trying to reproduce and will answer on this thread.
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes: > On 3/11/24 14:08, Alex Bennée wrote: >> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes: >> >>> Extend plugins API to support callback called with a given criteria >>> (evaluated inline). >>> >>> Added functions: >>> - qemu_plugin_register_vcpu_tb_exec_cond_cb >>> - qemu_plugin_register_vcpu_insn_exec_cond_cb >>> >>> They expect as parameter a condition, a qemu_plugin_u64_t (op1) and an >>> immediate (op2). Callback is called if op1 |cond| op2 is true. >>> >>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> >>> --- >>> include/qemu/plugin.h | 7 ++ >>> include/qemu/qemu-plugin.h | 76 +++++++++++++++ >>> plugins/plugin.h | 8 ++ >>> accel/tcg/plugin-gen.c | 174 ++++++++++++++++++++++++++++++++++- >>> plugins/api.c | 51 ++++++++++ >>> plugins/core.c | 19 ++++ >>> plugins/qemu-plugins.symbols | 2 + >>> 7 files changed, 334 insertions(+), 3 deletions(-) >>> >>> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h >>> index d92d64744e6..056102b2361 100644 >>> --- a/include/qemu/plugin.h >>> +++ b/include/qemu/plugin.h >>> @@ -74,6 +74,8 @@ enum plugin_dyn_cb_type { >>> enum plugin_dyn_cb_subtype { >>> PLUGIN_CB_REGULAR, >>> PLUGIN_CB_REGULAR_R, >>> + PLUGIN_CB_COND, >>> + PLUGIN_CB_COND_R, >>> PLUGIN_CB_INLINE_ADD_U64, >>> PLUGIN_CB_INLINE_STORE_U64, >>> PLUGIN_N_CB_SUBTYPES, >>> @@ -97,6 +99,11 @@ struct qemu_plugin_dyn_cb { >>> enum qemu_plugin_op op; >>> uint64_t imm; >>> } inline_insn; >>> + struct { >>> + qemu_plugin_u64 entry; >>> + enum qemu_plugin_cond cond; >>> + uint64_t imm; >>> + } cond_cb; >>> }; >>> }; >>> diff --git a/include/qemu/qemu-plugin.h >>> b/include/qemu/qemu-plugin.h >>> index c5cac897a0b..337de25ece7 100644 >>> --- a/include/qemu/qemu-plugin.h >>> +++ b/include/qemu/qemu-plugin.h >>> @@ -262,6 +262,29 @@ enum qemu_plugin_mem_rw { >>> QEMU_PLUGIN_MEM_RW, >>> }; >>> +/** >>> + * enum qemu_plugin_cond - condition to enable callback >>> + * >>> + * @QEMU_PLUGIN_COND_NEVER: false >>> + * @QEMU_PLUGIN_COND_ALWAYS: true >>> + * @QEMU_PLUGIN_COND_EQ: is equal? >>> + * @QEMU_PLUGIN_COND_NE: is not equal? >>> + * @QEMU_PLUGIN_COND_LT: is less than? >>> + * @QEMU_PLUGIN_COND_LE: is less than or equal? >>> + * @QEMU_PLUGIN_COND_GT: is greater than? >>> + * @QEMU_PLUGIN_COND_GE: is greater than or equal? >>> + */ >>> +enum qemu_plugin_cond { >>> + QEMU_PLUGIN_COND_NEVER, >>> + QEMU_PLUGIN_COND_ALWAYS, >>> + QEMU_PLUGIN_COND_EQ, >>> + QEMU_PLUGIN_COND_NE, >>> + QEMU_PLUGIN_COND_LT, >>> + QEMU_PLUGIN_COND_LE, >>> + QEMU_PLUGIN_COND_GT, >>> + QEMU_PLUGIN_COND_GE, >>> +}; >>> + >>> /** >>> * typedef qemu_plugin_vcpu_tb_trans_cb_t - translation callback >>> * @id: unique plugin id >>> @@ -301,6 +324,32 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, >>> enum qemu_plugin_cb_flags flags, >>> void *userdata); >>> +/** >>> + * qemu_plugin_register_vcpu_tb_exec_cond_cb() - register conditional callback >>> + * @tb: the opaque qemu_plugin_tb handle for the translation >>> + * @cb: callback function >>> + * @cond: condition to enable callback >>> + * @entry: first operand for condition >>> + * @imm: second operand for condition >>> + * @flags: does the plugin read or write the CPU's registers? >>> + * @userdata: any plugin data to pass to the @cb? >>> + * >>> + * The @cb function is called when a translated unit executes if >>> + * entry @cond imm is true. >>> + * If condition is QEMU_PLUGIN_COND_ALWAYS, condition is never interpreted and >>> + * this function is equivalent to qemu_plugin_register_vcpu_tb_exec_cb. >>> + * If condition QEMU_PLUGIN_COND_NEVER, condition is never interpreted and >>> + * callback is never installed. >>> + */ >>> +QEMU_PLUGIN_API >>> +void qemu_plugin_register_vcpu_tb_exec_cond_cb(struct qemu_plugin_tb *tb, >>> + qemu_plugin_vcpu_udata_cb_t cb, >>> + enum qemu_plugin_cb_flags flags, >>> + enum qemu_plugin_cond cond, >>> + qemu_plugin_u64 entry, >> Is this a fixed entry or part of a scoreboard? >> > > entry is an entry of scoreboard (automatically associated to each vcpu > using vcpu_index) and can be modified by any other inline op, or > callback. @imm (next parameter) is fixed yes. > > callback will be called only if entry <cond> imm true. I wonder if having an alternate form for comparing two scoreboard entries would be useful?
On 3/12/24 19:04, Alex Bennée wrote: > Pierrick Bouvier <pierrick.bouvier@linaro.org> writes: > >> On 3/11/24 14:08, Alex Bennée wrote: >>> Pierrick Bouvier <pierrick.bouvier@linaro.org> writes: >>> >>>> Extend plugins API to support callback called with a given criteria >>>> (evaluated inline). >>>> >>>> Added functions: >>>> - qemu_plugin_register_vcpu_tb_exec_cond_cb >>>> - qemu_plugin_register_vcpu_insn_exec_cond_cb >>>> >>>> They expect as parameter a condition, a qemu_plugin_u64_t (op1) and an >>>> immediate (op2). Callback is called if op1 |cond| op2 is true. >>>> >>>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> >>>> --- >>>> include/qemu/plugin.h | 7 ++ >>>> include/qemu/qemu-plugin.h | 76 +++++++++++++++ >>>> plugins/plugin.h | 8 ++ >>>> accel/tcg/plugin-gen.c | 174 ++++++++++++++++++++++++++++++++++- >>>> plugins/api.c | 51 ++++++++++ >>>> plugins/core.c | 19 ++++ >>>> plugins/qemu-plugins.symbols | 2 + >>>> 7 files changed, 334 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h >>>> index d92d64744e6..056102b2361 100644 >>>> --- a/include/qemu/plugin.h >>>> +++ b/include/qemu/plugin.h >>>> @@ -74,6 +74,8 @@ enum plugin_dyn_cb_type { >>>> enum plugin_dyn_cb_subtype { >>>> PLUGIN_CB_REGULAR, >>>> PLUGIN_CB_REGULAR_R, >>>> + PLUGIN_CB_COND, >>>> + PLUGIN_CB_COND_R, >>>> PLUGIN_CB_INLINE_ADD_U64, >>>> PLUGIN_CB_INLINE_STORE_U64, >>>> PLUGIN_N_CB_SUBTYPES, >>>> @@ -97,6 +99,11 @@ struct qemu_plugin_dyn_cb { >>>> enum qemu_plugin_op op; >>>> uint64_t imm; >>>> } inline_insn; >>>> + struct { >>>> + qemu_plugin_u64 entry; >>>> + enum qemu_plugin_cond cond; >>>> + uint64_t imm; >>>> + } cond_cb; >>>> }; >>>> }; >>>> diff --git a/include/qemu/qemu-plugin.h >>>> b/include/qemu/qemu-plugin.h >>>> index c5cac897a0b..337de25ece7 100644 >>>> --- a/include/qemu/qemu-plugin.h >>>> +++ b/include/qemu/qemu-plugin.h >>>> @@ -262,6 +262,29 @@ enum qemu_plugin_mem_rw { >>>> QEMU_PLUGIN_MEM_RW, >>>> }; >>>> +/** >>>> + * enum qemu_plugin_cond - condition to enable callback >>>> + * >>>> + * @QEMU_PLUGIN_COND_NEVER: false >>>> + * @QEMU_PLUGIN_COND_ALWAYS: true >>>> + * @QEMU_PLUGIN_COND_EQ: is equal? >>>> + * @QEMU_PLUGIN_COND_NE: is not equal? >>>> + * @QEMU_PLUGIN_COND_LT: is less than? >>>> + * @QEMU_PLUGIN_COND_LE: is less than or equal? >>>> + * @QEMU_PLUGIN_COND_GT: is greater than? >>>> + * @QEMU_PLUGIN_COND_GE: is greater than or equal? >>>> + */ >>>> +enum qemu_plugin_cond { >>>> + QEMU_PLUGIN_COND_NEVER, >>>> + QEMU_PLUGIN_COND_ALWAYS, >>>> + QEMU_PLUGIN_COND_EQ, >>>> + QEMU_PLUGIN_COND_NE, >>>> + QEMU_PLUGIN_COND_LT, >>>> + QEMU_PLUGIN_COND_LE, >>>> + QEMU_PLUGIN_COND_GT, >>>> + QEMU_PLUGIN_COND_GE, >>>> +}; >>>> + >>>> /** >>>> * typedef qemu_plugin_vcpu_tb_trans_cb_t - translation callback >>>> * @id: unique plugin id >>>> @@ -301,6 +324,32 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, >>>> enum qemu_plugin_cb_flags flags, >>>> void *userdata); >>>> +/** >>>> + * qemu_plugin_register_vcpu_tb_exec_cond_cb() - register conditional callback >>>> + * @tb: the opaque qemu_plugin_tb handle for the translation >>>> + * @cb: callback function >>>> + * @cond: condition to enable callback >>>> + * @entry: first operand for condition >>>> + * @imm: second operand for condition >>>> + * @flags: does the plugin read or write the CPU's registers? >>>> + * @userdata: any plugin data to pass to the @cb? >>>> + * >>>> + * The @cb function is called when a translated unit executes if >>>> + * entry @cond imm is true. >>>> + * If condition is QEMU_PLUGIN_COND_ALWAYS, condition is never interpreted and >>>> + * this function is equivalent to qemu_plugin_register_vcpu_tb_exec_cb. >>>> + * If condition QEMU_PLUGIN_COND_NEVER, condition is never interpreted and >>>> + * callback is never installed. >>>> + */ >>>> +QEMU_PLUGIN_API >>>> +void qemu_plugin_register_vcpu_tb_exec_cond_cb(struct qemu_plugin_tb *tb, >>>> + qemu_plugin_vcpu_udata_cb_t cb, >>>> + enum qemu_plugin_cb_flags flags, >>>> + enum qemu_plugin_cond cond, >>>> + qemu_plugin_u64 entry, >>> Is this a fixed entry or part of a scoreboard? >>> >> >> entry is an entry of scoreboard (automatically associated to each vcpu >> using vcpu_index) and can be modified by any other inline op, or >> callback. @imm (next parameter) is fixed yes. >> >> callback will be called only if entry <cond> imm true. > > I wonder if having an alternate form for comparing two scoreboard > entries would be useful? > We can always add a new API for that in the future if a specific need is identified. In our current use cases, this need was not revealed.
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index d92d64744e6..056102b2361 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -74,6 +74,8 @@ enum plugin_dyn_cb_type { enum plugin_dyn_cb_subtype { PLUGIN_CB_REGULAR, PLUGIN_CB_REGULAR_R, + PLUGIN_CB_COND, + PLUGIN_CB_COND_R, PLUGIN_CB_INLINE_ADD_U64, PLUGIN_CB_INLINE_STORE_U64, PLUGIN_N_CB_SUBTYPES, @@ -97,6 +99,11 @@ struct qemu_plugin_dyn_cb { enum qemu_plugin_op op; uint64_t imm; } inline_insn; + struct { + qemu_plugin_u64 entry; + enum qemu_plugin_cond cond; + uint64_t imm; + } cond_cb; }; }; diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index c5cac897a0b..337de25ece7 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -262,6 +262,29 @@ enum qemu_plugin_mem_rw { QEMU_PLUGIN_MEM_RW, }; +/** + * enum qemu_plugin_cond - condition to enable callback + * + * @QEMU_PLUGIN_COND_NEVER: false + * @QEMU_PLUGIN_COND_ALWAYS: true + * @QEMU_PLUGIN_COND_EQ: is equal? + * @QEMU_PLUGIN_COND_NE: is not equal? + * @QEMU_PLUGIN_COND_LT: is less than? + * @QEMU_PLUGIN_COND_LE: is less than or equal? + * @QEMU_PLUGIN_COND_GT: is greater than? + * @QEMU_PLUGIN_COND_GE: is greater than or equal? + */ +enum qemu_plugin_cond { + QEMU_PLUGIN_COND_NEVER, + QEMU_PLUGIN_COND_ALWAYS, + QEMU_PLUGIN_COND_EQ, + QEMU_PLUGIN_COND_NE, + QEMU_PLUGIN_COND_LT, + QEMU_PLUGIN_COND_LE, + QEMU_PLUGIN_COND_GT, + QEMU_PLUGIN_COND_GE, +}; + /** * typedef qemu_plugin_vcpu_tb_trans_cb_t - translation callback * @id: unique plugin id @@ -301,6 +324,32 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, enum qemu_plugin_cb_flags flags, void *userdata); +/** + * qemu_plugin_register_vcpu_tb_exec_cond_cb() - register conditional callback + * @tb: the opaque qemu_plugin_tb handle for the translation + * @cb: callback function + * @cond: condition to enable callback + * @entry: first operand for condition + * @imm: second operand for condition + * @flags: does the plugin read or write the CPU's registers? + * @userdata: any plugin data to pass to the @cb? + * + * The @cb function is called when a translated unit executes if + * entry @cond imm is true. + * If condition is QEMU_PLUGIN_COND_ALWAYS, condition is never interpreted and + * this function is equivalent to qemu_plugin_register_vcpu_tb_exec_cb. + * If condition QEMU_PLUGIN_COND_NEVER, condition is never interpreted and + * callback is never installed. + */ +QEMU_PLUGIN_API +void qemu_plugin_register_vcpu_tb_exec_cond_cb(struct qemu_plugin_tb *tb, + qemu_plugin_vcpu_udata_cb_t cb, + enum qemu_plugin_cb_flags flags, + enum qemu_plugin_cond cond, + qemu_plugin_u64 entry, + uint64_t imm, + void *userdata); + /** * enum qemu_plugin_op - describes an inline op * @@ -344,6 +393,33 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, enum qemu_plugin_cb_flags flags, void *userdata); +/** + * qemu_plugin_register_vcpu_insn_exec_cond_cb() - conditional insn execution cb + * @insn: the opaque qemu_plugin_insn handle for an instruction + * @cb: callback function + * @flags: does the plugin read or write the CPU's registers? + * @cond: condition to enable callback + * @entry: first operand for condition + * @imm: second operand for condition + * @userdata: any plugin data to pass to the @cb? + * + * The @cb function is called when an instruction executes if + * entry @cond imm is true. + * If condition is QEMU_PLUGIN_COND_ALWAYS, condition is never interpreted and + * this function is equivalent to qemu_plugin_register_vcpu_insn_exec_cb. + * If condition QEMU_PLUGIN_COND_NEVER, condition is never interpreted and + * callback is never installed. + */ +QEMU_PLUGIN_API +void qemu_plugin_register_vcpu_insn_exec_cond_cb( + struct qemu_plugin_insn *insn, + qemu_plugin_vcpu_udata_cb_t cb, + enum qemu_plugin_cb_flags flags, + enum qemu_plugin_cond cond, + qemu_plugin_u64 entry, + uint64_t imm, + void *userdata); + /** * qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu() - insn exec inline op * @insn: the opaque qemu_plugin_insn handle for an instruction diff --git a/plugins/plugin.h b/plugins/plugin.h index 696b1fa38b0..118cc99bb2a 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -94,6 +94,14 @@ plugin_register_dyn_cb__udata(GArray **arr, qemu_plugin_vcpu_udata_cb_t cb, enum qemu_plugin_cb_flags flags, void *udata); +void +plugin_register_dyn_cond_cb__udata(GArray **arr, + qemu_plugin_vcpu_udata_cb_t cb, + enum qemu_plugin_cb_flags flags, + enum qemu_plugin_cond cond, + qemu_plugin_u64 entry, + uint64_t imm, + void *udata); void plugin_register_vcpu_mem_cb(GArray **arr, void *cb, diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 02c894106e2..15762a26439 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -46,6 +46,7 @@ #include "qemu/plugin.h" #include "cpu.h" #include "tcg/tcg.h" +#include "tcg/tcg-cond.h" #include "tcg/tcg-internal.h" #include "tcg/tcg-op.h" #include "tcg/tcg-temp-internal.h" @@ -82,6 +83,8 @@ enum plugin_gen_from { enum plugin_gen_cb { PLUGIN_GEN_CB_UDATA, PLUGIN_GEN_CB_UDATA_R, + PLUGIN_GEN_CB_COND_UDATA, + PLUGIN_GEN_CB_COND_UDATA_R, PLUGIN_GEN_CB_INLINE_ADD_U64, PLUGIN_GEN_CB_INLINE_STORE_U64, PLUGIN_GEN_CB_MEM, @@ -119,16 +122,58 @@ static void gen_empty_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr)) tcg_temp_free_i32(cpu_index); } +static void gen_empty_cond_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr)) +{ + TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); + TCGv_i32 cpu_offset = tcg_temp_ebb_new_i32(); + TCGv_ptr cpu_index_as_ptr = tcg_temp_ebb_new_ptr(); + TCGv_i64 val = tcg_temp_ebb_new_i64(); + TCGv_ptr ptr = tcg_temp_ebb_new_ptr(); + TCGv_ptr udata = tcg_temp_ebb_new_ptr(); + TCGLabel *after_cb = gen_new_label(); + + tcg_gen_movi_ptr(udata, 0); + tcg_gen_ld_i32(cpu_index, tcg_env, + -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); + /* second operand will be replaced by immediate value */ + tcg_gen_mul_i32(cpu_offset, cpu_index, cpu_index); + tcg_gen_ext_i32_ptr(cpu_index_as_ptr, cpu_offset); + tcg_gen_movi_ptr(ptr, 0); + tcg_gen_add_ptr(ptr, ptr, cpu_index_as_ptr); + tcg_gen_ld_i64(val, ptr, 0); + + tcg_gen_brcondi_i64(TCG_COND_EQ, val, 0, after_cb); + gen_helper(cpu_index, udata); + gen_set_label(after_cb); + + tcg_temp_free_ptr(udata); + tcg_temp_free_ptr(ptr); + tcg_temp_free_i64(val); + tcg_temp_free_ptr(cpu_index_as_ptr); + tcg_temp_free_i32(cpu_offset); + 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_cond_udata_cb_no_wg(void) +{ + gen_empty_cond_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); } +static void gen_empty_cond_udata_cb_no_rwg(void) +{ + gen_empty_cond_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_rwg); +} + static void gen_empty_inline_cb_add_u64(void) { TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); @@ -248,6 +293,10 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) gen_empty_inline_cb_store_u64); gen_wrapped(from, PLUGIN_GEN_CB_UDATA, gen_empty_udata_cb_no_rwg); gen_wrapped(from, PLUGIN_GEN_CB_UDATA_R, gen_empty_udata_cb_no_wg); + gen_wrapped(from, PLUGIN_GEN_CB_COND_UDATA, + gen_empty_cond_udata_cb_no_rwg); + gen_wrapped(from, PLUGIN_GEN_CB_COND_UDATA_R, + gen_empty_cond_udata_cb_no_wg); break; default: g_assert_not_reached(); @@ -456,6 +505,29 @@ static TCGOp *copy_call(TCGOp **begin_op, TCGOp *op, void *func, int *cb_idx) return op; } +static TCGOp *copy_brcondi_i64(TCGOp **begin_op, TCGOp *op, TCGCond cond, + uint64_t imm) +{ + if (TCG_TARGET_REG_BITS == 32) { + op = copy_op(begin_op, op, INDEX_op_brcond2_i32); + /* low(arg1), high(arg1), 32(arg2), 32(arg2 >> 32), cond, label */ + op->args[2] = tcgv_i32_arg(tcg_constant_i32(imm)); + op->args[3] = tcgv_i32_arg(tcg_constant_i32(imm >> 32)); + op->args[4] = cond; + } else { + op = copy_op(begin_op, op, INDEX_op_brcond_i64); + /* arg1, arg2, cond, label */ + op->args[1] = tcgv_i64_arg(tcg_constant_i64(imm)); + op->args[2] = cond; + } + return op; +} + +static TCGOp *copy_set_label(TCGOp **begin_op, TCGOp *op) +{ + return copy_op(begin_op, op, INDEX_op_set_label); +} + /* * When we append/replace ops here we are sensitive to changing patterns of * TCGOps generated by the tcg_gen_FOO calls when we generated the @@ -482,6 +554,50 @@ static TCGOp *append_udata_cb(const struct qemu_plugin_dyn_cb *cb, return op; } +static TCGCond plugin_cond_to_tcgcond(enum qemu_plugin_cond cond) +{ + switch (cond) { + case QEMU_PLUGIN_COND_EQ: + return TCG_COND_EQ; + case QEMU_PLUGIN_COND_NE: + return TCG_COND_NE; + case QEMU_PLUGIN_COND_LT: + return TCG_COND_LTU; + case QEMU_PLUGIN_COND_LE: + return TCG_COND_LEU; + case QEMU_PLUGIN_COND_GT: + return TCG_COND_GTU; + case QEMU_PLUGIN_COND_GE: + return TCG_COND_GEU; + default: + /* ALWAYS and NEVER conditions should never reach */ + g_assert_not_reached(); + } +} + +static TCGOp *append_cond_udata_cb(const struct qemu_plugin_dyn_cb *cb, + TCGOp *begin_op, TCGOp *op, int *cb_idx) +{ + char *ptr = cb->cond_cb.entry.score->data->data; + size_t elem_size = g_array_get_element_size( + cb->cond_cb.entry.score->data); + size_t offset = cb->cond_cb.entry.offset; + /* Condition should be negated, as calling the cb is the "else" path */ + TCGCond cond = tcg_invert_cond(plugin_cond_to_tcgcond(cb->cond_cb.cond)); + + op = copy_const_ptr(&begin_op, op, ptr); + op = copy_ld_i32(&begin_op, op); + op = copy_mul_i32(&begin_op, op, elem_size); + op = copy_ext_i32_ptr(&begin_op, op); + op = copy_const_ptr(&begin_op, op, ptr + offset); + op = copy_add_ptr(&begin_op, op); + op = copy_ld_i64(&begin_op, op); + op = copy_brcondi_i64(&begin_op, op, cond, cb->cond_cb.imm); + op = copy_call(&begin_op, op, cb->f.vcpu_udata, cb_idx); + op = copy_set_label(&begin_op, op); + return op; +} + static TCGOp *append_inline_cb_add_u64(const struct qemu_plugin_dyn_cb *cb, TCGOp *begin_op, TCGOp *op, int *unused) @@ -601,6 +717,12 @@ inject_udata_cb(const GArray *cbs, TCGOp *begin_op) inject_cb_type(cbs, begin_op, append_udata_cb, op_ok); } +static void +inject_cond_udata_cb(const GArray *cbs, TCGOp *begin_op) +{ + inject_cb_type(cbs, begin_op, append_cond_udata_cb, op_ok); +} + static void inject_inline_cb_add_u64(const GArray *cbs, TCGOp *begin_op, op_ok_fn ok) { @@ -654,7 +776,7 @@ static void inject_mem_enable_helper(struct qemu_plugin_tb *ptb, struct qemu_plugin_insn *plugin_insn, TCGOp *begin_op) { - GArray *cbs[3]; + GArray *cbs[4]; GArray *arr; size_t n_cbs, i; @@ -662,6 +784,7 @@ static void inject_mem_enable_helper(struct qemu_plugin_tb *ptb, cbs[0] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_INLINE_ADD_U64]; cbs[1] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_INLINE_STORE_U64]; cbs[2] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_REGULAR]; + cbs[3] = plugin_insn->cbs[PLUGIN_CB_MEM][PLUGIN_CB_COND]; n_cbs = 0; for (i = 0; i < ARRAY_SIZE(cbs); i++) { @@ -727,6 +850,18 @@ static void plugin_gen_tb_udata_r(const struct qemu_plugin_tb *ptb, inject_udata_cb(ptb->cbs[PLUGIN_CB_REGULAR_R], begin_op); } +static void plugin_gen_tb_cond_udata(const struct qemu_plugin_tb *ptb, + TCGOp *begin_op) +{ + inject_cond_udata_cb(ptb->cbs[PLUGIN_CB_COND], begin_op); +} + +static void plugin_gen_tb_cond_udata_r(const struct qemu_plugin_tb *ptb, + TCGOp *begin_op) +{ + inject_cond_udata_cb(ptb->cbs[PLUGIN_CB_COND_R], begin_op); +} + static void plugin_gen_tb_inline_add_u64(const struct qemu_plugin_tb *ptb, TCGOp *begin_op) { @@ -745,7 +880,6 @@ static void plugin_gen_insn_udata(const struct qemu_plugin_tb *ptb, TCGOp *begin_op, int insn_idx) { struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); - inject_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR], begin_op); } @@ -753,10 +887,23 @@ static void plugin_gen_insn_udata_r(const struct qemu_plugin_tb *ptb, TCGOp *begin_op, int insn_idx) { struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); - inject_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR_R], begin_op); } +static void plugin_gen_insn_cond_udata(const struct qemu_plugin_tb *ptb, + TCGOp *begin_op, int insn_idx) +{ + struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); + inject_cond_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_COND], begin_op); +} + +static void plugin_gen_insn_cond_udata_r(const struct qemu_plugin_tb *ptb, + TCGOp *begin_op, int insn_idx) +{ + struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); + inject_cond_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_COND_R], begin_op); +} + static void plugin_gen_insn_inline_add_u64(const struct qemu_plugin_tb *ptb, TCGOp *begin_op, int insn_idx) { @@ -843,6 +990,15 @@ static void pr_ops(void) case PLUGIN_GEN_CB_UDATA: type = "udata"; break; + case PLUGIN_GEN_CB_UDATA_R: + type = "udata (read)"; + break; + case PLUGIN_GEN_CB_COND_UDATA: + type = "cond udata"; + break; + case PLUGIN_GEN_CB_COND_UDATA_R: + type = "cond udata (read)"; + break; case PLUGIN_GEN_CB_INLINE_ADD_U64: type = "inline add u64"; break; @@ -897,6 +1053,12 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) case PLUGIN_GEN_CB_UDATA_R: plugin_gen_tb_udata_r(plugin_tb, op); break; + case PLUGIN_GEN_CB_COND_UDATA: + plugin_gen_tb_cond_udata(plugin_tb, op); + break; + case PLUGIN_GEN_CB_COND_UDATA_R: + plugin_gen_tb_cond_udata_r(plugin_tb, op); + break; case PLUGIN_GEN_CB_INLINE_ADD_U64: plugin_gen_tb_inline_add_u64(plugin_tb, op); break; @@ -919,6 +1081,12 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) case PLUGIN_GEN_CB_UDATA_R: plugin_gen_insn_udata_r(plugin_tb, op, insn_idx); break; + case PLUGIN_GEN_CB_COND_UDATA: + plugin_gen_insn_cond_udata(plugin_tb, op, insn_idx); + break; + case PLUGIN_GEN_CB_COND_UDATA_R: + plugin_gen_insn_cond_udata_r(plugin_tb, op, insn_idx); + break; case PLUGIN_GEN_CB_INLINE_ADD_U64: plugin_gen_insn_inline_add_u64(plugin_tb, op, insn_idx); break; diff --git a/plugins/api.c b/plugins/api.c index 4a033c16f83..f24d68d7a68 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -113,6 +113,31 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, } } +void qemu_plugin_register_vcpu_tb_exec_cond_cb(struct qemu_plugin_tb *tb, + qemu_plugin_vcpu_udata_cb_t cb, + enum qemu_plugin_cb_flags flags, + enum qemu_plugin_cond cond, + qemu_plugin_u64 entry, + uint64_t imm, + void *udata) +{ + if (cond == QEMU_PLUGIN_COND_NEVER || tb->mem_only) { + return; + } + if (cond == QEMU_PLUGIN_COND_ALWAYS) { + qemu_plugin_register_vcpu_tb_exec_cb(tb, cb, flags, udata); + return; + } + int index = flags == QEMU_PLUGIN_CB_R_REGS || + flags == QEMU_PLUGIN_CB_RW_REGS ? + PLUGIN_CB_COND_R : PLUGIN_CB_COND; + + plugin_register_dyn_cond_cb__udata(&tb->cbs[index], + cb, flags, + cond, entry, imm, + udata); +} + void qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu( struct qemu_plugin_tb *tb, enum qemu_plugin_op op, @@ -141,6 +166,32 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn, } } +void qemu_plugin_register_vcpu_insn_exec_cond_cb( + struct qemu_plugin_insn *insn, + qemu_plugin_vcpu_udata_cb_t cb, + enum qemu_plugin_cb_flags flags, + enum qemu_plugin_cond cond, + qemu_plugin_u64 entry, + uint64_t imm, + void *udata) +{ + if (cond == QEMU_PLUGIN_COND_NEVER || insn->mem_only) { + return; + } + if (cond == QEMU_PLUGIN_COND_ALWAYS) { + qemu_plugin_register_vcpu_insn_exec_cb(insn, cb, flags, udata); + return; + } + int index = flags == QEMU_PLUGIN_CB_R_REGS || + flags == QEMU_PLUGIN_CB_RW_REGS ? + PLUGIN_CB_COND_R : PLUGIN_CB_COND; + + plugin_register_dyn_cond_cb__udata(&insn->cbs[PLUGIN_CB_INSN][index], + cb, flags, + cond, entry, imm, + udata); +} + void qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu( struct qemu_plugin_insn *insn, enum qemu_plugin_op op, diff --git a/plugins/core.c b/plugins/core.c index 11f72594229..82d5f17438e 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -347,6 +347,25 @@ void plugin_register_dyn_cb__udata(GArray **arr, dyn_cb->type = PLUGIN_CB_REGULAR; } +void plugin_register_dyn_cond_cb__udata(GArray **arr, + qemu_plugin_vcpu_udata_cb_t cb, + enum qemu_plugin_cb_flags flags, + enum qemu_plugin_cond cond, + qemu_plugin_u64 entry, + uint64_t imm, + 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_COND; + dyn_cb->cond_cb.cond = cond; + dyn_cb->cond_cb.entry = entry; + dyn_cb->cond_cb.imm = imm; +} + void plugin_register_vcpu_mem_cb(GArray **arr, void *cb, enum qemu_plugin_cb_flags flags, diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols index a9fac056c7f..aa0a77a319f 100644 --- a/plugins/qemu-plugins.symbols +++ b/plugins/qemu-plugins.symbols @@ -27,6 +27,7 @@ qemu_plugin_register_vcpu_idle_cb; qemu_plugin_register_vcpu_init_cb; qemu_plugin_register_vcpu_insn_exec_cb; + qemu_plugin_register_vcpu_insn_exec_cond_cb; qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu; qemu_plugin_register_vcpu_mem_cb; qemu_plugin_register_vcpu_mem_inline_per_vcpu; @@ -34,6 +35,7 @@ qemu_plugin_register_vcpu_syscall_cb; qemu_plugin_register_vcpu_syscall_ret_cb; qemu_plugin_register_vcpu_tb_exec_cb; + qemu_plugin_register_vcpu_tb_exec_cond_cb; qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu; qemu_plugin_register_vcpu_tb_trans_cb; qemu_plugin_reset;
Extend plugins API to support callback called with a given criteria (evaluated inline). Added functions: - qemu_plugin_register_vcpu_tb_exec_cond_cb - qemu_plugin_register_vcpu_insn_exec_cond_cb They expect as parameter a condition, a qemu_plugin_u64_t (op1) and an immediate (op2). Callback is called if op1 |cond| op2 is true. Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> --- include/qemu/plugin.h | 7 ++ include/qemu/qemu-plugin.h | 76 +++++++++++++++ plugins/plugin.h | 8 ++ accel/tcg/plugin-gen.c | 174 ++++++++++++++++++++++++++++++++++- plugins/api.c | 51 ++++++++++ plugins/core.c | 19 ++++ plugins/qemu-plugins.symbols | 2 + 7 files changed, 334 insertions(+), 3 deletions(-)