From nobody Sun Apr 5 16:31:35 2026 Received: from mail-yx1-f45.google.com (mail-yx1-f45.google.com [74.125.224.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CACB3E95B6 for ; Mon, 9 Mar 2026 17:55:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773078959; cv=none; b=mYInz0b8v/OhDhYIi6HqqomNIzXkDKhv3n0kPB7mCe+zTBmdMkGPi4m3DGksTuyxuKO+p5JUiONASb7ummFlaEdXYet3b2eoaa6y3oztEa3dkKPvEA33+cDlh9MmM5QiSJnaSBKs7yA6WxeO3Ly7N6+Df1T4wm67WCMcvKeMLus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773078959; c=relaxed/simple; bh=gr5gzJz+zJGQrTtkuM3wSWcpKQ5StwlicyaLJNKlcq0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a2XxQJpfIuu7bDmOZ9MKu/3z6hQMRTU7lHSBhLIHBUTmGKDFOy6HvDI+BD0wfGhvJaRpVR1HJQQk2LjdemeaW8szblGrt6iX06wj8fNfUpPoIWloMtT+CtWlrq6o365EvUdh7OJGVtIqVjX4aI56TSYCQUd7NGT1eX/UMcuOVVE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ncsu.edu; spf=pass smtp.mailfrom=ncsu.edu; dkim=pass (2048-bit key) header.d=ncsu.edu header.i=@ncsu.edu header.b=J2BgIqRf; arc=none smtp.client-ip=74.125.224.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ncsu.edu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ncsu.edu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ncsu.edu header.i=@ncsu.edu header.b="J2BgIqRf" Received: by mail-yx1-f45.google.com with SMTP id 956f58d0204a3-64ca6595c8aso11728141d50.0 for ; Mon, 09 Mar 2026 10:55:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncsu.edu; s=google; t=1773078954; x=1773683754; darn=vger.kernel.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=ejER9XjyWi4jI3dlIAUxOX0udAsfG8pEAsk5mvY+7tE=; b=J2BgIqRf4P4r3NWQVSgrDsiQ6aHB634LBci6lJez0270GAja1tQvlmVHFsmJNI7wwD Pr/JbWw3iYmYNH2vMZG//oRS1uaT+Qq2BHzYenTKiySNgiXqBk1Lwy/QxFwiWPNbDaYp hm7UTvDu/Bs0sREVynN+QAs8D8VWbBxJY5DdqXZ5mOmxmKsLnii+heAJ/xJCZcgpGkB9 XWoVWRF/LseXCW75XOyDj5wtVywrTKFgQX85K9F2L2NtbN/qEqep84+BA0PTXBEkHYYq VUyHKACzELZxhrfhRhDVuLlsVkrFo+QsBGz3+zAHe+adp3YxZlKSUZmGGZzn9DcXTaOc Rd+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773078954; x=1773683754; 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=ejER9XjyWi4jI3dlIAUxOX0udAsfG8pEAsk5mvY+7tE=; b=AbvPAZJ4kRcm5IJnNnq7HXIYMRR5rJbRJ43vJRRKYp9tvbQ63aYk94s7iaG8cke2ha QCzBMzYScGi5K5HHR6NBA+/5AWc09EyymNaPAnAUiQbe3E8wMdWq+Xw8IO3Rf5O9EmFZ F7bY8uoS7WybpxiusG7Z6axGttyFkp7Qw/CJ+ez6Gc6yzW9kIri2e3Rd61evWz8AV+mU yprBhggBc1N1j3ZWvsQo5ZHdaltFhgbgD6XuEKPLimna1oTWef4GmcV8VkIkrcAnRyXF ifRFj9IS3lBJYvOe7T66SzP799ruJ6DlYmT9rcoztd97ybgMQA/MWpwJLyDXbNq7RaOJ C6YQ== X-Forwarded-Encrypted: i=1; AJvYcCVkO4jGsqmGAP+k/nuvi4Ug28szd/Bq5biRZL/QcowLCARXh3UrlB8b+au6bmViBI4Hzd9yS6RrHONHHqA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz98y0mNgQOsRWvVkOnkNwfRfJjf4yFqyhhgt5LFHnGBueYyLWR 8S8DK0zGgKgc/kzLCAGaVF38di0fBOLIuYYicOT9UyCAahInlb8QAgHYaqZ0v2Z79w== X-Gm-Gg: ATEYQzziGLyKwzLKnan6lJPRgwvmvZrVDv8pzjvVYYUwaCadMGDN4HHgjMox5mxSvQe eBftCMFXGTgWyduBaPCxkXl2z+ntmyP2rwYnQpINUkU0+WNqv+64KC9ZXcycP0BItdMJRuQUiBk Nq9/ysHOaujG4lUd/2F+CHrhGmnzAcAE8M5AfVA1o+Q1vXZrKAjSzydI6+ZfUxkHwxHTFv0ONmU NGvVa43tT+3zwumdGGup8+3zLzkGKMlUEOG+AjqGZQURLLtpg0OQc6839UFURhR0v8BLEXteX1Q O7xxwQgeWtBebt4lbFQv8WvEDVF8lh0EYZpJPEdpJsvmSBP5MgZ4y7Hl7JoC4SNzqUdhk6opzzM Y1eSAY5HEfl114rEBaGRgNSv6cuVgQNFM3Rjn7brWxZt9mafS8k8aFHWE7EIVXEDpvIAwFALzpT 2HluqbY2aVVPxyOjMCkfKeHegfcBNu6Rr6GwhacQGLDPkAMZr7LLiQ/RuxUPfGVtkf1cs= X-Received: by 2002:a53:e194:0:b0:64a:d6eb:6e with SMTP id 956f58d0204a3-64d1436ec4fmr8312416d50.80.1773078953722; Mon, 09 Mar 2026 10:55:53 -0700 (PDT) Received: from um773-cachyos.sd.ncsu.edu ([152.7.255.206]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-64d176e70e7sm4992535d50.20.2026.03.09.10.55.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 10:55:53 -0700 (PDT) From: Zecheng Li To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim Cc: Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , Zecheng Li , xliuprof@google.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Zecheng Li Subject: [PATCH v2 02/11] perf dwarf-aux: Preserve typedefs in match_var_offset Date: Mon, 9 Mar 2026 13:55:15 -0400 Message-ID: <20260309175546.916039-3-zli94@ncsu.edu> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260309175546.916039-1-zli94@ncsu.edu> References: <20260309175546.916039-1-zli94@ncsu.edu> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Zecheng Li Preserve typedefs in match_var_offset to match the results by __die_get_real_type. Also move the (offset =3D=3D 0) branch after the is_pointer check to ensure the correct type is used, fixing cases where an incorrect pointer type was chosen when the access offset was 0. Signed-off-by: Zecheng Li Signed-off-by: Zecheng Li --- tools/perf/util/dwarf-aux.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c index 38142062d6e5..3b0fc9038f19 100644 --- a/tools/perf/util/dwarf-aux.c +++ b/tools/perf/util/dwarf-aux.c @@ -1405,6 +1405,8 @@ struct find_var_data { Dwarf_Addr addr; /* Target register */ unsigned reg; + /* Access data type */ + Dwarf_Die type; /* Access offset, set for global data */ int offset; /* True if the current register is the frame base */ @@ -1417,29 +1419,31 @@ struct find_var_data { static bool match_var_offset(Dwarf_Die *die_mem, struct find_var_data *dat= a, s64 addr_offset, s64 addr_type, bool is_pointer) { - Dwarf_Die type_die; Dwarf_Word size; + Dwarf_Die ptr_die; + Dwarf_Die *ptr_type; s64 offset =3D addr_offset - addr_type; =20 - if (offset =3D=3D 0) { - /* Update offset relative to the start of the variable */ - data->offset =3D 0; - return true; - } - if (offset < 0) return false; =20 - if (die_get_real_type(die_mem, &type_die) =3D=3D NULL) + if (__die_get_real_type(die_mem, &data->type) =3D=3D NULL) return false; =20 - if (is_pointer && dwarf_tag(&type_die) =3D=3D DW_TAG_pointer_type) { + ptr_type =3D die_get_pointer_type(&data->type, &ptr_die); + if (is_pointer && ptr_type) { /* Get the target type of the pointer */ - if (die_get_real_type(&type_die, &type_die) =3D=3D NULL) + if (__die_get_real_type(ptr_type, &data->type) =3D=3D NULL) return false; } =20 - if (dwarf_aggregate_size(&type_die, &size) < 0) + if (offset =3D=3D 0) { + /* Update offset relative to the start of the variable */ + data->offset =3D 0; + return true; + } + + if (dwarf_aggregate_size(&data->type, &size) < 0) return false; =20 if ((u64)offset >=3D size) --=20 2.53.0