From: "Alex Bennée" <alex.bennee@linaro.org>
To: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Cc: qemu-devel@nongnu.org, qemu-s390x@nongnu.org,
qemu-ppc@nongnu.org,
"Richard Henderson" <richard.henderson@linaro.org>,
"Song Gao" <gaosong@loongson.cn>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Bin Meng" <bin.meng@windriver.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Michael Rolnik" <mrolnik@gmail.com>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"David Woodhouse" <dwmw2@infradead.org>,
"Laurent Vivier" <laurent@vivier.eu>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Brian Cain" <bcain@quicinc.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Beraldo Leal" <bleal@redhat.com>, "Paul Durrant" <paul@xen.org>,
"Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Thomas Huth" <thuth@redhat.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Cleber Rosa" <crosa@redhat.com>,
kvm@vger.kernel.org, "Peter Maydell" <peter.maydell@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
qemu-arm@nongnu.org, "Weiwei Li" <liwei1518@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"John Snow" <jsnow@redhat.com>,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
qemu-riscv@nongnu.org,
"Alistair Francis" <alistair.francis@wdc.com>,
"Akihiko Odaki" <akihiko.odaki@daynix.com>
Subject: Re: [PATCH v2 38/43] plugins: add an API to read registers
Date: Thu, 11 Jan 2024 12:34:31 +0000 [thread overview]
Message-ID: <87il40f3qg.fsf@draig.linaro.org> (raw)
In-Reply-To: <6c22ed26-7906-47a2-ab66-57d545ef59f5@linaro.org> (Pierrick Bouvier's message of "Tue, 9 Jan 2024 19:05:12 +0400")
Pierrick Bouvier <pierrick.bouvier@linaro.org> writes:
> On 1/3/24 21:33, 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>
>> Based-on: <20231025093128.33116-18-akihiko.odaki@daynix.com>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>> v3
>> - also g_intern_string the register name
>> - make get_registers documentation a bit less verbose
>> v2
>> - use new get whole list api, and expose upwards
>> vAJB:
>> The main difference to Akikio's version is hiding the gdb register
>> detail from the plugin for the reasons described above.
>> ---
>> include/qemu/qemu-plugin.h | 51 +++++++++++++++++-
>> plugins/api.c | 102 +++++++++++++++++++++++++++++++++++
>> plugins/qemu-plugins.symbols | 2 +
>> 3 files changed, 153 insertions(+), 2 deletions(-)
>> diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h
>> index 4daab6efd29..95380895f81 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>
>> @@ -227,8 +228,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,
>> @@ -708,4 +709,50 @@ 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 vCPU
>> + * @vcpu_index: vcpu to query
>> + *
>> + * 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.
>> + */
>> +GArray * qemu_plugin_get_registers(unsigned int vcpu_index);
>> +
>> +/**
>> + * qemu_plugin_read_register() - read register
>> + *
>> + * @vcpu: vcpu index
>> + * @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.
>> + *
>> + * 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(unsigned int vcpu,
>> + struct qemu_plugin_register *handle,
>> + GByteArray *buf);
>> +
>> +
>> #endif /* QEMU_QEMU_PLUGIN_H */
>> diff --git a/plugins/api.c b/plugins/api.c
>> index ac39cdea0b3..f8905325c43 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"
>> @@ -435,3 +438,102 @@ 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);
>> +}
>> +
>> +/*
>> + * 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);
>> +
>> + /* 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(unsigned int vcpu)
>> +{
>> + CPUState *cs = qemu_get_cpu(vcpu);
>> + if (cs) {
>> + g_autoptr(GArray) regs = gdb_get_register_list(cs);
>> + return regs->len ? create_register_handles(cs, regs) : NULL;
>> + } else {
>> + return NULL;
>> + }
>> +}
>
> Would that be useful to cache the returned value on plugin runtime
> side (per vcpu)? This way, a plugin could call
> qemu_plugin_get_registers as many time as it wants without having to
> pay for the creation of the array.
I suspect plugins would still want to work out what it needed ahead of
time and the cpu list should be static from vcpu_init onwards.
> In more, could we return a hashtable (indexed by regname string)
> instead of an array?
Hmm maybe. Arrays do benefit from being easy to cleanup and we would
still need an internal hash table to track stuff we don't want to expose
to the plugin.
We can always change it later if there is a compelling use case.
> With both changes, a plugin could simply perform a lookup in table
> returned by qemu_plugin_get_registers without having to keep anything
> on its side.
>
>> +
>> +int qemu_plugin_read_register(unsigned int vcpu, struct qemu_plugin_register *reg, GByteArray *buf)
>> +{
>> + CPUState *cs = qemu_get_cpu(vcpu);
>> + /* assert with debugging on? */
>> + return gdb_read_register(cs, 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 71f6c90549d..6963585c1ea 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;
>> @@ -20,6 +21,7 @@
>> qemu_plugin_n_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;
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
next prev parent reply other threads:[~2024-01-11 12:34 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-03 17:33 [PATCH v2 00/43] testing and plugin updates for 9.0 (pre-PR) Alex Bennée
2024-01-03 17:33 ` [PATCH v2 01/43] tests/avocado: Add a test for a little-endian microblaze machine Alex Bennée
2024-01-03 17:33 ` [PATCH v2 02/43] tests/avocado: use snapshot=on in kvm_xen_guest Alex Bennée
2024-01-11 13:30 ` Philippe Mathieu-Daudé
2024-01-03 17:33 ` [PATCH v2 03/43] gitlab: include microblazeel in testing Alex Bennée
2024-01-11 13:15 ` Thomas Huth
2024-01-03 17:33 ` [PATCH v2 04/43] chardev: use bool for fe_is_open Alex Bennée
2024-01-03 17:33 ` [PATCH v2 05/43] qtest: bump min meson timeout to 60 seconds Alex Bennée
2024-01-03 17:33 ` [PATCH v2 06/43] qtest: bump migration-test timeout to 8 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 07/43] qtest: bump qom-test timeout to 15 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 08/43] qtest: bump npcm7xx_pwn-test timeout to 5 minutes Alex Bennée
2024-01-03 17:40 ` Philippe Mathieu-Daudé
2024-01-08 10:50 ` Thomas Huth
2024-01-08 12:26 ` Ilya Leoshkevich
2024-01-03 17:33 ` [PATCH v2 09/43] qtest: bump test-hmp timeout to 4 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 10/43] qtest: bump pxe-test timeout to 10 minutes Alex Bennée
2024-01-03 17:43 ` Philippe Mathieu-Daudé
2024-01-04 9:31 ` Daniel P. Berrangé
2024-01-03 17:33 ` [PATCH v2 11/43] qtest: bump prom-env-test timeout to 6 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 12/43] qtest: bump boot-serial-test timeout to 3 minutes Alex Bennée
2024-01-12 15:13 ` Thomas Huth
2024-01-12 15:44 ` Daniel P. Berrangé
2024-01-12 16:46 ` Alex Bennée
2024-01-03 17:33 ` [PATCH v2 13/43] qtest: bump qos-test timeout to 2 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 14/43] qtest: bump aspeed_smc-test timeout to 6 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 15/43] qtest: bump bios-table-test timeout to 9 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 16/43] tests/qtest: Bump the device-introspect-test timeout to 12 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 17/43] tests/unit: Bump test-aio-multithread test timeout to 2 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 18/43] tests/unit: Bump test-crypto-block test timeout to 5 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 19/43] tests/fp: Bump fp-test-mulAdd test timeout to 3 minutes Alex Bennée
2024-01-03 17:33 ` [PATCH v2 20/43] mtest2make: stop disabling meson test timeouts Alex Bennée
2024-01-03 17:33 ` [PATCH v2 21/43] readthodocs: fully specify a build environment Alex Bennée
2024-01-03 17:33 ` [PATCH v2 22/43] hw/riscv: Use misa_mxl instead of misa_mxl_max Alex Bennée
2024-01-03 17:33 ` [PATCH v2 23/43] target/riscv: Remove misa_mxl validation Alex Bennée
2024-01-03 17:33 ` [PATCH v2 24/43] target/riscv: Move misa_mxl_max to class Alex Bennée
2024-01-11 23:28 ` Alistair Francis
2024-01-03 17:33 ` [PATCH v2 25/43] target/riscv: Validate misa_mxl_max only once Alex Bennée
2024-01-11 23:29 ` Alistair Francis
2024-01-03 17:33 ` [PATCH v2 26/43] target/arm: Use GDBFeature for dynamic XML Alex Bennée
2024-01-03 17:33 ` [PATCH v2 27/43] target/ppc: " Alex Bennée
2024-01-03 17:33 ` [PATCH v2 28/43] target/riscv: " Alex Bennée
2024-01-03 17:33 ` [PATCH v2 29/43] gdbstub: Use GDBFeature for gdb_register_coprocessor Alex Bennée
2024-01-03 17:33 ` [PATCH v2 30/43] gdbstub: Use GDBFeature for GDBRegisterState Alex Bennée
2024-01-03 17:50 ` Philippe Mathieu-Daudé
2024-01-03 17:33 ` [PATCH v2 31/43] gdbstub: Change gdb_get_reg_cb and gdb_set_reg_cb Alex Bennée
2024-01-03 17:33 ` [PATCH v2 32/43] gdbstub: Simplify XML lookup Alex Bennée
2024-01-03 17:33 ` [PATCH v2 33/43] gdbstub: Infer number of core registers from XML Alex Bennée
2024-01-03 17:33 ` [PATCH v2 34/43] hw/core/cpu: Remove gdb_get_dynamic_xml member Alex Bennée
2024-01-03 17:33 ` [PATCH v2 35/43] gdbstub: Add members to identify registers to GDBFeature Alex Bennée
2024-01-03 17:33 ` [PATCH v2 36/43] plugins: Use different helpers when reading registers Alex Bennée
2024-01-09 14:24 ` Pierrick Bouvier
2024-01-03 17:33 ` [PATCH v2 37/43] gdbstub: expose api to find registers Alex Bennée
2024-01-03 17:33 ` [PATCH v2 38/43] plugins: add an API to read registers Alex Bennée
2024-01-04 12:05 ` Akihiko Odaki
2024-01-04 12:22 ` Alex Bennée
2024-01-04 13:22 ` Akihiko Odaki
2024-01-09 15:05 ` Pierrick Bouvier
2024-01-11 12:34 ` Alex Bennée [this message]
2024-01-12 3:49 ` Pierrick Bouvier
2024-01-03 17:33 ` [PATCH v2 39/43] contrib/plugins: fix imatch Alex Bennée
2024-01-03 17:47 ` Philippe Mathieu-Daudé
2024-01-03 17:33 ` [PATCH v2 40/43] contrib/plugins: extend execlog to track register changes Alex Bennée
2024-01-05 10:40 ` Frédéric Pétrot
2024-01-11 12:24 ` Alex Bennée
2024-01-11 14:10 ` Frédéric Pétrot
2024-01-03 17:33 ` [PATCH v2 41/43] contrib/plugins: optimise the register value tracking Alex Bennée
2024-01-03 17:33 ` [PATCH v2 42/43] docs/devel: lift example and plugin API sections up Alex Bennée
2024-01-09 14:25 ` Pierrick Bouvier
2024-01-11 14:01 ` Philippe Mathieu-Daudé
2024-01-03 17:33 ` [PATCH v2 43/43] docs/devel: document some plugin assumptions Alex Bennée
2024-01-09 14:28 ` Pierrick Bouvier
2024-01-11 12:37 ` [PATCH v2 00/43] testing and plugin updates for 9.0 (pre-PR) 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=87il40f3qg.fsf@draig.linaro.org \
--to=alex.bennee@linaro.org \
--cc=akihiko.odaki@daynix.com \
--cc=alistair.francis@wdc.com \
--cc=aurelien@aurel32.net \
--cc=bcain@quicinc.com \
--cc=bin.meng@windriver.com \
--cc=bleal@redhat.com \
--cc=clg@kaod.org \
--cc=crosa@redhat.com \
--cc=danielhb413@gmail.com \
--cc=david@redhat.com \
--cc=dbarboza@ventanamicro.com \
--cc=dwmw2@infradead.org \
--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=kvm@vger.kernel.org \
--cc=laurent@vivier.eu \
--cc=liwei1518@gmail.com \
--cc=lvivier@redhat.com \
--cc=ma.mandourr@gmail.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mrolnik@gmail.com \
--cc=npiggin@gmail.com \
--cc=palmer@dabbelt.com \
--cc=paul@xen.org \
--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=wainersm@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