From nobody Tue May 13 05:29:27 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=1734475182; cv=none;
d=zohomail.com; s=zohoarc;
b=jD0V86QkWrS9261aWL3+irNnYtT28Z6PADC/Nlnlq/76P1oDm0sBkgE1Rp98wn1iBlQpzedP6qVqcQDvQXyLxWsfkjzVEt2bXvBwt7JvsnBSJhLXCajvRuGM6a4vm1L8GXrHatJesWPw+yyUYo3QJEK+/Qcm3C6Un7oJyCq1sBQ=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1734475182;
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=E0X1MlNNMfXe3fyFvrKoslEpzjFsMN2sr/cA5ARxGXA=;
b=fQ2eh2oTNt1cB9uXStdYf+b0fe8y05TRbkdFBLX66oSsDfmdkcdFzBf+IpbbFdBJDGMXnx9DIsnIaiQGrL17xlTthug2j+PH4Sx6pRrXgL8ypWcaJNccNiWw6q1AG3FJh3TYu2RLDunWjxlQBt/+xGOHi3ZK+ozbQD3XFElL/f4=
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 1734475182302902.5949350726614;
Tue, 17 Dec 2024 14:39:42 -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 1tNgDC-0005N3-Dk; Tue, 17 Dec 2024 17:38:42 -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 1tNgD9-0005LP-1r
for qemu-devel@nongnu.org; Tue, 17 Dec 2024 17:38:39 -0500
Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e])
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 1tNgD6-0008Qn-8z
for qemu-devel@nongnu.org; Tue, 17 Dec 2024 17:38:38 -0500
Received: by mail-pl1-x62e.google.com with SMTP id
d9443c01a7336-21670dce0a7so64801135ad.1
for <qemu-devel@nongnu.org>; Tue, 17 Dec 2024 14:38:35 -0800 (PST)
Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id
d9443c01a7336-218a1dccb03sm64869465ad.98.2024.12.17.14.38.34
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 17 Dec 2024 14:38:34 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1734475115; x=1735079915; 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=E0X1MlNNMfXe3fyFvrKoslEpzjFsMN2sr/cA5ARxGXA=;
b=En8MBjG74MYHh3CQGaJsTTwsEVOiFBur494oFJnlmwUQ5qDyZ5FY6aqjM4bIXGUOB1
xrdllORmBOdZJLFatBYRInrS/8VSUmp8xatIsZ60HK2Xym33JyjkDPX3HQAr3c/NktVO
tJ8IykShlXF0+zq/3EQVSqqm2spsvi8VElIcGj4NYTaSqO4e7dUI/mOWN6fg0C/F85ZV
FaRIysa9LTImTmB6iJ5mszej1CdznMZsHJY9F26htbVFleId8lOtrF+sIpi01Ye1PQDF
RhAGlNYjS4ACz9/C0/HaNSmuwNFouBGB33nkF2VyHAbyMc1Vk3ZxFO0yXGy/VxGKddSL
sVHQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734475115; x=1735079915;
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=E0X1MlNNMfXe3fyFvrKoslEpzjFsMN2sr/cA5ARxGXA=;
b=Cp1wxnF5SNe3IZLajFdbg/gVjCHQfF2zzo+2YRnMz2NqDO28RJcjaqY5IiTMbzB0i5
LD2+dSMJG8SM9L0kT/Dy0hofQm6zGhM2K3PWKUmLliEr1fXRNRMp5BEzYKIJv+yaI9Ar
IhmUSLpe8yP57FwwnT7kdGa3JQLC4itEWjCwRrH4B76hL7/sDct0mumEH9qCGoUzvnUN
ZWnGzrEAllLTxLQBQG+AAjEavfWqxt6C4NrAp8gDUCL+gtlA7OTW3rTqGnreohuf3TR4
9oHCslRmF7gRZdQKWxByIenPPZb0BiI9hKkskoEQ1/M0Yfk2ywPW9m2NLjgcSg0f5gAo
zCDg==
X-Gm-Message-State: AOJu0YxnrwmkVsLsULL5KChTBi5Cxz6cx7X9tp0WVv8iIDDIezkRt4q8
L3vcnliAHYKl/+z7DxBLCJDQSjN8FUpuXjNF8Kkahrb09qlxWdw4qm1zEpgRbmG3NcWuC0SraYp
+T8E=
X-Gm-Gg: ASbGncsI05Ur1+ATfnbu/tTWWAhGqPJDbJY6yoHwnvxHqCe6z6K9mw6gKc4m8gShJQF
HjW2mx2Ac82dz+rzmo4njqPg6J+FS+9QnLfpf1hOCTe4zOdwIZir06wd0xg1AA5FZVlGw9YYHzr
eGDjyigWwr0DsSg1FtBoGhEoLxUR5iRo3bnqEHlNu1Mllgc0q+yoMeOACftPXchJf1t0zFRXe7t
7g8vyfL/C0r6nP62kCY4WeDXzAUDcNvyIHpqiA9Mm3VhztLj4+yn22N
X-Google-Smtp-Source:
AGHT+IHI9tz45g06h+gtp/ug0tmkYdjTCEZ7Po8WMj11CvshMUzkT7ynjJr8AE9mt1mBJOTn1mEJHA==
X-Received: by 2002:a17:902:f68e:b0:215:7421:262 with SMTP id
d9443c01a7336-218d6fc12bbmr8686415ad.12.1734475115015;
Tue, 17 Dec 2024 14:38:35 -0800 (PST)
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>, philmd@linaro.org,
Mahmoud Mandour <ma.mandourr@gmail.com>, richard.henderson@linaro.org,
Pierrick Bouvier <pierrick.bouvier@linaro.org>,
=?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>,
Thomas Huth <thuth@redhat.com>, Alexandre Iooss <erdnaxe@crans.org>
Subject: [PATCH v2 05/11] contrib/plugins/stoptrigger: fix 32-bit build
Date: Tue, 17 Dec 2024 14:38:19 -0800
Message-Id: <20241217223825.2895749-6-pierrick.bouvier@linaro.org>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20241217223825.2895749-1-pierrick.bouvier@linaro.org>
References: <20241217223825.2895749-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::62e;
envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x62e.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: 1734475183216116600
Content-Type: text/plain; charset="utf-8"
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
contrib/plugins/stoptrigger.c | 48 ++++++++++++++++++++---------------
1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/contrib/plugins/stoptrigger.c b/contrib/plugins/stoptrigger.c
index 03ee22f4c6a..b3a6ed66a7b 100644
--- a/contrib/plugins/stoptrigger.c
+++ b/contrib/plugins/stoptrigger.c
@@ -21,9 +21,11 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version =3D QEMU_PLUG=
IN_VERSION;
/* Scoreboard to track executed instructions count */
typedef struct {
uint64_t insn_count;
+ uint64_t current_pc;
} InstructionsCount;
static struct qemu_plugin_scoreboard *insn_count_sb;
static qemu_plugin_u64 insn_count;
+static qemu_plugin_u64 current_pc;
=20
static uint64_t icount;
static int icount_exit_code;
@@ -34,6 +36,11 @@ static bool exit_on_address;
/* Map trigger addresses to exit code */
static GHashTable *addrs_ht;
=20
+typedef struct {
+ uint64_t exit_addr;
+ int exit_code;
+} ExitInfo;
+
static void exit_emulation(int return_code, char *message)
{
qemu_plugin_outs(message);
@@ -43,23 +50,18 @@ static void exit_emulation(int return_code, char *messa=
ge)
=20
static void exit_icount_reached(unsigned int cpu_index, void *udata)
{
- uint64_t insn_vaddr =3D GPOINTER_TO_UINT(udata);
+ uint64_t insn_vaddr =3D qemu_plugin_u64_get(current_pc, cpu_index);
char *msg =3D g_strdup_printf("icount reached at 0x%" PRIx64 ", exitin=
g\n",
insn_vaddr);
-
exit_emulation(icount_exit_code, msg);
}
=20
static void exit_address_reached(unsigned int cpu_index, void *udata)
{
- uint64_t insn_vaddr =3D GPOINTER_TO_UINT(udata);
- char *msg =3D g_strdup_printf("0x%" PRIx64 " reached, exiting\n", insn=
_vaddr);
- int exit_code;
-
- exit_code =3D GPOINTER_TO_INT(
- g_hash_table_lookup(addrs_ht, GUINT_TO_POINTER(insn_vaddr)));
-
- exit_emulation(exit_code, msg);
+ ExitInfo *ei =3D udata;
+ g_assert(ei);
+ char *msg =3D g_strdup_printf("0x%" PRIx64 " reached, exiting\n", ei->=
exit_addr);
+ exit_emulation(ei->exit_code, msg);
}
=20
static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
@@ -67,23 +69,25 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct q=
emu_plugin_tb *tb)
size_t tb_n =3D qemu_plugin_tb_n_insns(tb);
for (size_t i =3D 0; i < tb_n; i++) {
struct qemu_plugin_insn *insn =3D qemu_plugin_tb_get_insn(tb, i);
- gpointer insn_vaddr =3D GUINT_TO_POINTER(qemu_plugin_insn_vaddr(in=
sn));
+ uint64_t insn_vaddr =3D qemu_plugin_insn_vaddr(insn);
=20
if (exit_on_icount) {
/* Increment and check scoreboard for each instruction */
qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu(
insn, QEMU_PLUGIN_INLINE_ADD_U64, insn_count, 1);
+ qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu(
+ insn, QEMU_PLUGIN_INLINE_STORE_U64, current_pc, insn_vaddr=
);
qemu_plugin_register_vcpu_insn_exec_cond_cb(
insn, exit_icount_reached, QEMU_PLUGIN_CB_NO_REGS,
- QEMU_PLUGIN_COND_EQ, insn_count, icount + 1, insn_vaddr);
+ QEMU_PLUGIN_COND_EQ, insn_count, icount + 1, NULL);
}
=20
if (exit_on_address) {
- if (g_hash_table_contains(addrs_ht, insn_vaddr)) {
+ ExitInfo *ei =3D g_hash_table_lookup(addrs_ht, &insn_vaddr);
+ if (ei) {
/* Exit triggered by address */
qemu_plugin_register_vcpu_insn_exec_cb(
- insn, exit_address_reached, QEMU_PLUGIN_CB_NO_REGS,
- insn_vaddr);
+ insn, exit_address_reached, QEMU_PLUGIN_CB_NO_REGS, ei=
);
}
}
}
@@ -99,11 +103,13 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin=
_id_t id,
const qemu_info_t *info, int ar=
gc,
char **argv)
{
- addrs_ht =3D g_hash_table_new(NULL, g_direct_equal);
+ addrs_ht =3D g_hash_table_new_full(g_int64_hash, g_int64_equal, NULL, =
g_free);
=20
insn_count_sb =3D qemu_plugin_scoreboard_new(sizeof(InstructionsCount)=
);
insn_count =3D qemu_plugin_scoreboard_u64_in_struct(
insn_count_sb, InstructionsCount, insn_count);
+ current_pc =3D qemu_plugin_scoreboard_u64_in_struct(
+ insn_count_sb, InstructionsCount, current_pc);
=20
for (int i =3D 0; i < argc; i++) {
char *opt =3D argv[i];
@@ -124,13 +130,13 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugi=
n_id_t id,
exit_on_icount =3D true;
} else if (g_strcmp0(tokens[0], "addr") =3D=3D 0) {
g_auto(GStrv) addr_tokens =3D g_strsplit(tokens[1], ":", 2);
- uint64_t exit_addr =3D g_ascii_strtoull(addr_tokens[0], NULL, =
0);
- int exit_code =3D 0;
+ ExitInfo *ei =3D g_malloc(sizeof(ExitInfo));
+ ei->exit_addr =3D g_ascii_strtoull(addr_tokens[0], NULL, 0);
+ ei->exit_code =3D 0;
if (addr_tokens[1]) {
- exit_code =3D g_ascii_strtoull(addr_tokens[1], NULL, 0);
+ ei->exit_code =3D g_ascii_strtoull(addr_tokens[1], NULL, 0=
);
}
- g_hash_table_insert(addrs_ht, GUINT_TO_POINTER(exit_addr),
- GINT_TO_POINTER(exit_code));
+ g_hash_table_insert(addrs_ht, &ei->exit_addr, ei);
exit_on_address =3D true;
} else {
fprintf(stderr, "option parsing failed: %s\n", opt);
--=20
2.39.5