From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Alistair Francis" <Alistair.Francis@wdc.com>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Yanan Wang" <wangyanan55@huawei.com>,
qemu-s390x@nongnu.org,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
"Michael Rolnik" <mrolnik@gmail.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Laurent Vivier" <lvivier@redhat.com>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>,
"Laurent Vivier" <laurent@vivier.eu>,
"Thomas Huth" <thuth@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Brad Smith" <brad@comstyle.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Brian Cain" <bcain@quicinc.com>,
"Cleber Rosa" <crosa@redhat.com>, "John Snow" <jsnow@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Weiwei Li" <liwei1518@gmail.com>,
"Bin Meng" <bin.meng@windriver.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Beraldo Leal" <bleal@redhat.com>,
"Kyle Evans" <kevans@freebsd.org>,
"David Hildenbrand" <david@redhat.com>,
"Song Gao" <gaosong@loongson.cn>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Warner Losh" <imp@bsdimp.com>,
qemu-riscv@nongnu.org, "Ilya Leoshkevich" <iii@linux.ibm.com>
Subject: [PATCH 15/29] plugins: define qemu_plugin_u64
Date: Tue, 5 Mar 2024 12:09:51 +0000 [thread overview]
Message-ID: <20240305121005.3528075-16-alex.bennee@linaro.org> (raw)
In-Reply-To: <20240305121005.3528075-1-alex.bennee@linaro.org>
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Additionally to the scoreboard, we define a qemu_plugin_u64, which is a
simple struct holding a pointer to a scoreboard, and a given offset.
This allows to have a scoreboard containing structs, without having to
bring offset to operate on a specific field.
Since most of the plugins are simply collecting a sum of per-cpu values,
qemu_plugin_u64 directly support this operation as well.
All inline operations defined later will use a qemu_plugin_u64 as input.
New functions:
- qemu_plugin_u64_add
- qemu_plugin_u64_get
- qemu_plugin_u64_set
- qemu_plugin_u64_sum
New macros:
- qemu_plugin_scoreboard_u64
- qemu_plugin_scoreboard_u64_in_struct
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240304130036.124418-3-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
include/qemu/qemu-plugin.h | 52 ++++++++++++++++++++++++++++++++++++
plugins/api.c | 34 +++++++++++++++++++++++
plugins/qemu-plugins.symbols | 4 +++
3 files changed, 90 insertions(+)
diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h
index 31c468ddb2c..ebf9a645e15 100644
--- a/include/qemu/qemu-plugin.h
+++ b/include/qemu/qemu-plugin.h
@@ -225,6 +225,17 @@ struct qemu_plugin_insn;
/** struct qemu_plugin_scoreboard - Opaque handle for a scoreboard */
struct qemu_plugin_scoreboard;
+/**
+ * typedef qemu_plugin_u64 - uint64_t member of an entry in a scoreboard
+ *
+ * This field allows to access a specific uint64_t member in one given entry,
+ * located at a specified offset. Inline operations expect this as entry.
+ */
+typedef struct {
+ struct qemu_plugin_scoreboard *score;
+ size_t offset;
+} qemu_plugin_u64;
+
/**
* enum qemu_plugin_cb_flags - type of callback
*
@@ -784,4 +795,45 @@ QEMU_PLUGIN_API
void *qemu_plugin_scoreboard_find(struct qemu_plugin_scoreboard *score,
unsigned int vcpu_index);
+/* Macros to define a qemu_plugin_u64 */
+#define qemu_plugin_scoreboard_u64(score) \
+ (qemu_plugin_u64) {score, 0}
+#define qemu_plugin_scoreboard_u64_in_struct(score, type, member) \
+ (qemu_plugin_u64) {score, offsetof(type, member)}
+
+/**
+ * qemu_plugin_u64_add() - add a value to a qemu_plugin_u64 for a given vcpu
+ * @entry: entry to query
+ * @vcpu_index: entry index
+ * @added: value to add
+ */
+QEMU_PLUGIN_API
+void qemu_plugin_u64_add(qemu_plugin_u64 entry, unsigned int vcpu_index,
+ uint64_t added);
+
+/**
+ * qemu_plugin_u64_get() - get value of a qemu_plugin_u64 for a given vcpu
+ * @entry: entry to query
+ * @vcpu_index: entry index
+ */
+QEMU_PLUGIN_API
+uint64_t qemu_plugin_u64_get(qemu_plugin_u64 entry, unsigned int vcpu_index);
+
+/**
+ * qemu_plugin_u64_set() - set value of a qemu_plugin_u64 for a given vcpu
+ * @entry: entry to query
+ * @vcpu_index: entry index
+ * @val: new value
+ */
+QEMU_PLUGIN_API
+void qemu_plugin_u64_set(qemu_plugin_u64 entry, unsigned int vcpu_index,
+ uint64_t val);
+
+/**
+ * qemu_plugin_u64_sum() - return sum of all vcpu entries in a scoreboard
+ * @entry: entry to sum
+ */
+QEMU_PLUGIN_API
+uint64_t qemu_plugin_u64_sum(qemu_plugin_u64 entry);
+
#endif /* QEMU_QEMU_PLUGIN_H */
diff --git a/plugins/api.c b/plugins/api.c
index 76b2e652b9c..8910cbb2c46 100644
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -484,3 +484,37 @@ void *qemu_plugin_scoreboard_find(struct qemu_plugin_scoreboard *score,
char *base_ptr = score->data->data;
return base_ptr + vcpu_index * g_array_get_element_size(score->data);
}
+
+static uint64_t *plugin_u64_address(qemu_plugin_u64 entry,
+ unsigned int vcpu_index)
+{
+ char *ptr = qemu_plugin_scoreboard_find(entry.score, vcpu_index);
+ return (uint64_t *)(ptr + entry.offset);
+}
+
+void qemu_plugin_u64_add(qemu_plugin_u64 entry, unsigned int vcpu_index,
+ uint64_t added)
+{
+ *plugin_u64_address(entry, vcpu_index) += added;
+}
+
+uint64_t qemu_plugin_u64_get(qemu_plugin_u64 entry,
+ unsigned int vcpu_index)
+{
+ return *plugin_u64_address(entry, vcpu_index);
+}
+
+void qemu_plugin_u64_set(qemu_plugin_u64 entry, unsigned int vcpu_index,
+ uint64_t val)
+{
+ *plugin_u64_address(entry, vcpu_index) = val;
+}
+
+uint64_t qemu_plugin_u64_sum(qemu_plugin_u64 entry)
+{
+ uint64_t total = 0;
+ for (int i = 0, n = qemu_plugin_num_vcpus(); i < n; ++i) {
+ total += qemu_plugin_u64_get(entry, i);
+ }
+ return total;
+}
diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols
index 3f93e7d6b13..6204453d0fd 100644
--- a/plugins/qemu-plugins.symbols
+++ b/plugins/qemu-plugins.symbols
@@ -44,6 +44,10 @@
qemu_plugin_tb_get_insn;
qemu_plugin_tb_n_insns;
qemu_plugin_tb_vaddr;
+ qemu_plugin_u64_add;
+ qemu_plugin_u64_get;
+ qemu_plugin_u64_set;
+ qemu_plugin_u64_sum;
qemu_plugin_uninstall;
qemu_plugin_vcpu_for_each;
};
--
2.39.2
next prev parent reply other threads:[~2024-03-05 12:18 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 12:09 [PATCH 00/29] maintainer/next for 9.0 (testing, gdbstub, plugins, disas) Alex Bennée
2024-03-05 12:09 ` [PATCH 01/29] tests: bump QOS_PATH_MAX_ELEMENT_SIZE again Alex Bennée
2024-03-05 12:09 ` [PATCH 02/29] gdbstub: Support disablement in a multi-threaded process Alex Bennée
2024-03-05 12:09 ` [PATCH 03/29] {linux,bsd}-user: Introduce get_task_state() Alex Bennée
2024-03-05 12:09 ` [PATCH 04/29] {linux,bsd}-user: Update ts_tid after fork() Alex Bennée
2024-03-05 20:44 ` Richard Henderson
2024-03-05 12:09 ` [PATCH 05/29] gdbstub: Introduce gdbserver_fork_start() Alex Bennée
2024-03-05 12:09 ` [PATCH 06/29] {linux,bsd}-user: Pass pid to fork_end() Alex Bennée
2024-03-05 12:09 ` [PATCH 07/29] {linux,bsd}-user: Pass pid to gdbserver_fork() Alex Bennée
2024-03-05 12:09 ` [PATCH 08/29] gdbstub: Call gdbserver_fork() both in parent and in child Alex Bennée
2024-03-05 12:09 ` [PATCH 09/29] gdbstub: Introduce gdb_handle_query_supported_user() Alex Bennée
2024-03-05 12:09 ` [PATCH 10/29] gdbstub: Introduce gdb_handle_set_thread_user() Alex Bennée
2024-03-05 12:09 ` [PATCH 11/29] gdbstub: Introduce gdb_handle_detach_user() Alex Bennée
2024-03-05 12:09 ` [PATCH 12/29] gdbstub: Implement follow-fork-mode child Alex Bennée
2024-03-05 12:09 ` [PATCH 13/29] tests/tcg: Add two follow-fork-mode tests Alex Bennée
2024-03-05 12:09 ` [PATCH 14/29] plugins: scoreboard API Alex Bennée
2024-03-05 12:09 ` Alex Bennée [this message]
2024-03-05 12:09 ` [PATCH 16/29] plugins: implement inline operation relative to cpu_index Alex Bennée
2024-03-05 12:09 ` [PATCH 17/29] plugins: add inline operation per vcpu Alex Bennée
2024-03-05 12:09 ` [PATCH 18/29] tests/plugin: add test plugin for inline operations Alex Bennée
2024-03-05 12:09 ` [PATCH 19/29] tests/plugin/mem: migrate to new per_vcpu API Alex Bennée
2024-03-05 12:09 ` [PATCH 20/29] tests/plugin/insn: " Alex Bennée
2024-03-05 12:09 ` [PATCH 21/29] tests/plugin/bb: " Alex Bennée
2024-03-05 12:09 ` [PATCH 22/29] contrib/plugins/hotblocks: " Alex Bennée
2024-03-05 12:09 ` [PATCH 23/29] contrib/plugins/howvec: " Alex Bennée
2024-03-05 12:10 ` [PATCH 24/29] plugins: remove non per_vcpu inline operation from API Alex Bennée
2024-03-05 12:10 ` [PATCH 25/29] plugins: cleanup codepath for previous inline operation Alex Bennée
2024-03-05 12:10 ` [PATCH 26/29] disas: introduce show_opcodes Alex Bennée
2024-03-05 20:46 ` Richard Henderson
2024-03-05 12:10 ` [PATCH 27/29] disas/hppa: honour show_opcodes Alex Bennée
2024-03-05 20:46 ` Richard Henderson
2024-03-05 12:10 ` [PATCH 28/29] target/loongarch: honour show_opcodes when disassembling Alex Bennée
2024-03-05 20:47 ` Richard Henderson
2024-03-05 12:10 ` [PATCH 29/29] target/riscv: " Alex Bennée
2024-03-05 20:48 ` Richard Henderson
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=20240305121005.3528075-16-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=Alistair.Francis@wdc.com \
--cc=bcain@quicinc.com \
--cc=bin.meng@windriver.com \
--cc=bleal@redhat.com \
--cc=brad@comstyle.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=imp@bsdimp.com \
--cc=jsnow@redhat.com \
--cc=kevans@freebsd.org \
--cc=laurent@vivier.eu \
--cc=liwei1518@gmail.com \
--cc=lvivier@redhat.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=riku.voipio@iki.fi \
--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;
as well as URLs for NNTP newsgroup(s).