From patchwork Wed May 1 14:37:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 793714 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:54f:b0:34d:5089:5a9e with SMTP id b15csp790417wrf; Wed, 1 May 2024 07:38:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUhCJ+AbMZ71ZsHfuwJADaAPjKKkILAOLUSz+o8dpvjuDHT/os3NVlG23dqTjtTOLpuEXkGcA74X5VneQRpDRF2 X-Google-Smtp-Source: AGHT+IHxf7t4LqPWkfxqbDxN69BOBFeuT/3lMqLaBFN2YGJh63E+q9dehMcvJjR6aCjoIRdrIUSQ X-Received: by 2002:ac8:5fd3:0:b0:43a:e61a:ddc7 with SMTP id k19-20020ac85fd3000000b0043ae61addc7mr2836012qta.44.1714574322090; Wed, 01 May 2024 07:38:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714574322; cv=none; d=google.com; s=arc-20160816; b=NsndR5gZaWC01kk6v4jQv8SWeqQJQb3AoLJ1HicsEewt6UnyOOO1aAqX2Fjvl6CLbr fjKsW0LkVi4bSvHGjgFYDUX5J7a2H2Ae3fpfGmoBuyIYiUemsXYceR9YemLSRYoo2VNb FW8xm9NK9h3lbcRHRWzBMXSvL0btwCD+XXdVWdWO3x9w90lnhlfvlbp5Un4Ir30/+5AW FMf6IniIgUZce5JEfNkebQkls3SXXVs3LbLc2iHyvjB9zTFQLq5RKbA/6mz/igl+iYAp xTaaKRf0DXmsVdzXFxrtDMq/HluqEdN2dapELrKEX5BFDIQnpn7URXl4E9M/aiwKTzjq /DuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RmGbooE7MMw6U3zKUesAFTGouJdUS0zDOY8tro2IA3U=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=HI2ixEbFpYYSgYUl55USJazLh8qwGb9xkNhYzLFP8qudpdl9V+RtwMol9dk8gQnkDC /cjYYpSC1997U2Q8+Ph0h4IgQ0MaCntMiUX0k8JlGUXh/N5vjT18ZrS36RWPkX3waTem uv18q6Z8atx29O2dfaSl4c9UKRgfIVSFq3MtaHENpgYBA0++r/Qrd8KxXqR22N5T323q hrj3MSBjm2nLyH1wWL+4NJKr/21FZgKIcVW+4eKYbHJpK1dC/6LtoxQlr7WL1PNCBxsL e4xqSfVlI3AXJWwIs5josaSh/9d3kCL7KkfaWISAuYwVRyW8a7O8eUrBXHFiXWeH12mB zCvw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HuFebopb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o18-20020ac87c52000000b0043b024830f5si6140166qtv.341.2024.05.01.07.38.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 May 2024 07:38:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HuFebopb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2B5q-0002gv-W4; Wed, 01 May 2024 10:37:59 -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 1s2B5k-0002fu-8l for qemu-devel@nongnu.org; Wed, 01 May 2024 10:37:53 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2B5h-000281-Jc for qemu-devel@nongnu.org; Wed, 01 May 2024 10:37:51 -0400 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1ec4b2400b6so15850345ad.3 for ; Wed, 01 May 2024 07:37:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714574268; x=1715179068; 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=RmGbooE7MMw6U3zKUesAFTGouJdUS0zDOY8tro2IA3U=; b=HuFebopbOYN2vvIkfMQ/vFyBsvayuSNRXbP/Df0Dy8GxXMfFdcCJw+6WX17iRLPNEH JVBp09WfpiJ1tKuPiasT1d0zvO+JvBGM+WX7sS6I/zyn3T2cB8GoRcr4tptBk1Sce9IO whDwJIPi4mwoPTf03NZY/Vzmy9iHbma9m/l+x4rXCat1e4uWJdFKYa2vWVhyqgmk6Wn+ 865zWKsqkOeOg8Kd9wAAQmu8Z28j3eouuhkZ+k227H6NSDdIN6aWy2LZDgDbDp0KhoyX 0p5zTbMiy4h5w0WSgHEkfhk5eu3qQZoSN8lcYHUKzlqT0fqC+vRUVv31dWkeIrOMHwL2 GUQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714574268; x=1715179068; 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=RmGbooE7MMw6U3zKUesAFTGouJdUS0zDOY8tro2IA3U=; b=VDQTBz14PBQJ9fgkrDsYp/srVhN0iqJ/oOL31kpVECQgP1jUQNi2mE79s5Es2O1wM9 iCBduH8qdFge+q5lJiXtTtmQN0KcN1qc4mDmc+hUHcJ8Ej3KRQFZVFEiKw0g5iUD21fo UgWrsQqGo6uoW0wLrJDL0CCJqHye/Y+k/wDxl6qlR6CDaHw3Qxe50d9q8sQRuRN+qF5B l0lGgHSQARFBOy/I7wX6eeYkZn7kEDWZUnn0R/fW16Mz2lZOMzvcMwir8ORA+9uMWSMk 3/64qxMVPqXagFPI+KL3oHDP3PC626RS6wyzX00BWl5MB0l+k0IvxvtHh50HTzle2l9r Mq7A== X-Gm-Message-State: AOJu0YwRDC6KT8NT8AtZaaBhj/Y2mEM8aeF+rP+MK8zlnPnDm66+2/xI 6p0lGeKS4vH+Ho89XX6fOGEk/7P/5CDnYRcfAbNwcxvX9ftECrbajAtASECDDWMaFvBl5ldPAo+ D X-Received: by 2002:a17:902:dac7:b0:1eb:527e:a8ad with SMTP id q7-20020a170902dac700b001eb527ea8admr3075691plx.51.1714574268186; Wed, 01 May 2024 07:37:48 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id h12-20020a170902f54c00b001ebd73f61fcsm5751573plf.121.2024.05.01.07.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 07:37:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 07/20] plugins: Use emit_before_op for PLUGIN_GEN_FROM_TB Date: Wed, 1 May 2024 07:37:26 -0700 Message-Id: <20240501143739.10541-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240501143739.10541-1-richard.henderson@linaro.org> References: <20240501143739.10541-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.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, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org By having the qemu_plugin_cb_flags be recorded in the TCGHelperInfo, we no longer need to distinguish PLUGIN_CB_REGULAR from PLUGIN_CB_REGULAR_R, so place all TB callbacks in the same queue. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- accel/tcg/plugin-gen.c | 96 +++++++++++++++++++++++++----------------- plugins/api.c | 6 +-- 2 files changed, 58 insertions(+), 44 deletions(-) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 4b02c0bfbf..c803fe8e96 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -201,6 +201,7 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) { switch (from) { case PLUGIN_GEN_AFTER_INSN: + case PLUGIN_GEN_FROM_TB: tcg_gen_plugin_cb(from); break; case PLUGIN_GEN_FROM_INSN: @@ -210,8 +211,6 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) */ gen_wrapped(from, PLUGIN_GEN_ENABLE_MEM_HELPER, gen_empty_mem_helper); - /* fall through */ - case PLUGIN_GEN_FROM_TB: gen_wrapped(from, PLUGIN_GEN_CB_UDATA, gen_empty_udata_cb_no_rwg); gen_wrapped(from, PLUGIN_GEN_CB_UDATA_R, gen_empty_udata_cb_no_wg); gen_wrapped(from, PLUGIN_GEN_CB_INLINE, gen_empty_inline_cb); @@ -626,24 +625,6 @@ void plugin_gen_disable_mem_helpers(void) offsetof(CPUState, plugin_mem_cbs) - offsetof(ArchCPU, env)); } -static void plugin_gen_tb_udata(const struct qemu_plugin_tb *ptb, - TCGOp *begin_op) -{ - inject_udata_cb(ptb->cbs[PLUGIN_CB_REGULAR], begin_op); -} - -static void plugin_gen_tb_udata_r(const struct qemu_plugin_tb *ptb, - TCGOp *begin_op) -{ - inject_udata_cb(ptb->cbs[PLUGIN_CB_REGULAR_R], begin_op); -} - -static void plugin_gen_tb_inline(const struct qemu_plugin_tb *ptb, - TCGOp *begin_op) -{ - inject_inline_cb(ptb->cbs[PLUGIN_CB_INLINE], begin_op, op_ok); -} - static void plugin_gen_insn_udata(const struct qemu_plugin_tb *ptb, TCGOp *begin_op, int insn_idx) { @@ -702,6 +683,41 @@ static void gen_disable_mem_helper(struct qemu_plugin_tb *ptb, } } +static void gen_udata_cb(struct qemu_plugin_dyn_cb *cb) +{ + TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); + + tcg_gen_ld_i32(cpu_index, tcg_env, + -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); + tcg_gen_call2(cb->regular.f.vcpu_udata, cb->regular.info, NULL, + tcgv_i32_temp(cpu_index), + tcgv_ptr_temp(tcg_constant_ptr(cb->userp))); + tcg_temp_free_i32(cpu_index); +} + +static void gen_inline_cb(struct qemu_plugin_dyn_cb *cb) +{ + GArray *arr = cb->inline_insn.entry.score->data; + size_t offset = cb->inline_insn.entry.offset; + TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); + TCGv_i64 val = tcg_temp_ebb_new_i64(); + TCGv_ptr ptr = tcg_temp_ebb_new_ptr(); + + tcg_gen_ld_i32(cpu_index, tcg_env, + -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); + tcg_gen_muli_i32(cpu_index, cpu_index, g_array_get_element_size(arr)); + tcg_gen_ext_i32_ptr(ptr, cpu_index); + tcg_temp_free_i32(cpu_index); + + tcg_gen_addi_ptr(ptr, ptr, (intptr_t)arr->data); + tcg_gen_ld_i64(val, ptr, offset); + tcg_gen_addi_i64(val, val, cb->inline_insn.imm); + tcg_gen_st_i64(val, ptr, offset); + + tcg_temp_free_i64(val); + tcg_temp_free_ptr(ptr); +} + /* #define DEBUG_PLUGIN_GEN_OPS */ static void pr_ops(void) { @@ -780,6 +796,8 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) { enum plugin_gen_from from = op->args[0]; struct qemu_plugin_insn *insn = NULL; + const GArray *cbs; + int i, n; if (insn_idx >= 0) { insn = g_ptr_array_index(plugin_tb->insns, insn_idx); @@ -792,6 +810,25 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) assert(insn != NULL); gen_disable_mem_helper(plugin_tb, insn); break; + + case PLUGIN_GEN_FROM_TB: + assert(insn == NULL); + + cbs = plugin_tb->cbs[PLUGIN_CB_REGULAR]; + for (i = 0, n = (cbs ? cbs->len : 0); i < n; i++) { + struct qemu_plugin_dyn_cb *cb = + &g_array_index(cbs, struct qemu_plugin_dyn_cb, i); + gen_udata_cb(cb); + } + + cbs = plugin_tb->cbs[PLUGIN_CB_INLINE]; + for (i = 0, n = (cbs ? cbs->len : 0); i < n; i++) { + struct qemu_plugin_dyn_cb *cb = + &g_array_index(cbs, struct qemu_plugin_dyn_cb, i); + gen_inline_cb(cb); + } + break; + default: g_assert_not_reached(); } @@ -807,25 +844,6 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) enum plugin_gen_cb type = op->args[1]; switch (from) { - case PLUGIN_GEN_FROM_TB: - { - g_assert(insn_idx == -1); - - switch (type) { - case PLUGIN_GEN_CB_UDATA: - plugin_gen_tb_udata(plugin_tb, op); - break; - case PLUGIN_GEN_CB_UDATA_R: - plugin_gen_tb_udata_r(plugin_tb, op); - break; - case PLUGIN_GEN_CB_INLINE: - plugin_gen_tb_inline(plugin_tb, op); - break; - default: - g_assert_not_reached(); - } - break; - } case PLUGIN_GEN_FROM_INSN: { g_assert(insn_idx >= 0); diff --git a/plugins/api.c b/plugins/api.c index 8fa5a600ac..5d119e8049 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -92,11 +92,7 @@ void qemu_plugin_register_vcpu_tb_exec_cb(struct qemu_plugin_tb *tb, void *udata) { if (!tb->mem_only) { - int index = flags == QEMU_PLUGIN_CB_R_REGS || - flags == QEMU_PLUGIN_CB_RW_REGS ? - PLUGIN_CB_REGULAR_R : PLUGIN_CB_REGULAR; - - plugin_register_dyn_cb__udata(&tb->cbs[index], + plugin_register_dyn_cb__udata(&tb->cbs[PLUGIN_CB_REGULAR], cb, flags, udata); } }