From: Akihiko Odaki <akihiko.odaki@daynix.com>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: "Yoshinori Sato" <ysato@users.sourceforge.jp>,
"David Hildenbrand" <david@redhat.com>,
"Weiwei Li" <liwei1518@gmail.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Michael Rolnik" <mrolnik@gmail.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
qemu-ppc@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
qemu-riscv@nongnu.org, "Cleber Rosa" <crosa@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Song Gao" <gaosong@loongson.cn>,
qemu-arm@nongnu.org,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
"John Snow" <jsnow@redhat.com>, "Cédric Le Goater" <clg@kaod.org>,
"Nicholas Piggin" <npiggin@gmail.com>,
qemu-s390x@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Brian Cain" <bcain@quicinc.com>,
"Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Bin Meng" <bin.meng@windriver.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>
Subject: Re: [PATCH 18/23] plugins: add an API to read registers
Date: Sat, 17 Feb 2024 17:01:19 +0900 [thread overview]
Message-ID: <c38a22b5-01e8-40f1-bfc4-4bba9bf7b516@daynix.com> (raw)
In-Reply-To: <20240216163025.424857-19-alex.bennee@linaro.org>
On 2024/02/17 1:30, Alex Bennée wrote:
> We can only request a list of registers once the vCPU has been
> initialised so the user needs to use either call the get function on
> vCPU initialisation or during the translation phase.
>
> We don't expose the reg number to the plugin instead hiding it behind
> an opaque handle. This allows for a bit of future proofing should the
> internals need to be changed while also being hashed against the
> CPUClass so we can handle different register sets per-vCPU in
> hetrogenous situations.
>
> Having an internal state within the plugins also allows us to expand
> the interface in future (for example providing callbacks on register
> change if the translator can track changes).
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1706
> Cc: Akihiko Odaki <akihiko.odaki@daynix.com>
> Message-Id: <20240103173349.398526-39-alex.bennee@linaro.org>
> Based-on: <20231025093128.33116-18-akihiko.odaki@daynix.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>
> ---
> v4
> - the get/read_registers functions are now implicitly for current
> vCPU only to accidental cpu != current_cpu uses.
> ---
> include/qemu/qemu-plugin.h | 48 +++++++++++++++-
> plugins/api.c | 107 +++++++++++++++++++++++++++++++++++
> plugins/qemu-plugins.symbols | 2 +
> 3 files changed, 155 insertions(+), 2 deletions(-)
>
> diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h
> index 93981f8f89f..3b6b18058d2 100644
> --- a/include/qemu/qemu-plugin.h
> +++ b/include/qemu/qemu-plugin.h
> @@ -11,6 +11,7 @@
> #ifndef QEMU_QEMU_PLUGIN_H
> #define QEMU_QEMU_PLUGIN_H
>
> +#include <glib.h>
> #include <inttypes.h>
> #include <stdbool.h>
> #include <stddef.h>
> @@ -229,8 +230,8 @@ struct qemu_plugin_insn;
> * @QEMU_PLUGIN_CB_R_REGS: callback reads the CPU's regs
> * @QEMU_PLUGIN_CB_RW_REGS: callback reads and writes the CPU's regs
> *
> - * Note: currently unused, plugins cannot read or change system
> - * register state.
> + * Note: currently QEMU_PLUGIN_CB_RW_REGS is unused, plugins cannot change
> + * system register state.
> */
> enum qemu_plugin_cb_flags {
> QEMU_PLUGIN_CB_NO_REGS,
> @@ -707,4 +708,47 @@ uint64_t qemu_plugin_end_code(void);
> QEMU_PLUGIN_API
> uint64_t qemu_plugin_entry_code(void);
>
> +/** struct qemu_plugin_register - Opaque handle for register access */
> +struct qemu_plugin_register;
> +
> +/**
> + * typedef qemu_plugin_reg_descriptor - register descriptions
> + *
> + * @handle: opaque handle for retrieving value with qemu_plugin_read_register
> + * @name: register name
> + * @feature: optional feature descriptor, can be NULL
> + */
> +typedef struct {
> + struct qemu_plugin_register *handle;
> + const char *name;
> + const char *feature;
> +} qemu_plugin_reg_descriptor;
> +
> +/**
> + * qemu_plugin_get_registers() - return register list for current vCPU
> + *
> + * Returns a GArray of qemu_plugin_reg_descriptor or NULL. Caller
> + * frees the array (but not the const strings).
> + *
> + * Should be used from a qemu_plugin_register_vcpu_init_cb() callback
> + * after the vCPU is initialised, i.e. in the vCPU context.
> + */
> +GArray *qemu_plugin_get_registers(void);
> +
> +/**
> + * qemu_plugin_read_register() - read register for current vCPU
> + *
> + * @handle: a @qemu_plugin_reg_handle handle
> + * @buf: A GByteArray for the data owned by the plugin
> + *
> + * This function is only available in a context that register read access is
> + * explicitly requested via the QEMU_PLUGIN_CB_R_REGS flag.
> + *
> + * Returns the size of the read register. The content of @buf is in target byte
> + * order. On failure returns -1
> + */
> +int qemu_plugin_read_register(struct qemu_plugin_register *handle,
> + GByteArray *buf);
> +
> +
> #endif /* QEMU_QEMU_PLUGIN_H */
> diff --git a/plugins/api.c b/plugins/api.c
> index 54df72c1c00..483f04e85e4 100644
> --- a/plugins/api.c
> +++ b/plugins/api.c
> @@ -8,6 +8,7 @@
> *
> * qemu_plugin_tb
> * qemu_plugin_insn
> + * qemu_plugin_register
> *
> * Which can then be passed back into the API to do additional things.
> * As such all the public functions in here are exported in
> @@ -35,10 +36,12 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/main-loop.h"
> #include "qemu/plugin.h"
> #include "qemu/log.h"
> #include "tcg/tcg.h"
> #include "exec/exec-all.h"
> +#include "exec/gdbstub.h"
> #include "exec/ram_addr.h"
> #include "disas/disas.h"
> #include "plugin.h"
> @@ -410,3 +413,107 @@ uint64_t qemu_plugin_entry_code(void)
> #endif
> return entry;
> }
> +
> +/*
> + * Register handles
> + *
> + * The plugin infrastructure keeps hold of these internal data
> + * structures which are presented to plugins as opaque handles. They
> + * are global to the system and therefor additions to the hash table
> + * must be protected by the @reg_handle_lock.
> + *
> + * In order to future proof for up-coming heterogeneous work we want
> + * different entries for each CPU type while sharing them in the
> + * common case of multiple cores of the same type.
> + */
> +
> +static QemuMutex reg_handle_lock;
> +
> +struct qemu_plugin_register {
> + const char *name;
> + int gdb_reg_num;
> +};
> +
> +static GHashTable *reg_handles; /* hash table of PluginReg */
> +
> +/* Generate a stable key - would xxhash be overkill? */
> +static gpointer cpu_plus_reg_to_key(CPUState *cs, int gdb_regnum)
> +{
> + uintptr_t key = (uintptr_t) cs->cc;
> + key ^= gdb_regnum;
> + return GUINT_TO_POINTER(key);
> +}
I have pointed out this is theoretically prone to collisions and unsafe.
> +
> +/*
> + * Create register handles.
> + *
> + * We need to create a handle for each register so the plugin
> + * infrastructure can call gdbstub to read a register. We also
> + * construct a result array with those handles and some ancillary data
> + * the plugin might find useful.
> + */
> +
> +static GArray *create_register_handles(CPUState *cs, GArray *gdbstub_regs)
> +{
> + GArray *find_data = g_array_new(true, true,
> + sizeof(qemu_plugin_reg_descriptor));
> +
> + WITH_QEMU_LOCK_GUARD(®_handle_lock) {
> +
> + if (!reg_handles) {
> + reg_handles = g_hash_table_new(g_direct_hash, g_direct_equal);
> + }
> +
> + for (int i = 0; i < gdbstub_regs->len; i++) {
> + GDBRegDesc *grd = &g_array_index(gdbstub_regs, GDBRegDesc, i);
> + gpointer key = cpu_plus_reg_to_key(cs, grd->gdb_reg);
> + struct qemu_plugin_register *val = g_hash_table_lookup(reg_handles,
> + key);
> +
> + /* skip "un-named" regs */
> + if (!grd->name) {
> + continue;
> + }
> +
> + /* Doesn't exist, create one */
> + if (!val) {
> + val = g_new0(struct qemu_plugin_register, 1);
> + val->gdb_reg_num = grd->gdb_reg;
> + val->name = g_intern_string(grd->name);
> +
> + g_hash_table_insert(reg_handles, key, val);
> + }
> +
> + /* Create a record for the plugin */
> + qemu_plugin_reg_descriptor desc = {
> + .handle = val,
> + .name = val->name,
> + .feature = g_intern_string(grd->feature_name)
> + };
> + g_array_append_val(find_data, desc);
> + }
> + }
> +
> + return find_data;
> +}
> +
> +GArray *qemu_plugin_get_registers(void)
> +{
> + g_assert(current_cpu);
> +
> + g_autoptr(GArray) regs = gdb_get_register_list(current_cpu);
> + return regs->len ? create_register_handles(current_cpu, regs) : NULL;
> +}
> +
> +int qemu_plugin_read_register(struct qemu_plugin_register *reg, GByteArray *buf)
> +{
> + g_assert(current_cpu);
> +
> + return gdb_read_register(current_cpu, buf, reg->gdb_reg_num);
> +}
> +
> +static void __attribute__((__constructor__)) qemu_api_init(void)
> +{
> + qemu_mutex_init(®_handle_lock);
> +
> +}
> diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols
> index adb67608598..27fe97239be 100644
> --- a/plugins/qemu-plugins.symbols
> +++ b/plugins/qemu-plugins.symbols
> @@ -3,6 +3,7 @@
> qemu_plugin_end_code;
> qemu_plugin_entry_code;
> qemu_plugin_get_hwaddr;
> + qemu_plugin_get_registers;
> qemu_plugin_hwaddr_device_name;
> qemu_plugin_hwaddr_is_io;
> qemu_plugin_hwaddr_phys_addr;
> @@ -19,6 +20,7 @@
> qemu_plugin_num_vcpus;
> qemu_plugin_outs;
> qemu_plugin_path_to_binary;
> + qemu_plugin_read_register;
> qemu_plugin_register_atexit_cb;
> qemu_plugin_register_flush_cb;
> qemu_plugin_register_vcpu_exit_cb;
next prev parent reply other threads:[~2024-02-17 8:02 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-16 16:30 [PATCH 00/23] maintainer updates for 9.0 pre-PR (tests, plugin register support) Alex Bennée
2024-02-16 16:30 ` [PATCH 01/23] tests/tcg: update licenses to GPLv2 as intended Alex Bennée
2024-02-16 16:30 ` [PATCH 02/23] target/arm: Use GDBFeature for dynamic XML Alex Bennée
2024-02-16 16:30 ` [PATCH 03/23] target/ppc: " Alex Bennée
2024-02-16 16:30 ` [PATCH 04/23] target/riscv: " Alex Bennée
2024-02-16 16:30 ` [PATCH 05/23] gdbstub: Use GDBFeature for gdb_register_coprocessor Alex Bennée
2024-02-16 16:30 ` [PATCH 06/23] gdbstub: Use GDBFeature for GDBRegisterState Alex Bennée
2024-02-16 16:30 ` [PATCH 07/23] gdbstub: Change gdb_get_reg_cb and gdb_set_reg_cb Alex Bennée
2024-02-16 16:30 ` [PATCH 08/23] gdbstub: Simplify XML lookup Alex Bennée
2024-02-16 16:30 ` [PATCH 09/23] gdbstub: Infer number of core registers from XML Alex Bennée
2024-02-16 16:30 ` [PATCH 10/23] hw/core/cpu: Remove gdb_get_dynamic_xml member Alex Bennée
2024-02-16 16:30 ` [PATCH 11/23] gdbstub: Add members to identify registers to GDBFeature Alex Bennée
2024-02-16 16:30 ` [PATCH 12/23] plugins: remove previous n_vcpus functions from API Alex Bennée
2024-02-16 16:30 ` [PATCH 13/23] plugins: add qemu_plugin_num_vcpus function Alex Bennée
2024-02-16 16:30 ` [PATCH 14/23] plugins: fix order of init/idle/resume callback Alex Bennée
2024-02-16 16:30 ` [PATCH 15/23] cpu: call plugin init hook asynchronously Alex Bennée
2024-02-16 16:30 ` [PATCH 16/23] plugins: Use different helpers when reading registers Alex Bennée
2024-02-16 16:30 ` [PATCH 17/23] gdbstub: expose api to find registers Alex Bennée
2024-02-16 16:30 ` [PATCH 18/23] plugins: add an API to read registers Alex Bennée
2024-02-17 8:01 ` Akihiko Odaki [this message]
2024-02-20 14:14 ` Alex Bennée
2024-02-21 4:45 ` Akihiko Odaki
2024-02-21 10:02 ` Alex Bennée
2024-02-21 10:11 ` Akihiko Odaki
2024-02-21 14:14 ` Alex Bennée
2024-02-22 6:37 ` Akihiko Odaki
2024-02-22 10:20 ` Alex Bennée
2024-02-22 13:22 ` Akihiko Odaki
2024-02-22 17:27 ` Alex Bennée
2024-02-23 10:58 ` Akihiko Odaki
2024-02-23 11:44 ` Alex Bennée
2024-02-23 16:24 ` Alex Bennée
2024-02-16 16:30 ` [PATCH 19/23] contrib/plugins: fix imatch Alex Bennée
2024-02-16 16:30 ` [PATCH 20/23] contrib/plugins: extend execlog to track register changes Alex Bennée
2024-02-17 11:36 ` Pierrick Bouvier
2024-02-16 16:30 ` [PATCH 21/23] docs/devel: lift example and plugin API sections up Alex Bennée
2024-02-16 16:30 ` [PATCH 22/23] docs/devel: document some plugin assumptions Alex Bennée
2024-02-16 16:30 ` [PATCH 23/23] docs/devel: plugins can trigger a tb flush Alex Bennée
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=c38a22b5-01e8-40f1-bfc4-4bba9bf7b516@daynix.com \
--to=akihiko.odaki@daynix.com \
--cc=alex.bennee@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=bcain@quicinc.com \
--cc=bin.meng@windriver.com \
--cc=clg@kaod.org \
--cc=crosa@redhat.com \
--cc=danielhb413@gmail.com \
--cc=david@redhat.com \
--cc=dbarboza@ventanamicro.com \
--cc=edgar.iglesias@gmail.com \
--cc=eduardo@habkost.net \
--cc=erdnaxe@crans.org \
--cc=gaosong@loongson.cn \
--cc=iii@linux.ibm.com \
--cc=jsnow@redhat.com \
--cc=laurent@vivier.eu \
--cc=liwei1518@gmail.com \
--cc=ma.mandourr@gmail.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mrolnik@gmail.com \
--cc=npiggin@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wangyanan55@huawei.com \
--cc=ysato@users.sourceforge.jp \
--cc=zhiwei_liu@linux.alibaba.com \
/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).