diff options
| author | Alex Bennée | 2021-02-13 14:03:22 +0100 |
|---|---|---|
| committer | Alex Bennée | 2021-02-18 09:19:23 +0100 |
| commit | cfd405eae6ad7a0e20b006e3295c5e8edab3ce3f (patch) | |
| tree | e65cff6041fc797b3ce6eaebe19547c046ff8e54 /include/qemu | |
| parent | accel/tcg: remove CF_NOCACHE and special cases (diff) | |
| download | qemu-cfd405eae6ad7a0e20b006e3295c5e8edab3ce3f.tar.gz qemu-cfd405eae6ad7a0e20b006e3295c5e8edab3ce3f.tar.xz qemu-cfd405eae6ad7a0e20b006e3295c5e8edab3ce3f.zip | |
accel/tcg: allow plugin instrumentation to be disable via cflags
When icount is enabled and we recompile an MMIO access we end up
double counting the instruction execution. To avoid this we introduce
the CF_MEMI cflag which only allows memory instrumentation for the
next TB (which won't yet have been counted). As this is part of the
hashed compile flags we will only execute the generated TB while
coming out of a cpu_io_recompile.
While we are at it delete the old TODO. We might as well keep the
translation handy as it's likely you will repeatedly hit it on each
MMIO access.
Reported-by: Aaron Lindsay <aaron@os.amperecomputing.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Aaron Lindsay <aaron@os.amperecomputing.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210213130325.14781-21-alex.bennee@linaro.org>
Diffstat (limited to 'include/qemu')
| -rw-r--r-- | include/qemu/plugin.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index 841deed79c..c5a79a89f0 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -92,6 +92,7 @@ struct qemu_plugin_dyn_cb { }; }; +/* Internal context for instrumenting an instruction */ struct qemu_plugin_insn { GByteArray *data; uint64_t vaddr; @@ -99,6 +100,7 @@ struct qemu_plugin_insn { GArray *cbs[PLUGIN_N_CB_TYPES][PLUGIN_N_CB_SUBTYPES]; bool calls_helpers; bool mem_helper; + bool mem_only; }; /* @@ -128,6 +130,7 @@ static inline struct qemu_plugin_insn *qemu_plugin_insn_alloc(void) return insn; } +/* Internal context for this TranslationBlock */ struct qemu_plugin_tb { GPtrArray *insns; size_t n; @@ -135,6 +138,7 @@ struct qemu_plugin_tb { uint64_t vaddr2; void *haddr1; void *haddr2; + bool mem_only; GArray *cbs[PLUGIN_N_CB_SUBTYPES]; }; |