From nobody Fri Dec 19 14:44:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1747965922; cv=none; d=zohomail.com; s=zohoarc; b=m5MD3KJgkh96mIVu2FAr3VuKi7JwZyN8hLYWAEtqzoFP0GHyYEbTZqnpnGGMn+AHcC85sz/p384fM9lHdpJty4qonarWC0K7LsgytsAzHormfLqJHGkWi1L6NhIFjk+y4qzmtGNVO3AO8ffwb+NrGyRtQLvh0403SbTQ7ECOT6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747965922; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZaHbTkEBubNAQpkCtAP0YTzxiH/VFIPfImRnxNMGa9s=; b=C7kINYq5JZ1l/0Sr2YQXcPnDPwafcGNlBaqb8B3YtfI0kjMsutDuaNo/v2+QZZjlnS71Arzkwf+OCWK45Vfvali9b0+xCCkDzRcirh904xIwHFPejvG5xMqEgFWBoiIy18IR3qI2TwWozZHsDRcrUNLLlybQjoPrwOVl0Us2/VQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747965922322878.3385266299066; Thu, 22 May 2025 19:05:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uIHlU-0001GJ-Pu; Thu, 22 May 2025 22:04:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uIHlN-0001En-Km for qemu-devel@nongnu.org; Thu, 22 May 2025 22:03:57 -0400 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uIHlH-0007ju-Rm for qemu-devel@nongnu.org; Thu, 22 May 2025 22:03:57 -0400 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-7398d65476eso338452b3a.1 for ; Thu, 22 May 2025 19:03:49 -0700 (PDT) Received: from shemhazi.lan ([50.46.174.34]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a98a242asm11820818b3a.164.2025.05.22.19.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 19:03:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747965828; x=1748570628; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZaHbTkEBubNAQpkCtAP0YTzxiH/VFIPfImRnxNMGa9s=; b=HVxgQQKoGAhoTrnZ3w0eNyaIwZ/lWUNNyOLUjE32MHZJspbs4hFT03Zu8d+cUlNLGU xiG+BxpsLXyeL9eH0f67QnWoSkVAS1bx71zLy0a+1gXCp1SrdoBO85WPfP31HJGgh35/ Ed8GIRcFEY1OjgxST9Npx8y+jCF2a5p23NCeXzbg4eunJAkIWG/rbaKS/DYFRnhJz94r sq8ftD3FWlD9rzUq5D3Jhcw98ssAwuhb0cq3pkdAvzT8kTw6poKwF4mvlW/VEa2ztH49 uALumra73YacJCPeVtgMxCCdlCxDK/PfdQZe9oN3x7LC/N7FxuJFXKIC4NpaflCWjclW 1bMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747965828; x=1748570628; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZaHbTkEBubNAQpkCtAP0YTzxiH/VFIPfImRnxNMGa9s=; b=GZvqwG7g2aEfgAnasE2fFzEUtBZ6li24HrbaZzNkjDqhXsO+6QQtZwQHkxAoNWuGPJ 78uBDJnh7gfxnClEzLoRHPWRK550+ajtOTQtlla8LZ49B/tv1ok/K9lIgVRy3hwmuGo6 PAuadPwHfTtvD+6i350SFi4Bc7kHgR+GFHEmTDk1vskJN7nEstS2eRhLera725GhWkBc Vg95r89nkYekOnpFX0Nq6RKC/k2jeQPIgDln9rhKKw1jwLXyAzYLbzdu6nYsHFJeeve+ MB0f2kaAd2JuV0WLVpKVc3Ib6umV/ARZnxQKEGPWfwthdBhg+1GFcM1Hw4oBSipPeeX8 3lVg== X-Gm-Message-State: AOJu0Yz3okioXTg4S77d76w/9TytRIZTUSDPqR09tYsGslz3H/xQdQBH 96K34+p9tWC1bsCD3FQnq17KVB7CIEnV02Fzlz2TaOEQCGjs1eLaazNRyT6uk3r75BA= X-Gm-Gg: ASbGncvpqBes9dPTuJf9o5yDWSXVnpaG3kjm7Nb960gLyKv/jKoH605tktU8NMvldrJ jqLVGA2qnWCb3uLVKf3RbEdN9XrW+1jUxl+Pp5PcCblqI5S5xh+Atc45vGCXXREA9NHMzkpv360 fM1AIUhJ1j/gKq/ehSZ+yXTByHySijJC0yjwBax2pYJL74CDs0Fx4KIJKRn2QeO6LDtynd5oBXX ppRGkQ/qGa3dF/k3XuNHzqXIK8Y107Q8RkrhY60anb7fdGn+/ziCKkyIw50VzQVx3JjyZH2p9qv KxYSCzt0gric5V9MGBzQ+6t6dbionhgx8vEAuaZqvhJ8Ci91xgE= X-Google-Smtp-Source: AGHT+IFckDCU/JBVBOJqQ8MU8HM4V6/Q845XL4CqxkfAskItS6BYKiALZLIhwXlh3cVB/lEIEjNuMQ== X-Received: by 2002:a05:6a00:2e17:b0:742:a628:f53c with SMTP id d2e1a72fcca58-745ece8b604mr2202448b3a.10.1747965827857; Thu, 22 May 2025 19:03:47 -0700 (PDT) From: Rowan Hart To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Paolo Bonzini , Mahmoud Mandour , Alexandre Iooss , Eduardo Habkost , Rowan Hart Subject: [PATCH v4 3/9] plugins: Add enforcement of QEMU_PLUGIN_CB flags in register R/W callbacks Date: Thu, 22 May 2025 19:03:37 -0700 Message-ID: <20250523020344.1341179-4-rowanbhart@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250523020344.1341179-1-rowanbhart@gmail.com> References: <20250523020344.1341179-1-rowanbhart@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=rowanbhart@gmail.com; helo=mail-pf1-x42c.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1747965923282116600 Content-Type: text/plain; charset="utf-8" This patch adds functionality to enforce the requested QEMU_PLUGIN_CB_ flags level passed when registering a callback function using the plugins API. Each time a callback is about to be invoked, a thread-local variable will be updated with the level that callback requested. Then, called API functions (in particular, the register read and write API) will call qemu_plugin_get_cb_flags() to check the level is at least the level they require. Signed-off-by: Rowan Hart --- accel/tcg/plugin-gen.c | 27 +++++++++++++++++ include/qemu/plugin.h | 12 ++++++++ include/qemu/qemu-plugin.h | 3 -- plugins/api.c | 8 +++++ plugins/core.c | 60 ++++++++++++++++++++++++++++++++++---- 5 files changed, 101 insertions(+), 9 deletions(-) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index c1da753894..ceb2314bc1 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -117,10 +117,19 @@ static TCGv_i32 gen_cpu_index(void) static void gen_udata_cb(struct qemu_plugin_regular_cb *cb) { TCGv_i32 cpu_index =3D gen_cpu_index(); + enum qemu_plugin_cb_flags cb_flags =3D + tcg_call_to_qemu_plugin_cb_flags(cb->info->flags); + TCGv_i32 flags =3D tcg_constant_i32(cb_flags); + tcg_gen_call1(qemu_plugin_set_cb_flags, + qemu_plugin_get_set_cb_flags_helper_info(), NULL, + tcgv_i32_temp(flags)); tcg_gen_call2(cb->f.vcpu_udata, cb->info, NULL, tcgv_i32_temp(cpu_index), tcgv_ptr_temp(tcg_constant_ptr(cb->userp))); + tcg_gen_call0(qemu_plugin_clear_cb_flags, + qemu_plugin_get_clear_cb_flags_helper_info(), NULL); tcg_temp_free_i32(cpu_index); + tcg_temp_free_i32(flags); } =20 static TCGv_ptr gen_plugin_u64_ptr(qemu_plugin_u64 entry) @@ -173,10 +182,19 @@ static void gen_udata_cond_cb(struct qemu_plugin_cond= itional_cb *cb) tcg_gen_ld_i64(val, ptr, 0); tcg_gen_brcondi_i64(cond, val, cb->imm, after_cb); TCGv_i32 cpu_index =3D gen_cpu_index(); + enum qemu_plugin_cb_flags cb_flags =3D + tcg_call_to_qemu_plugin_cb_flags(cb->info->flags); + TCGv_i32 flags =3D tcg_constant_i32(cb_flags); + tcg_gen_call1(qemu_plugin_set_cb_flags, + qemu_plugin_get_set_cb_flags_helper_info(), NULL, + tcgv_i32_temp(flags)); tcg_gen_call2(cb->f.vcpu_udata, cb->info, NULL, tcgv_i32_temp(cpu_index), tcgv_ptr_temp(tcg_constant_ptr(cb->userp))); + tcg_gen_call0(qemu_plugin_clear_cb_flags, + qemu_plugin_get_clear_cb_flags_helper_info(), NULL); tcg_temp_free_i32(cpu_index); + tcg_temp_free_i32(flags); gen_set_label(after_cb); =20 tcg_temp_free_i64(val); @@ -210,12 +228,21 @@ static void gen_mem_cb(struct qemu_plugin_regular_cb = *cb, qemu_plugin_meminfo_t meminfo, TCGv_i64 addr) { TCGv_i32 cpu_index =3D gen_cpu_index(); + enum qemu_plugin_cb_flags cb_flags =3D + tcg_call_to_qemu_plugin_cb_flags(cb->info->flags); + TCGv_i32 flags =3D tcg_constant_i32(cb_flags); + tcg_gen_call1(qemu_plugin_set_cb_flags, + qemu_plugin_get_set_cb_flags_helper_info(), NULL, + tcgv_i32_temp(flags)); tcg_gen_call4(cb->f.vcpu_mem, cb->info, NULL, tcgv_i32_temp(cpu_index), tcgv_i32_temp(tcg_constant_i32(meminfo)), tcgv_i64_temp(addr), tcgv_ptr_temp(tcg_constant_ptr(cb->userp))); + tcg_gen_call0(qemu_plugin_clear_cb_flags, + qemu_plugin_get_clear_cb_flags_helper_info(), NULL); tcg_temp_free_i32(cpu_index); + tcg_temp_free_i32(flags); } =20 static void inject_cb(struct qemu_plugin_dyn_cb *cb) diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h index 9726a9ebf3..f312cc1a72 100644 --- a/include/qemu/plugin.h +++ b/include/qemu/plugin.h @@ -209,6 +209,18 @@ void qemu_plugin_user_prefork_lock(void); */ void qemu_plugin_user_postfork(bool is_child); =20 +enum qemu_plugin_cb_flags tcg_call_to_qemu_plugin_cb_flags(int flags); + +void qemu_plugin_set_cb_flags(enum qemu_plugin_cb_flags flags); + +enum qemu_plugin_cb_flags qemu_plugin_get_cb_flags(void); + +void qemu_plugin_clear_cb_flags(void); + +TCGHelperInfo *qemu_plugin_get_set_cb_flags_helper_info(void); + +TCGHelperInfo *qemu_plugin_get_clear_cb_flags_helper_info(void); + #else /* !CONFIG_PLUGIN */ =20 static inline void qemu_plugin_add_opts(void) diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h index cfe1692ecb..120fb626a6 100644 --- a/include/qemu/qemu-plugin.h +++ b/include/qemu/qemu-plugin.h @@ -254,9 +254,6 @@ typedef struct { * @QEMU_PLUGIN_CB_NO_REGS: callback does not access the CPU's regs * @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 QEMU_PLUGIN_CB_RW_REGS is unused, plugins cannot change - * system register state. */ enum qemu_plugin_cb_flags { QEMU_PLUGIN_CB_NO_REGS, diff --git a/plugins/api.c b/plugins/api.c index 3a7add50d2..16141f5c25 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -437,6 +437,10 @@ int qemu_plugin_read_register(struct qemu_plugin_regis= ter *reg, GByteArray *buf) { g_assert(current_cpu); =20 + if (qemu_plugin_get_cb_flags() =3D=3D QEMU_PLUGIN_CB_NO_REGS) { + return -1; + } + return gdb_read_register(current_cpu, buf, GPOINTER_TO_INT(reg) - 1); } =20 @@ -445,6 +449,10 @@ int qemu_plugin_write_register(struct qemu_plugin_regi= ster *reg, { g_assert(current_cpu); =20 + if (buf->len =3D=3D 0 || qemu_plugin_get_cb_flags() !=3D QEMU_PLUGIN_C= B_RW_REGS) { + return 0; + } + return gdb_write_register(current_cpu, buf->data, GPOINTER_TO_INT(reg)= - 1); } =20 diff --git a/plugins/core.c b/plugins/core.c index eb9281fe54..0ebde1fb87 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -30,6 +30,9 @@ struct qemu_plugin_cb { }; =20 struct qemu_plugin_state plugin; +static __thread enum qemu_plugin_cb_flags call_cb_flags; +static TCGHelperInfo qemu_plugin_set_cb_flags_helper; +static TCGHelperInfo qemu_plugin_clear_cb_flags_helper; =20 struct qemu_plugin_ctx *plugin_id_to_ctx_locked(qemu_plugin_id_t id) { @@ -364,14 +367,15 @@ void plugin_register_dyn_cb__udata(GArray **arr, enum qemu_plugin_cb_flags flags, void *udata) { - static TCGHelperInfo info[3] =3D { + static TCGHelperInfo info[4] =3D { [QEMU_PLUGIN_CB_NO_REGS].flags =3D TCG_CALL_NO_RWG, [QEMU_PLUGIN_CB_R_REGS].flags =3D TCG_CALL_NO_WG, + [QEMU_PLUGIN_CB_RW_REGS].flags =3D 0, /* * Match qemu_plugin_vcpu_udata_cb_t: * void (*)(uint32_t, void *) */ - [0 ... 2].typemask =3D (dh_typemask(void, 0) | + [0 ... 3].typemask =3D (dh_typemask(void, 0) | dh_typemask(i32, 1) | dh_typemask(ptr, 2)) }; @@ -393,14 +397,15 @@ void plugin_register_dyn_cond_cb__udata(GArray **arr, uint64_t imm, void *udata) { - static TCGHelperInfo info[3] =3D { + static TCGHelperInfo info[4] =3D { [QEMU_PLUGIN_CB_NO_REGS].flags =3D TCG_CALL_NO_RWG, [QEMU_PLUGIN_CB_R_REGS].flags =3D TCG_CALL_NO_WG, + [QEMU_PLUGIN_CB_RW_REGS].flags =3D 0, /* * Match qemu_plugin_vcpu_udata_cb_t: * void (*)(uint32_t, void *) */ - [0 ... 2].typemask =3D (dh_typemask(void, 0) | + [0 ... 3].typemask =3D (dh_typemask(void, 0) | dh_typemask(i32, 1) | dh_typemask(ptr, 2)) }; @@ -431,14 +436,15 @@ void plugin_register_vcpu_mem_cb(GArray **arr, !__builtin_types_compatible_p(qemu_plugin_meminfo_t, uint32_t) && !__builtin_types_compatible_p(qemu_plugin_meminfo_t, int32_t)); =20 - static TCGHelperInfo info[3] =3D { + static TCGHelperInfo info[4] =3D { [QEMU_PLUGIN_CB_NO_REGS].flags =3D TCG_CALL_NO_RWG, [QEMU_PLUGIN_CB_R_REGS].flags =3D TCG_CALL_NO_WG, + [QEMU_PLUGIN_CB_RW_REGS].flags =3D 0, /* * Match qemu_plugin_vcpu_mem_cb_t: * void (*)(uint32_t, qemu_plugin_meminfo_t, uint64_t, void *) */ - [0 ... 2].typemask =3D + [0 ... 3].typemask =3D (dh_typemask(void, 0) | dh_typemask(i32, 1) | (__builtin_types_compatible_p(qemu_plugin_meminfo_t, uint32_t) @@ -730,6 +736,11 @@ static void __attribute__((__constructor__)) plugin_in= it(void) qht_init(&plugin.dyn_cb_arr_ht, plugin_dyn_cb_arr_cmp, 16, QHT_MODE_AUTO_RESIZE); atexit(qemu_plugin_atexit_cb); + qemu_plugin_set_cb_flags_helper.flags =3D 0; + qemu_plugin_set_cb_flags_helper.typemask =3D (dh_typemask(void, 0) | + dh_typemask(i32, 1)); + qemu_plugin_clear_cb_flags_helper.flags =3D 0; + qemu_plugin_clear_cb_flags_helper.typemask =3D dh_typemask(void, 0); } =20 int plugin_num_vcpus(void) @@ -760,3 +771,40 @@ void plugin_scoreboard_free(struct qemu_plugin_scorebo= ard *score) g_array_free(score->data, TRUE); g_free(score); } + +enum qemu_plugin_cb_flags tcg_call_to_qemu_plugin_cb_flags(int flags) +{ + if (flags & TCG_CALL_NO_RWG) { + return QEMU_PLUGIN_CB_NO_REGS; + } else if (flags & TCG_CALL_NO_WG) { + return QEMU_PLUGIN_CB_R_REGS; + } else { + return QEMU_PLUGIN_CB_RW_REGS; + } +} + +void qemu_plugin_set_cb_flags(enum qemu_plugin_cb_flags flags) +{ + call_cb_flags =3D flags; +} + +enum qemu_plugin_cb_flags qemu_plugin_get_cb_flags(void) +{ + return call_cb_flags; +} + +void qemu_plugin_clear_cb_flags(void) +{ + call_cb_flags =3D QEMU_PLUGIN_CB_NO_REGS; +} + + +TCGHelperInfo *qemu_plugin_get_set_cb_flags_helper_info(void) +{ + return &qemu_plugin_set_cb_flags_helper; +} + +TCGHelperInfo *qemu_plugin_get_clear_cb_flags_helper_info(void) +{ + return &qemu_plugin_clear_cb_flags_helper; +} --=20 2.49.0