[RFC PATCH] plugins/core: add missing QEMU_DISABLE_CFI annotations

[RFC PATCH] plugins/core: add missing QEMU_DISABLE_CFI annotations

[Alex Bennée]

Most of the memory callbacks come directly from the generated code
however we have do have a a direct from C callback for the slow-path
and memory helpers.

There is also a reset callback that calls out to plugins.

Like the other plugin points we need to disable CFI as we are making
function calls to dynamically linked libraries.

Fixes: https://gitlab.com/qemu-project/qemu/-/issues/3175
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 plugins/core.c   | 1 +
 plugins/loader.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/core.c b/plugins/core.c
index 35a252d2729..8f8bc7219c2 100644
--- a/plugins/core.c
+++ b/plugins/core.c
@@ -668,6 +668,7 @@ void exec_inline_op(enum plugin_dyn_cb_type type,
     }
 }
 
+QEMU_DISABLE_CFI
 void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr,
                              uint64_t value_low,
                              uint64_t value_high,
diff --git a/plugins/loader.c b/plugins/loader.c
index ba10ebac993..0dbe7bea263 100644
--- a/plugins/loader.c
+++ b/plugins/loader.c
@@ -318,6 +318,7 @@ struct qemu_plugin_reset_data {
     bool reset;
 };
 
+QEMU_DISABLE_CFI
 static void plugin_reset_destroy__locked(struct qemu_plugin_reset_data *data)
 {
     struct qemu_plugin_ctx *ctx = data->ctx;
-- 
2.47.3

Re: [RFC PATCH] plugins/core: add missing QEMU_DISABLE_CFI annotations

[Pierrick Bouvier]

On 2025-10-23 15:39, Alex Bennée wrote:
> Most of the memory callbacks come directly from the generated code
> however we have do have a a direct from C callback for the slow-path
> and memory helpers.
> 
> There is also a reset callback that calls out to plugins.
> 
> Like the other plugin points we need to disable CFI as we are making
> function calls to dynamically linked libraries.
> 
> Fixes: https://gitlab.com/qemu-project/qemu/-/issues/3175
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   plugins/core.c   | 1 +
>   plugins/loader.c | 1 +
>   2 files changed, 2 insertions(+)
Thanks for the fix.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>