From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Robbin Ehn" <rehn@rivosinc.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [PULL 17/17] plugins: fix qemu_plugin_reset
Date: Thu, 24 Oct 2024 10:56:03 +0100 [thread overview]
Message-ID: <20241024095603.1813285-18-alex.bennee@linaro.org> (raw)
In-Reply-To: <20241024095603.1813285-1-alex.bennee@linaro.org>
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
34e5e1 refactored the plugin context initialization. After this change,
tcg_ctx->plugin_insn is not reset inconditionnally anymore, but only if
one plugin at least is active.
When uninstalling the last plugin active, we stopped reinitializing
tcg_ctx->plugin_insn, which leads to memory callbacks being emitted.
This results in an error as they don't appear in a plugin op sequence as
expected.
The correct fix is to make sure we reset plugin translation variables
after current block translation ends. This way, we can catch any
potential misuse of those after a given block, in more than fixing the
current bug.
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2570
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Tested-by: Robbin Ehn <rehn@rivosinc.com>
Message-Id: <20241015003819.984601-1-pierrick.bouvier@linaro.org>
[AJB: trim patch version details from commit msg]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20241023113406.1284676-19-alex.bennee@linaro.org>
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
index 2ee4c22bef..0f47bfbb48 100644
--- a/accel/tcg/plugin-gen.c
+++ b/accel/tcg/plugin-gen.c
@@ -467,4 +467,8 @@ void plugin_gen_tb_end(CPUState *cpu, size_t num_insns)
/* inject the instrumentation at the appropriate places */
plugin_gen_inject(ptb);
+
+ /* reset plugin translation state (plugin_tb is reused between blocks) */
+ tcg_ctx->plugin_db = NULL;
+ tcg_ctx->plugin_insn = NULL;
}
--
2.39.5
next prev parent reply other threads:[~2024-10-24 9:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-24 9:55 [PULL 00/17] testing, gdbstub and plugin updates Alex Bennée
2024-10-24 9:55 ` [PULL 01/17] tests/docker: Fix microblaze atomics Alex Bennée
2024-10-24 9:55 ` [PULL 02/17] tests/docker: add NOFETCH env variable for testing Alex Bennée
2024-10-24 9:55 ` [PULL 03/17] MAINTAINERS: mention my testing/next tree Alex Bennée
2024-10-24 9:55 ` [PULL 04/17] meson: hide tsan related warnings Alex Bennée
2024-10-24 9:55 ` [PULL 05/17] docs/devel: update tsan build documentation Alex Bennée
2024-10-24 9:55 ` [PULL 06/17] scripts/ci: remove architecture checks for build-environment updates Alex Bennée
2024-10-24 9:55 ` [PULL 07/17] tests/tcg/x86_64: Add cross-modifying code test Alex Bennée
2024-10-24 9:55 ` [PULL 08/17] accel/tcg: add tracepoints for cpu_loop_exit_atomic Alex Bennée
2024-10-24 9:55 ` [PULL 09/17] dockerfiles: fix default targets for debian-loongarch-cross Alex Bennée
2024-10-24 9:55 ` [PULL 10/17] gitlab: make check-[dco|patch] a little more verbose Alex Bennée
2024-10-24 9:55 ` [PULL 11/17] MAINTAINERS: mention my gdbstub/next tree Alex Bennée
2024-10-24 9:55 ` [PULL 12/17] config/targets: update aarch64_be-linux-user gdb XML list Alex Bennée
2024-10-24 9:55 ` [PULL 13/17] tests/tcg: enable basic testing for aarch64_be-linux-user Alex Bennée
2024-10-24 9:56 ` [PULL 14/17] tests/tcg/aarch64: Use raw strings for regexes in test-mte.py Alex Bennée
2024-10-24 9:56 ` [PULL 15/17] testing: Enhance gdb probe script Alex Bennée
2024-10-24 9:56 ` [PULL 16/17] MAINTAINERS: mention my plugins/next tree Alex Bennée
2024-10-24 9:56 ` Alex Bennée [this message]
2024-10-28 14:17 ` [PULL 00/17] testing, gdbstub and plugin updates Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241024095603.1813285-18-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=pbonzini@redhat.com \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rehn@rivosinc.com \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).