From nobody Fri Oct 3 21:07:25 2025 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 E2A052882DB for ; Mon, 25 Aug 2025 19:54:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756151666; cv=none; b=uV/1u3FR8brdCc6uZidvzPfHfuowqCa1rmhErHwj3GRKR9rsOFNPywZdUi7ED3TZEkSxLGKftB+FKsDcvrdHuuHvlun9lzdV3ePdXzn66O+ad+GL9x84chnF7oO3Le3eQGs/CJe2pR5GExuf9qMeEGrZzM3LejwuY+HYNaiHg7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756151666; c=relaxed/simple; bh=O6fi34kLE2WffLAMr8krbBKjYrYF9u/Vvi/W7cleMsA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ISwOFjz1p1FFPWQr2a2QuhXQ9StmkWB1u6NBS/S0WnP20y9N9kT6pT6afrX8YNjmd75aLIljqUYjW9Yo6yt/VRcsxSP5BC1Ki2lHOGHEwhHi16Y0VYB4X7fTvPCeLAZwhsBm/GIciDMXfzeYU5rjVuGFlliCG0KKrPUxbXiEhk4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--zecheng.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=C8KYsIyr; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--zecheng.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="C8KYsIyr" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-7210f3f176dso14633547b3.1 for ; Mon, 25 Aug 2025 12:54:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1756151664; x=1756756464; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=zirMWhl4xBXueLBkph4wktZqzKV75VLuK+PtwgK8OPo=; b=C8KYsIyrjuwZsffgZ6tMchBdm2u+KhPjz8AyktHrvSdcMcvlqjsjn7sjb/ahzKGMEw q8nUgvnTEjfllWthyym8QoVrD1hXD3TFu0XO+CDqaipbqaXLB6oR1/vVo9Ck5cT9x/eq xyIRqfRwvvVQP/s9L7Cu1dMCYr+f8Ab5RMAy9j9gTZAIayLb71amtkInnwPXsi072fTQ 7ruSXUntkeIxVj3Ik5kkIdDJ4W3Pk61yMPP7AuaByB5gw/Oifb/72FCv6+WbQNsm9TWo KEIAsGWxyOnrqWgxBSs5KDJWNJrG9qQ2LU2PaJqCEe8sdgGjxXcnUB0Awxq4TvOLsXYg K4yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756151664; x=1756756464; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zirMWhl4xBXueLBkph4wktZqzKV75VLuK+PtwgK8OPo=; b=jgaZkMCT+Is4lDr6fAouUwIWeVB6LVVY16pil7Gkun1pf4s2CvJXzgleU0hxm2WDBb N3Vrx8/Mz8H9RYjIa1Go+kTlFB3JFsGf+JUqh4YThymL5SBnC/Kz2Zblwuf7zHryBXfc Nkja4oOh5EAewotK1objk8zgFBXsEBLV5ORDUlsidVnuDlroMr4aqhUQJEZ2U3WLiDad clQ6+augV2Xqqu9X2lTezeAjQFYJk70oebdUqAj0sTqBf08bfhw5iI5FtKV+b8U0HZwi jrPEY2aWjXlFAkPHLmyrV2MPtsmWr5r5HwY/lrtqNI3T3SGBu8eg6jHDozrz7WOBuDBx blBg== X-Forwarded-Encrypted: i=1; AJvYcCXEqq/YVGVQuYedpS9qLsTZECQPGH1085UTfOySJwRw86FoQNLG1f/5BpX/QJutQN3vOnEl0zVggR6sXCI=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5K+v9Bd8DahLcsB0nbLROraSHJsinniJL7SADAw123wxMxJpK UTmP0BsHuTTsL6FJaRObkNxYgS0QfqYdA07NArigjdoaYwRhwfAsTSUYk9540Sqd2K1hdUzxlo/ oHcv0v2Apjg== X-Google-Smtp-Source: AGHT+IHhzKwxA3TibUrFn4/0MjLFsWXvqt/zUi25ZV8iNAIObgEPfgbxXUdrvADXK5z3Km0N7D3B+19FD6zM X-Received: from ywbhf7.prod.google.com ([2002:a05:690c:6007:b0:720:9ca4:8dec]) (user=zecheng job=prod-delivery.src-stubby-dispatcher) by 2002:a05:690c:5009:b0:71f:f942:8475 with SMTP id 00721157ae682-71ff94286camr77440607b3.11.1756151664027; Mon, 25 Aug 2025 12:54:24 -0700 (PDT) Date: Mon, 25 Aug 2025 19:54:05 +0000 In-Reply-To: <20250825195412.223077-1-zecheng@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250825195412.223077-1-zecheng@google.com> X-Mailer: git-send-email 2.51.0.261.g7ce5a0a67e-goog Message-ID: <20250825195412.223077-4-zecheng@google.com> Subject: [PATCH v2 03/10] perf dwarf-aux: Better variable collection for insn tracking From: Zecheng Li To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Masami Hiramatsu Cc: Xu Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Zecheng Li Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Utilizes the previous is_breg_access_indirect function to determine if the register + offset stores the variable itself or the struct it points to, save the information in die_var_type.is_reg_var_addr. Since we are storing the real types in the stack state, we need to do a type dereference when is_reg_var_addr is set to false for stack/frame registers. For other gp registers, skip the variable when the register is a pointer to the type. If we want to accept these variables, we might also utilize is_reg_var_addr in a different way, we need to mark that register as a pointer to the type. Signed-off-by: Zecheng Li Reviewed-by: Namhyung Kim --- tools/perf/util/annotate-data.c | 9 +++++++++ tools/perf/util/dwarf-aux.c | 11 ++++++++++- tools/perf/util/dwarf-aux.h | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/annotate-data.c b/tools/perf/util/annotate-dat= a.c index 1ef2edbc71d9..258157cc43c2 100644 --- a/tools/perf/util/annotate-data.c +++ b/tools/perf/util/annotate-data.c @@ -868,6 +868,11 @@ static void update_var_state(struct type_state *state,= struct data_loc_info *dlo int offset =3D var->offset; struct type_state_stack *stack; =20 + /* If the reg location holds the pointer value, dereference the type */ + if (!var->is_reg_var_addr && is_pointer_type(&mem_die) && + __die_get_real_type(&mem_die, &mem_die) =3D=3D NULL) + continue; + if (var->reg !=3D DWARF_REG_FB) offset -=3D fb_offset; =20 @@ -893,6 +898,10 @@ static void update_var_state(struct type_state *state,= struct data_loc_info *dlo =20 reg =3D &state->regs[var->reg]; =20 + /* For gp registers, skip the address registers for now */ + if (var->is_reg_var_addr) + continue; + if (reg->ok && reg->kind =3D=3D TSR_KIND_TYPE && !is_better_type(®->type, &mem_die)) continue; diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c index 449bc9ad7aff..6fd2db5d9381 100644 --- a/tools/perf/util/dwarf-aux.c +++ b/tools/perf/util/dwarf-aux.c @@ -1627,13 +1627,22 @@ static int __die_collect_vars_cb(Dwarf_Die *die_mem= , void *arg) if (!check_allowed_ops(ops, nops)) return DIE_FIND_CB_SIBLING; =20 - if (die_get_real_type(die_mem, &type_die) =3D=3D NULL) + if (__die_get_real_type(die_mem, &type_die) =3D=3D NULL) return DIE_FIND_CB_SIBLING; =20 vt =3D malloc(sizeof(*vt)); if (vt =3D=3D NULL) return DIE_FIND_CB_END; =20 + /* Usually a register holds the value of a variable */ + vt->is_reg_var_addr =3D false; + + if (((ops->atom >=3D DW_OP_breg0 && ops->atom <=3D DW_OP_breg31) || + ops->atom =3D=3D DW_OP_bregx || ops->atom =3D=3D DW_OP_fbreg) && + !is_breg_access_indirect(ops, nops)) + /* The register contains an address of the variable. */ + vt->is_reg_var_addr =3D true; + vt->die_off =3D dwarf_dieoffset(&type_die); vt->addr =3D start; vt->reg =3D reg_from_dwarf_op(ops); diff --git a/tools/perf/util/dwarf-aux.h b/tools/perf/util/dwarf-aux.h index 892c8c5c23fc..cd481ec9c5a1 100644 --- a/tools/perf/util/dwarf-aux.h +++ b/tools/perf/util/dwarf-aux.h @@ -148,6 +148,8 @@ struct die_var_type { u64 addr; int reg; int offset; + /* Whether the register holds a address to the type */ + bool is_reg_var_addr; }; =20 /* Return type info of a member at offset */ --=20 2.51.0.261.g7ce5a0a67e-goog