{"id":1882066,"url":"http://patchwork.ozlabs.org/api/patches/1882066/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20240103173349.398526-37-alex.bennee@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20240103173349.398526-37-alex.bennee@linaro.org>","list_archive_url":null,"date":"2024-01-03T17:33:42","name":"[v2,36/43] plugins: Use different helpers when reading registers","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"13c90b3b36b1898b8d690a2397746ebcda431034","submitter":{"id":39532,"url":"http://patchwork.ozlabs.org/api/people/39532/?format=json","name":"Alex Bennée","email":"alex.bennee@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20240103173349.398526-37-alex.bennee@linaro.org/mbox/","series":[{"id":388742,"url":"http://patchwork.ozlabs.org/api/series/388742/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=388742","date":"2024-01-03T17:33:08","name":"testing and plugin updates for 9.0 (pre-PR)","version":2,"mbox":"http://patchwork.ozlabs.org/series/388742/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1882066/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1882066/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=JqUOyFxL;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4T4xjp4lf0z23yd\n\tfor ; Thu, 4 Jan 2024 04:37:02 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1rL59J-0005Sy-1q; Wed, 03 Jan 2024 12:35:25 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1rL58g-0004FI-2p\n for qemu-devel@nongnu.org; Wed, 03 Jan 2024 12:34:48 -0500","from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1rL586-0002aB-1d\n for qemu-devel@nongnu.org; Wed, 03 Jan 2024 12:34:42 -0500","by mail-wm1-x32d.google.com with SMTP id\n 5b1f17b1804b1-40d560818b8so79336595e9.1\n for ; Wed, 03 Jan 2024 09:34:09 -0800 (PST)","from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id\n k39-20020a05600c1ca700b0040d8af75e19sm2948860wms.24.2024.01.03.09.33.59\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 03 Jan 2024 09:34:03 -0800 (PST)","from draig.lan (localhost [IPv6:::1])\n by draig.lan (Postfix) with ESMTP id 06C1B5F9D2;\n Wed, 3 Jan 2024 17:33:53 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1704303248; x=1704908048; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=yeLMVf2eHHsXh0O15q4pkBIw3KoK3wQ6PmZ1CrbEex8=;\n b=JqUOyFxL7rDpc/7X3JA7lmsJHTScg8veFFmTK/Ziqllmq9qOVy6Ahw8yqSrmNMdriQ\n BkFBJwbcJtNZR5NRx3QhML6fdPY/kPSI1z7vNTP3Cod7mzC3OcJGF1FPN7ltMpjJ2gzv\n SLH7HKaDFIJA5Aj2+Z9KMmjNvUNbLOZV382tWYeXx86sy9O6fxuNoWTORjpfiwJvEZbj\n fSoOLY4rwMBpAO3z6kHollATZdOAmWosoqp0XWlHHs+EMtWKxUtmyGXLLj6PQYtUb3R2\n AFByACCtqNm3GaqWvoLBUi8dIysHlKbsMCB1D9PLCrnPm9LDg45xi6ZaTKrEwk6Q0JfM\n dOJw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1704303248; x=1704908048;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=yeLMVf2eHHsXh0O15q4pkBIw3KoK3wQ6PmZ1CrbEex8=;\n b=J8pJkkO8i/uRNW6zykSxV8suTcgh9wG8z7zkLVI8kNhrJR0eSl78e2OikfPQ/h8IDI\n UEfq/C21X9UomAd8XyZA4cnF+XQU+5hpcZK8GrDFKaVh8k4+WXyPEgHnfIQpcdYHuKPM\n l/hCYn0TN79e4ofbjqipIIGdzSxaL33oLns0eklr2XrrE7PY1n898+47VNJy9PoO2RtP\n +AloDc0oO6xtTl3qCDs8xiGoeYb13B4ZD4ltJBOBM9wVG2qWueG8udGrBYWjbwSDUkm3\n EJ94rZv6VUTa8LqxpO8R6wPT3TbOJTlzZbkeR7EqT0P7+vjFmAmIbP81m2KqR81gh2y2\n uLxg==","X-Gm-Message-State":"AOJu0YzENHa+X9clH6xFYLhUYuxERgUx0ep3hRj3UFVfg7yMyEqG0IEn\n x30RjYqI4TTX/qwnUGhBnVKV72JsBjRsjw==","X-Google-Smtp-Source":"\n AGHT+IFyai4Oz9QJseCnlyqpWeqvg34E978y7oogZCjDWncnuKw5cPGMk2yNAsv5VqWOMwukJlNOZQ==","X-Received":"by 2002:a05:600c:ac6:b0:40c:2c6d:a810 with SMTP id\n c6-20020a05600c0ac600b0040c2c6da810mr10276642wmr.32.1704303248659;\n Wed, 03 Jan 2024 09:34:08 -0800 (PST)","From":"=?utf-8?q?Alex_Benn=C3=A9e?= ","To":"qemu-devel@nongnu.org","Cc":"qemu-s390x@nongnu.org, qemu-ppc@nongnu.org,\n Richard Henderson ,\n Song Gao ,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n David Hildenbrand , Aurelien Jarno ,\n Yoshinori Sato ,\n Yanan Wang , Bin Meng ,\n Laurent Vivier , Michael Rolnik ,\n Alexandre Iooss , David Woodhouse ,\n Laurent Vivier , Paolo Bonzini ,\n Brian Cain ,\n Daniel Henrique Barboza ,\n Beraldo Leal , Paul Durrant ,\n Mahmoud Mandour , Thomas Huth ,\n Liu Zhiwei , Cleber Rosa ,\n kvm@vger.kernel.org, Peter Maydell ,\n Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?=\n\t=?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org,\n Weiwei Li ,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n John Snow ,\n Daniel Henrique Barboza ,\n Nicholas Piggin , Palmer Dabbelt ,\n Marcel Apfelbaum ,\n Ilya Leoshkevich ,\n =?utf-8?q?C=C3=A9dric_Le_Goater?= ,\n \"Edgar E. Iglesias\" ,\n Eduardo Habkost ,\n Pierrick Bouvier , qemu-riscv@nongnu.org,\n Alistair Francis ,\n Akihiko Odaki ","Subject":"[PATCH v2 36/43] plugins: Use different helpers when reading\n registers","Date":"Wed, 3 Jan 2024 17:33:42 +0000","Message-Id":"<20240103173349.398526-37-alex.bennee@linaro.org>","X-Mailer":"git-send-email 2.39.2","In-Reply-To":"<20240103173349.398526-1-alex.bennee@linaro.org>","References":"<20240103173349.398526-1-alex.bennee@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::32d;\n envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,\n T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Akihiko Odaki \n\nThis avoids optimizations incompatible when reading registers.\n\nSigned-off-by: Akihiko Odaki \nMessage-Id: <20231213-gdb-v17-12-777047380591@daynix.com>\nSigned-off-by: Alex Bennée \n---\n accel/tcg/plugin-helpers.h | 3 ++-\n include/qemu/plugin.h | 1 +\n accel/tcg/plugin-gen.c | 43 ++++++++++++++++++++++++++++++++++----\n plugins/api.c | 12 +++++++++--\n 4 files changed, 52 insertions(+), 7 deletions(-)","diff":"diff --git a/accel/tcg/plugin-helpers.h b/accel/tcg/plugin-helpers.h\nindex 8e685e06545..11796436f35 100644\n--- a/accel/tcg/plugin-helpers.h\n+++ b/accel/tcg/plugin-helpers.h\n@@ -1,4 +1,5 @@\n #ifdef CONFIG_PLUGIN\n-DEF_HELPER_FLAGS_2(plugin_vcpu_udata_cb, TCG_CALL_NO_RWG | TCG_CALL_PLUGIN, void, i32, ptr)\n+DEF_HELPER_FLAGS_2(plugin_vcpu_udata_cb_no_wg, TCG_CALL_NO_WG | TCG_CALL_PLUGIN, void, i32, ptr)\n+DEF_HELPER_FLAGS_2(plugin_vcpu_udata_cb_no_rwg, TCG_CALL_NO_RWG | TCG_CALL_PLUGIN, void, i32, ptr)\n DEF_HELPER_FLAGS_4(plugin_vcpu_mem_cb, TCG_CALL_NO_RWG | TCG_CALL_PLUGIN, void, i32, i32, i64, ptr)\n #endif\ndiff --git a/include/qemu/plugin.h b/include/qemu/plugin.h\nindex 7fdc3a4849f..b0c5ac68293 100644\n--- a/include/qemu/plugin.h\n+++ b/include/qemu/plugin.h\n@@ -73,6 +73,7 @@ enum plugin_dyn_cb_type {\n \n enum plugin_dyn_cb_subtype {\n PLUGIN_CB_REGULAR,\n+ PLUGIN_CB_REGULAR_R,\n PLUGIN_CB_INLINE,\n PLUGIN_N_CB_SUBTYPES,\n };\ndiff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c\nindex 78b331b2510..b37ce7683e6 100644\n--- a/accel/tcg/plugin-gen.c\n+++ b/accel/tcg/plugin-gen.c\n@@ -79,6 +79,7 @@ enum plugin_gen_from {\n \n enum plugin_gen_cb {\n PLUGIN_GEN_CB_UDATA,\n+ PLUGIN_GEN_CB_UDATA_R,\n PLUGIN_GEN_CB_INLINE,\n PLUGIN_GEN_CB_MEM,\n PLUGIN_GEN_ENABLE_MEM_HELPER,\n@@ -90,7 +91,10 @@ enum plugin_gen_cb {\n * These helpers are stubs that get dynamically switched out for calls\n * direct to the plugin if they are subscribed to.\n */\n-void HELPER(plugin_vcpu_udata_cb)(uint32_t cpu_index, void *udata)\n+void HELPER(plugin_vcpu_udata_cb_no_wg)(uint32_t cpu_index, void *udata)\n+{ }\n+\n+void HELPER(plugin_vcpu_udata_cb_no_rwg)(uint32_t cpu_index, void *udata)\n { }\n \n void HELPER(plugin_vcpu_mem_cb)(unsigned int vcpu_index,\n@@ -98,7 +102,7 @@ void HELPER(plugin_vcpu_mem_cb)(unsigned int vcpu_index,\n void *userdata)\n { }\n \n-static void gen_empty_udata_cb(void)\n+static void gen_empty_udata_cb(void (*gen_helper)(TCGv_i32, TCGv_ptr))\n {\n TCGv_i32 cpu_index = tcg_temp_ebb_new_i32();\n TCGv_ptr udata = tcg_temp_ebb_new_ptr();\n@@ -106,12 +110,22 @@ static void gen_empty_udata_cb(void)\n tcg_gen_movi_ptr(udata, 0);\n tcg_gen_ld_i32(cpu_index, tcg_env,\n -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index));\n- gen_helper_plugin_vcpu_udata_cb(cpu_index, udata);\n+ gen_helper(cpu_index, udata);\n \n tcg_temp_free_ptr(udata);\n tcg_temp_free_i32(cpu_index);\n }\n \n+static void gen_empty_udata_cb_no_wg(void)\n+{\n+ gen_empty_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_wg);\n+}\n+\n+static void gen_empty_udata_cb_no_rwg(void)\n+{\n+ gen_empty_udata_cb(gen_helper_plugin_vcpu_udata_cb_no_rwg);\n+}\n+\n /*\n * For now we only support addi_i64.\n * When we support more ops, we can generate one empty inline cb for each.\n@@ -192,7 +206,8 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from)\n gen_empty_mem_helper);\n /* fall through */\n case PLUGIN_GEN_FROM_TB:\n- gen_wrapped(from, PLUGIN_GEN_CB_UDATA, gen_empty_udata_cb);\n+ gen_wrapped(from, PLUGIN_GEN_CB_UDATA, gen_empty_udata_cb_no_rwg);\n+ gen_wrapped(from, PLUGIN_GEN_CB_UDATA_R, gen_empty_udata_cb_no_wg);\n gen_wrapped(from, PLUGIN_GEN_CB_INLINE, gen_empty_inline_cb);\n break;\n default:\n@@ -588,6 +603,12 @@ static void plugin_gen_tb_udata(const struct qemu_plugin_tb *ptb,\n inject_udata_cb(ptb->cbs[PLUGIN_CB_REGULAR], begin_op);\n }\n \n+static void plugin_gen_tb_udata_r(const struct qemu_plugin_tb *ptb,\n+ TCGOp *begin_op)\n+{\n+ inject_udata_cb(ptb->cbs[PLUGIN_CB_REGULAR_R], begin_op);\n+}\n+\n static void plugin_gen_tb_inline(const struct qemu_plugin_tb *ptb,\n TCGOp *begin_op)\n {\n@@ -602,6 +623,14 @@ static void plugin_gen_insn_udata(const struct qemu_plugin_tb *ptb,\n inject_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR], begin_op);\n }\n \n+static void plugin_gen_insn_udata_r(const struct qemu_plugin_tb *ptb,\n+ TCGOp *begin_op, int insn_idx)\n+{\n+ struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx);\n+\n+ inject_udata_cb(insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR_R], begin_op);\n+}\n+\n static void plugin_gen_insn_inline(const struct qemu_plugin_tb *ptb,\n TCGOp *begin_op, int insn_idx)\n {\n@@ -721,6 +750,9 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb)\n case PLUGIN_GEN_CB_UDATA:\n plugin_gen_tb_udata(plugin_tb, op);\n break;\n+ case PLUGIN_GEN_CB_UDATA_R:\n+ plugin_gen_tb_udata_r(plugin_tb, op);\n+ break;\n case PLUGIN_GEN_CB_INLINE:\n plugin_gen_tb_inline(plugin_tb, op);\n break;\n@@ -737,6 +769,9 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb)\n case PLUGIN_GEN_CB_UDATA:\n plugin_gen_insn_udata(plugin_tb, op, insn_idx);\n break;\n+ case PLUGIN_GEN_CB_UDATA_R:\n+ plugin_gen_insn_udata_r(plugin_tb, op, insn_idx);\n+ break;\n case PLUGIN_GEN_CB_INLINE:\n plugin_gen_insn_inline(plugin_tb, op, insn_idx);\n break;\ndiff --git a/plugins/api.c b/plugins/api.c\nindex 5521b0ad36c..ac39cdea0b3 100644\n--- a/plugins/api.c\n+++ b/plugins/api.c\n@@ -89,7 +89,11 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb,\n void *udata)\n {\n if (!tb->mem_only) {\n- plugin_register_dyn_cb__udata(&tb->cbs[PLUGIN_CB_REGULAR],\n+ int index = flags == QEMU_PLUGIN_CB_R_REGS ||\n+ flags == QEMU_PLUGIN_CB_RW_REGS ?\n+ PLUGIN_CB_REGULAR_R : PLUGIN_CB_REGULAR;\n+\n+ plugin_register_dyn_cb__udata(&tb->cbs[index],\n cb, flags, udata);\n }\n }\n@@ -109,7 +113,11 @@ void qemu_plugin_register_vcpu_insn_exec_cb(struct qemu_plugin_insn *insn,\n void *udata)\n {\n if (!insn->mem_only) {\n- plugin_register_dyn_cb__udata(&insn->cbs[PLUGIN_CB_INSN][PLUGIN_CB_REGULAR],\n+ int index = flags == QEMU_PLUGIN_CB_R_REGS ||\n+ flags == QEMU_PLUGIN_CB_RW_REGS ?\n+ PLUGIN_CB_REGULAR_R : PLUGIN_CB_REGULAR;\n+\n+ plugin_register_dyn_cb__udata(&insn->cbs[PLUGIN_CB_INSN][index],\n cb, flags, udata);\n }\n }\n","prefixes":["v2","36/43"]}