From nobody Tue May 13 08:38:12 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=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1734397725; cv=none;
d=zohomail.com; s=zohoarc;
b=TlFF0Ww9VRnezp6m3kenSwl2adrsXR18CO4n3otGyTUvRaeHipqYCbfgdYlX2hmasn2sMuuP536zl+gZGhff/1UITpJ7brD0uDJxAfthT9lbio8CSlDY+vMqXIjTNqx3/YmVbVtlUfj7ZpWXPhfUD9TSIYFn2HWvXI1YtJyowqI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1734397725;
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=n/SJ8lccCav6ChcddekLPgsSkxigdbVgR6d9YvtHR4g=;
b=hnz4pEeTuX+EiF/wKv4Cose9UoE/K3IhMmDAmK4Gi5qGfequQ8qYgEzykST2j3QVJPBolGTrGUtGrcRJtamkbukELL0jrwaXfcEZ8ybO4u26MF7GlcVHPjqif4ccwXj26gxFN+sxVMt1lMzivaHtYZdGq8bVawmofo/gGBWzfuk=
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=<pierrick.bouvier@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1734397725678303.055333377751;
Mon, 16 Dec 2024 17:08:45 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tNM3u-0008KJ-7A; Mon, 16 Dec 2024 20:07:46 -0500
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 <pierrick.bouvier@linaro.org>)
id 1tNM3f-0008Hu-W2
for qemu-devel@nongnu.org; Mon, 16 Dec 2024 20:07:32 -0500
Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <pierrick.bouvier@linaro.org>)
id 1tNM3c-0004ym-6K
for qemu-devel@nongnu.org; Mon, 16 Dec 2024 20:07:30 -0500
Received: by mail-pl1-x62a.google.com with SMTP id
d9443c01a7336-2164b662090so37317485ad.1
for <qemu-devel@nongnu.org>; Mon, 16 Dec 2024 17:07:27 -0800 (PST)
Received: from pc.. (216-180-64-156.dyn.novuscom.net. [216.180.64.156])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-218a1e6d0e4sm48746595ad.261.2024.12.16.17.07.26
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 16 Dec 2024 17:07:26 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1734397647; x=1735002447; 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=n/SJ8lccCav6ChcddekLPgsSkxigdbVgR6d9YvtHR4g=;
b=xZVrHgbGlqVQAW37RsY5ho6l/MUYpEYktwyHDvaNnVNEWOxydFqGEtQSKcAJirKr+t
iKZOj/X0Hc6WF0Qsjt8Oe11wiqG5G11di1pHH0Xlru14GWvptmdyeU6wVaDQEEHejtVp
0A6+2DylIvbIE/DRER+5SM5QHPkXmx27MNJDYy1sW+e6d+c3cbV8e09q+RE/7WyNStQk
yUNgpr7g8PohRtnjJLOh1OLf32KTNgcrPPz3FJCJMw9/Kv8xnAVldnRTgbyv2ql0lAhI
4QjlV+/a4KySODYjcMhSeiC2Ksxh8juEVL2hzHabi0JXTSgIl/gO+kagWTOl/GC64P/q
HufA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734397647; x=1735002447;
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=n/SJ8lccCav6ChcddekLPgsSkxigdbVgR6d9YvtHR4g=;
b=dZzu5/O0WdzDUaxGDO3sDu5mFafHQ9uQpQsFNHovSjdUy7i57vg4f6obfOkDo+Q4+n
EcMURo5xcnEFKUqrRCw4IqZSeLk5XYPWfr4d8Yk3tiNYNNjpLN4vUS9rEHH4CCHZEE4L
mA8R7JlUhoYgs81qbWnrCIz60TckBCwKU7wxHB8ejaJChVzifcPOJ4UjSGba13vNmZBG
bDKY4oMYn4Zqu2mTPHDJroDfgZBRhgmxDwsPV49cYsCF9mGYRgqNRmqelMjohbaDw1jd
zTTlFZyPGhOllYPCqRy4W2ikLtcTeC76agpU4NivXZ6ZA25MjRDseeAQuJ09aNMCUJEJ
ghiQ==
X-Gm-Message-State: AOJu0YzbgbHOrWJ7ebIJYTB68ttnZkfzSb3uBZT6MEoH2w+0DrVv2R6E
Px4Ep0mAaCMaw3aNykCpaGZyjHoNolRnKL1NS6oYVTJIyA2czePeC9EJbKPeEpOJf5WG4yeow+P
I5kk=
X-Gm-Gg: ASbGncuuuWqh11bRxtcxw6WS0nY2G+XNinYGTzHZw2hCKxso1Ma7b5TlRepTFGzlosX
dcinqyFFH/EhQFe9gxakTestlbWkzIZ/IIMNwOQImDgz4Zw03/ulCEDTsoZsw3hne5oKDyZBLZ0
goo16elUE0MnRoBFWijx0GrxI50jjPEtkusbP8k2Gm0gIZDUPl3rzsfsFb259c/Qj9a+FPbqbTi
UW9Kg91fbO1mricmBLl+zeLQL5nwqf0E0pKtZXty66eT6RqGNK4yOhoHZm+b5NFVZhRFVlJKqbV
wAIoJ/Bl7mDEGPs=
X-Google-Smtp-Source:
AGHT+IG4iQ39pa5kcA70JuHX6P8I+qAW0DvHvglLdMyyKL04C6ryTKFxQJWX9m3xXZqRYMmlEl82EA==
X-Received: by 2002:a17:902:da8f:b0:216:51fb:bb28 with SMTP id
d9443c01a7336-218c9024fd8mr17837005ad.51.1734397646947;
Mon, 16 Dec 2024 17:07:26 -0800 (PST)
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
To: qemu-devel@nongnu.org
Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>,
richard.henderson@linaro.org,
Pierrick Bouvier <pierrick.bouvier@linaro.org>,
Alexandre Iooss <erdnaxe@crans.org>, Paolo Bonzini <pbonzini@redhat.com>,
Mahmoud Mandour <ma.mandourr@gmail.com>, Thomas Huth <thuth@redhat.com>,
philmd@linaro.org
Subject: [PATCH 10/13] contrib/plugins/cflow: fix 32-bit build
Date: Mon, 16 Dec 2024 17:07:04 -0800
Message-Id: <20241217010707.2557258-11-pierrick.bouvier@linaro.org>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20241217010707.2557258-1-pierrick.bouvier@linaro.org>
References: <20241217010707.2557258-1-pierrick.bouvier@linaro.org>
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::62a;
envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62a.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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=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 @linaro.org)
X-ZM-MESSAGEID: 1734397728129116600
Content-Type: text/plain; charset="utf-8"
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
contrib/plugins/cflow.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/contrib/plugins/cflow.c b/contrib/plugins/cflow.c
index b39974d1cf3..930ecb46fcd 100644
--- a/contrib/plugins/cflow.c
+++ b/contrib/plugins/cflow.c
@@ -76,6 +76,8 @@ typedef struct {
=20
/* We use this to track the current execution state */
typedef struct {
+ /* address of current translated block */
+ uint64_t tb_pc;
/* address of end of block */
uint64_t end_block;
/* next pc after end of block */
@@ -85,6 +87,7 @@ typedef struct {
} VCPUScoreBoard;
=20
/* descriptors for accessing the above scoreboard */
+static qemu_plugin_u64 tb_pc;
static qemu_plugin_u64 end_block;
static qemu_plugin_u64 pc_after_block;
static qemu_plugin_u64 last_pc;
@@ -189,10 +192,11 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
static void plugin_init(void)
{
g_mutex_init(&node_lock);
- nodes =3D g_hash_table_new(NULL, g_direct_equal);
+ nodes =3D g_hash_table_new(g_int64_hash, g_int64_equal);
state =3D qemu_plugin_scoreboard_new(sizeof(VCPUScoreBoard));
=20
/* score board declarations */
+ tb_pc =3D qemu_plugin_scoreboard_u64_in_struct(state, VCPUScoreBoard, =
tb_pc);
end_block =3D qemu_plugin_scoreboard_u64_in_struct(state, VCPUScoreBoa=
rd,
end_block);
pc_after_block =3D qemu_plugin_scoreboard_u64_in_struct(state, VCPUSco=
reBoard,
@@ -215,10 +219,10 @@ static NodeData *fetch_node(uint64_t addr, bool creat=
e_if_not_found)
NodeData *node =3D NULL;
=20
g_mutex_lock(&node_lock);
- node =3D (NodeData *) g_hash_table_lookup(nodes, (gconstpointer) addr);
+ node =3D (NodeData *) g_hash_table_lookup(nodes, &addr);
if (!node && create_if_not_found) {
node =3D create_node(addr);
- g_hash_table_insert(nodes, (gpointer) addr, (gpointer) node);
+ g_hash_table_insert(nodes, &node->addr, node);
}
g_mutex_unlock(&node_lock);
return node;
@@ -234,7 +238,7 @@ static void vcpu_tb_branched_exec(unsigned int cpu_inde=
x, void *udata)
uint64_t lpc =3D qemu_plugin_u64_get(last_pc, cpu_index);
uint64_t ebpc =3D qemu_plugin_u64_get(end_block, cpu_index);
uint64_t npc =3D qemu_plugin_u64_get(pc_after_block, cpu_index);
- uint64_t pc =3D GPOINTER_TO_UINT(udata);
+ uint64_t pc =3D qemu_plugin_u64_get(tb_pc, cpu_index);
=20
/* return early for address 0 */
if (!lpc) {
@@ -305,10 +309,11 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct=
qemu_plugin_tb *tb)
* handle both early block exits and normal branches in the
* callback if we hit it.
*/
- gpointer udata =3D GUINT_TO_POINTER(pc);
+ qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu(
+ tb, QEMU_PLUGIN_INLINE_STORE_U64, tb_pc, pc);
qemu_plugin_register_vcpu_tb_exec_cond_cb(
tb, vcpu_tb_branched_exec, QEMU_PLUGIN_CB_NO_REGS,
- QEMU_PLUGIN_COND_NE, pc_after_block, pc, udata);
+ QEMU_PLUGIN_COND_NE, pc_after_block, pc, NULL);
=20
/*
* Now we can set start/end for this block so the next block can
--=20
2.39.5