[{"id":3243844,"web_url":"http://patchwork.ozlabs.org/comment/3243844/","msgid":"","list_archive_url":null,"date":"2024-01-09T14:24:07","subject":"Re: [PATCH v2 36/43] plugins: Use different helpers when reading\n registers","submitter":{"id":85798,"url":"http://patchwork.ozlabs.org/api/people/85798/","name":"Pierrick Bouvier","email":"pierrick.bouvier@linaro.org"},"content":"Reviewed-by: Pierrick Bouvier \n\nOn 1/3/24 21:33, Alex Bennée wrote:\n> From: Akihiko Odaki \n> \n> This avoids optimizations incompatible when reading registers.\n> \n> Signed-off-by: Akihiko Odaki \n> Message-Id: <20231213-gdb-v17-12-777047380591@daynix.com>\n> Signed-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(-)\n> \n> diff --git a/accel/tcg/plugin-helpers.h b/accel/tcg/plugin-helpers.h\n> index 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\n> diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h\n> index 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> };\n> diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c\n> index 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;\n> diff --git a/plugins/api.c b/plugins/api.c\n> index 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> }","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=INUWArXq;\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 4T8Y9d0BYkz1yP7\n\tfor ; Wed, 10 Jan 2024 01:25:09 +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 1rND1y-0005ZN-R0; Tue, 09 Jan 2024 09:24:40 -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 1rND1r-0005SI-6q\n for qemu-devel@nongnu.org; Tue, 09 Jan 2024 09:24:32 -0500","from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a])\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 1rND1n-0008JH-1J\n for qemu-devel@nongnu.org; Tue, 09 Jan 2024 09:24:30 -0500","by mail-wm1-x32a.google.com with SMTP id\n 5b1f17b1804b1-40e461c1f5cso24750245e9.3\n for ; Tue, 09 Jan 2024 06:24:24 -0800 (PST)","from [192.168.1.24] ([102.35.208.160])\n by smtp.gmail.com with ESMTPSA id\n ay26-20020a05600c1e1a00b0040e53f24ceasm7614wmb.16.2024.01.09.06.24.12\n (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n Tue, 09 Jan 2024 06:24:22 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1704810263; x=1705415063; darn=nongnu.org;\n h=content-transfer-encoding:in-reply-to:from:references:cc:to\n :content-language:subject:user-agent:mime-version:date:message-id\n :from:to:cc:subject:date:message-id:reply-to;\n bh=7TaTwDNJKCApijCrofUkZrcv+VK9ZM/YluE5dtA8j8M=;\n b=INUWArXqXN5aDbtrWsv+JVZF7sJj/5eWb4t+e3rihzEzpqSqKfjbxHoBFpN12m35uM\n 6g+7FlEgnQZrWUeTDWeAS971kXHGzUFOJOpjaomRlulrmTHFxRl5PfTGsGEDoH2MYA0S\n NszNlRT5Z6gr+/wV3//4ofhTGNmYM9SUXDzfxEDvyCewVlY4V7LYDJHebQMlveWTrCWt\n Pg4eCwRCURQW0EN4kG5iK3BwCZXOewgziIVQlI+5yxNKr7QsWc7XrwarLaBmcU6gjoPi\n v3V/0gWUKcoxdwpUcKV6EV7So2dPeTBpJt7kVIJz/uzMwyvPcy18m2Yb6sAQRmauZPY1\n wRnA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1704810263; x=1705415063;\n h=content-transfer-encoding:in-reply-to:from:references:cc:to\n :content-language:subject:user-agent:mime-version:date:message-id\n :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;\n bh=7TaTwDNJKCApijCrofUkZrcv+VK9ZM/YluE5dtA8j8M=;\n b=ZO4NWMU5Rbv/9rlBbAGFNkNC4kapIFQ0nTkya2fNMkoW417BpUkSjfXKgqK6zNbtLX\n lG3DmG2YC6qao03cRqadxOCHTN/g2/6G+mOuN0sCb/C9axEM/xOqivBZsXMCzZ6XsdnQ\n RmaYMjEkgp99ldPXdVcQaCBaoCO/NqlNFXvuFB2xpwmsJauXEQl/ZPw31OZJfytcYdR7\n v3pRxs89pGhRs2oxXoFf/ZsEKqTnqtzgtLIyqAvm1fc3C7gzSf4+PD2vP8cgWK4uIpm9\n TPJuvvKBE3RZzAdL4KAQnqCWb6Wsd93vqQ+7VCpzkPPuhDxXdqDNIkN45nDn6wElPWar\n p3iw==","X-Gm-Message-State":"AOJu0Ywrm1OPrvyfpDLdB8VD6wFN96sRHg50tQzcRIETEEKNuDNkYdIJ\n /Si3aSkgqCveTlyH/pAoaIfhTHc70Bzenw==","X-Google-Smtp-Source":"\n AGHT+IFBiWbbDS9xbrZz3ME3I+vcc+TfRmzAikG49gMGGqgDT673KWV87mP5tbIvB/CQl9/MctYIwQ==","X-Received":"by 2002:a7b:c041:0:b0:40d:7247:b01f with SMTP id\n u1-20020a7bc041000000b0040d7247b01fmr1871048wmc.98.1704810263508;\n Tue, 09 Jan 2024 06:24:23 -0800 (PST)","Message-ID":"","Date":"Tue, 9 Jan 2024 18:24:07 +0400","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH v2 36/43] plugins: Use different helpers when reading\n registers","Content-Language":"en-US","To":"=?utf-8?q?Alex_Benn=C3=A9e?= ,\n 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 , 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 , qemu-riscv@nongnu.org,\n Alistair Francis ,\n Akihiko Odaki ","References":"<20240103173349.398526-1-alex.bennee@linaro.org>\n <20240103173349.398526-37-alex.bennee@linaro.org>","From":"Pierrick Bouvier ","In-Reply-To":"<20240103173349.398526-37-alex.bennee@linaro.org>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"base64","Received-SPF":"pass client-ip=2a00:1450:4864:20::32a;\n envelope-from=pierrick.bouvier@linaro.org; helo=mail-wm1-x32a.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=ham 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"}}]