From nobody Sun Apr 12 06:03:58 2026 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=1770943413; cv=none; d=zohomail.com; s=zohoarc; b=cz1DIO2ewb/gjXcw1QvJTy1ZjoTBza3PaC8k3J+KIaJOPbUOVqw/O39O+oXYxwsSzuSdfyissUEnNemi11mqGY09S4iNT/1W4yDKDRyTCsZcGVHTlUqIdl5a1/DgVbNiHsg8+eOUzXiAWfyhd82qbQASR1xy4SboCl8kEPHuQgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770943413; h=Content-Type: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=MhP9UxZvtyw4qXts11XqOhuLW6bLHIrLsrfSheQGMKU=; b=CPerEuOy/uOPsIUV1bhKLkaYmY3OkbIOIY2WMidCqcDoCKCxkVqU/bZczo0ZjnM+W+Doqo80IaxbjoRyvv0Z5dpTy0GoMzGbR6X1k27w3p05kNmFiB9B8YD8+3gOBZcSPAlG6s/9eXDBg9KSJYHh1s3PEyKM5y0BLyuqaecbvPs= 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 1770943413662857.2044526427512; Thu, 12 Feb 2026 16:43:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vqhGz-0003nA-Uk; Thu, 12 Feb 2026 19:43:06 -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 ) id 1vqhGy-0003me-OF for qemu-devel@nongnu.org; Thu, 12 Feb 2026 19:43:04 -0500 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vqhGw-0000qR-TW for qemu-devel@nongnu.org; Thu, 12 Feb 2026 19:43:04 -0500 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-82318b640beso222246b3a.0 for ; Thu, 12 Feb 2026 16:43:02 -0800 (PST) Received: from pc.taild8403c.ts.net (216-71-219-44.dyn.novuscom.net. [216.71.219.44]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-824c6a431f2sm504326b3a.22.2026.02.12.16.43.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Feb 2026 16:43:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770943381; x=1771548181; 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=MhP9UxZvtyw4qXts11XqOhuLW6bLHIrLsrfSheQGMKU=; b=yd0wJ6m0ompvTeVoSrf+WzlEeLF1ViV76VeY+dK2+9CSjDiwCz6iKb2mrHkPKop9Ju rLbMcdA86jLyStttx9hWEiwF2+QmnHgeh9oDhbEaR/j8CDufB23BPVgFyZLLT2jREAv/ MOwQpnpsPj6ixJaG35xu3400INEix3MzKrGAxES3I2p3Gw0RbEv6Q2YDmXPKU4UpISIH z/H9mG1t7/5Fg+vP0bW2wBoGykzrZHYFrzVsi4ob7DUSU5FCCnuMIKb4mNeEQGAqGhsS EmUfunSlD4Lc+Y5v+E6cmIcK6F6+61CKSID3eFpdUOT1iaXfsZhudKm/h7N8568nT9yf K58A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770943381; x=1771548181; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MhP9UxZvtyw4qXts11XqOhuLW6bLHIrLsrfSheQGMKU=; b=s3D0fw75kIOqcEY6K/nBqalCeWM36Crt5GqJCNpb0xpoc7xMudQsO2KJ/nrEixNzDC qtRRNF7e9cTDRtX9JutOqSRKmuu04rV8Exx5FEkfmxWNwvqaCfTHpnzXVwUMjPOUBeKd zicVoGRCodIwqG9VMe3XcuO6E15EpWpgAFvGBr0rf6zdqsYYlUT2IbuAeILDFXfBBQmK JYEE5agqrIEq1ZTSoqAM5g5i+TUDKYYIA/xbed43njDEif5zeONo/+6h75etYM4bjjB4 UlL4RiRD+0/ri6Wnd/JWyKqfUIaV/dSpfm2oMTyfhzFNYcGtRszDnCqAE5THkInI7jCq gkxw== X-Gm-Message-State: AOJu0YzaJRwtC5gH+lXBfDBg5lwXYtQXLmrs6nTs1mJW/fBrUYFi9BQl pYo8OWqfNIRq64piWbAeW8qqcUQcqU3xzZvPz6nge2MEbrafLGRangDqHlY3BXOIyXB7/rY4zfL gj3LP X-Gm-Gg: AZuq6aLOB0/84bQQQr/p7UeOEpjYmT5hg5SvTDvXzObNSOEtxXmwZMgdkscCfvjUeUz rAFOfVOPUUMvv28L3FVZKfOo/2m+LWH4/X4MfpD7y+d+UVsEIN5OlqlVjf/kNHjp0nJ2VEfnl8t p9wDZm+Y2PM9c8PevLdifZLPegBK+N0+kJjWi7Q4LF816I4WvdHGPZzhrxycx0DXDY7emA8YAkP vIbzMs4C0h5LMDIfpSk6MJqctHKcUFTAmdlwwJNzp/JeI7/3/ChEXkXb3N/XhZSxhxKeFsf1LsO ox6gXZgvf7oEUb37Tq+XaLsgVfNw9W5VRec1GqJ64gbfeYw7ZtLc9vJ4yYOyMxTV5VIdpR4QpJ6 y8+3c51T2CzNMRZGH61y5UriOSAMSNWkxdH1NbTd2nCqLeJ0H6Jl2elx3q0z9PxASr7ytKVW18s 9MCFaGrQ2ulArC0T9szmCarCLsXfU9VK0eSevjx/oVb2NH3Nm3hWLOfTOxbsMjC/A4smMhHaXRV 54/ X-Received: by 2002:a05:6a00:4515:b0:821:8ebc:2899 with SMTP id d2e1a72fcca58-824c9446cf7mr284157b3a.7.1770943381452; Thu, 12 Feb 2026 16:43:01 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org, peter.maydell@linaro.org, richard.henderson@linaro.org, pbonzini@redhat.com, stefanha@redhat.com Cc: pierrick.bouvier@linaro.org Subject: [PULL 2/4] contrib/plugins/uftrace: add ops for walking frame pointers chain Date: Thu, 12 Feb 2026 16:42:52 -0800 Message-ID: <20260213004254.493059-3-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260213004254.493059-1-pierrick.bouvier@linaro.org> References: <20260213004254.493059-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::434; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x434.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 development 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 @linaro.org) X-ZM-MESSAGEID: 1770943414615158500 x86_64 and aarch64 use same stack layout. However, other architectures might use different offset for return address and next frame pointer. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Link: https://lore.kernel.org/qemu-devel/20260210201344.1403613-3-pierrick.= bouvier@linaro.org Signed-off-by: Pierrick Bouvier --- contrib/plugins/uftrace.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/contrib/plugins/uftrace.c b/contrib/plugins/uftrace.c index 1ed982999ed..21ac1402047 100644 --- a/contrib/plugins/uftrace.c +++ b/contrib/plugins/uftrace.c @@ -46,6 +46,8 @@ typedef struct { void (*init)(Cpu *cpu); void (*end)(Cpu *cpu); uint64_t (*get_frame_pointer)(Cpu *cpu); + uint64_t (*get_next_frame_pointer)(Cpu *cpu, uint64_t fp); + uint64_t (*get_next_return_address)(Cpu *cpu, uint64_t fp); uint8_t (*get_privilege_level)(Cpu *cpu); uint8_t (*num_privilege_levels)(void); const char *(*get_privilege_level_name)(uint8_t pl); @@ -421,7 +423,9 @@ static uint32_t cpu_read_register32(Cpu *cpu, struct qe= mu_plugin_register *reg) =20 static uint64_t cpu_read_memory64(Cpu *cpu, uint64_t addr) { - g_assert(addr); + if (!addr) { + return 0; + } GByteArray *buf =3D cpu->buf; g_byte_array_set_size(buf, 0); bool read =3D qemu_plugin_read_memory_vaddr(addr, buf, 8); @@ -449,10 +453,8 @@ static void cpu_unwind_stack(Cpu *cpu, uint64_t frame_= pointer, uint64_t pc) CallstackEntry e =3D {.frame_pointer =3D frame_pointer, .pc =3D pc= }; unwind[depth] =3D e; depth++; - if (frame_pointer) { - frame_pointer =3D cpu_read_memory64(cpu, frame_pointer); - } - pc =3D cpu_read_memory64(cpu, frame_pointer + 8); /* read previous= lr */ + frame_pointer =3D cpu->ops.get_next_frame_pointer(cpu, frame_point= er); + pc =3D cpu->ops.get_next_return_address(cpu, frame_pointer); } while (frame_pointer && pc && depth < UNWIND_STACK_MAX_DEPTH); #undef UNWIND_STACK_MAX_DEPTH =20 @@ -545,6 +547,16 @@ static uint64_t aarch64_get_frame_pointer(Cpu *cpu_) return cpu_read_register64(cpu_, cpu->reg_fp); } =20 +static uint64_t aarch64_get_next_frame_pointer(Cpu *cpu_, uint64_t fp) +{ + return cpu_read_memory64(cpu_, fp); +} + +static uint64_t aarch64_get_next_return_address(Cpu *cpu_, uint64_t fp) +{ + return cpu_read_memory64(cpu_, fp + 8); +} + static void aarch64_init(Cpu *cpu_) { Aarch64Cpu *cpu =3D g_new0(Aarch64Cpu, 1); @@ -580,6 +592,8 @@ static CpuOps aarch64_ops =3D { .init =3D aarch64_init, .end =3D aarch64_end, .get_frame_pointer =3D aarch64_get_frame_pointer, + .get_next_frame_pointer =3D aarch64_get_next_frame_pointer, + .get_next_return_address =3D aarch64_get_next_return_address, .get_privilege_level =3D aarch64_get_privilege_level, .num_privilege_levels =3D aarch64_num_privilege_levels, .get_privilege_level_name =3D aarch64_get_privilege_level_name, @@ -623,6 +637,16 @@ static uint64_t x64_get_frame_pointer(Cpu *cpu_) return cpu_read_register64(cpu_, cpu->reg_rbp); } =20 +static uint64_t x64_get_next_frame_pointer(Cpu *cpu_, uint64_t fp) +{ + return cpu_read_memory64(cpu_, fp); +} + +static uint64_t x64_get_next_return_address(Cpu *cpu_, uint64_t fp) +{ + return cpu_read_memory64(cpu_, fp + 8); +} + static void x64_init(Cpu *cpu_) { X64Cpu *cpu =3D g_new0(X64Cpu, 1); @@ -649,6 +673,8 @@ static CpuOps x64_ops =3D { .init =3D x64_init, .end =3D x64_end, .get_frame_pointer =3D x64_get_frame_pointer, + .get_next_frame_pointer =3D x64_get_next_frame_pointer, + .get_next_return_address =3D x64_get_next_return_address, .get_privilege_level =3D x64_get_privilege_level, .num_privilege_levels =3D x64_num_privilege_levels, .get_privilege_level_name =3D x64_get_privilege_level_name, @@ -710,7 +736,7 @@ static void track_callstack(unsigned int cpu_index, voi= d *udata) return; } =20 - uint64_t caller_fp =3D fp ? cpu_read_memory64(cpu, fp) : 0; + uint64_t caller_fp =3D cpu->ops.get_next_frame_pointer(cpu, fp); if (caller_fp =3D=3D top.frame_pointer) { /* call */ callstack_push(cs, (CallstackEntry){.frame_pointer =3D fp, .pc =3D= pc}); --=20 2.47.3