From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 D054C17C98E for ; Wed, 28 Aug 2024 12:46:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724849168; cv=none; b=gg2Sz9jKH+9ynwVudxBkZr3PlOvlq0JA/AIhLvZPgAhhS67rI387CKnWzSwlokdSpkaT9q7XaEpHuuPNlpE2NpbRpMzOsxPh4GbhcIWH/6AApPitUB/VlG94daT+kzSJDhrKoSwwFjdcdtL77moi/WRiCFJb0+0wsOW6+DmA038= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724849168; c=relaxed/simple; bh=/cT4Xi/eOAEvpHXHWvsJjX7/kGH9RbuoUARrWLTszIo=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=G92yXeZ+cvWCd5/iESqgn53J8xkOw9StMIVqoCHjlxb6D9/xDTIb8UNC3ORfEkMyWbTnqHJhJz9f8S6h/T7hyUYmXnrpmwjZ4YAgcbqCc/kt0P+5//GeUSVfrd6qzQTucC87qGjWm7f72NOfhOcj7vuQLL0WNaM2JjVoOAIGImA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=bqPT0FgF; arc=none smtp.client-ip=209.85.167.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="bqPT0FgF" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-5334a8a1b07so8362684e87.1 for ; Wed, 28 Aug 2024 05:46:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1724849165; x=1725453965; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=tF6sUHkqO4SD68+xzQN28GcD5wP4XnQ+wDIp9/AK6/w=; b=bqPT0FgFHsyU0G3EFTYeVAYqEjyEG4TGKN4uLTLEU2g7/QNSE3uAml5tp/91l5uEHK 43vxcwPJnCdw4mIolZkt34dIH7lIsAjt2Q9T8L/DB6Gk7sqGLtmogH9ynFenbEtZKN2S DEBCWOzLnqEdrG9kMlrpZrymTXS7sasbUiaCkxpaG5xVgk1/JGYhHg5BxSRXpnzNgSj+ 71HBMdsWuVKUQhrVnaUDYNhJ5C0NlLxmj0Y7/MABKhhswVjXVtSg+IerRAY0DuzShfq6 hPIE6KXI6KgKluPvNqXReXLxQgsuIxgZG4qh96k8s3keQpoUIHM8/8SgWgr5K+Q8foht g4cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724849165; x=1725453965; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tF6sUHkqO4SD68+xzQN28GcD5wP4XnQ+wDIp9/AK6/w=; b=NxSi4rX/JLEJ56x41VHcqOj29ZuG77GcE09I7yveZCMXFXZSoQiQrKQJ319c/SEzN/ rF+BE+oPUlEdtguA1XL2rrqeb3I9DE5RHG15/3Zja/rkD9XFwxWvCGNZqeRhRA7tuCWU GANEzMWPA5xB7yNC+yBROBOhYLiCr3DnsO2Yq4MzbRKZ0GUZKlrEkzUAUk0o/f/C41Iu 2TptTdeXgrEhMeVGgFwng437ye9Y6ISxDnXhcTJq/434nGd55/LOte0jNtDDm7z7yax/ /826VrDDGNXWrWJdGMDDBJNloIz7m1X5RoBfyNfz8YYJhK1f+gTL7f/fsNjVught8WSz g6tg== X-Forwarded-Encrypted: i=1; AJvYcCU6A4oNMjWt+Qh4d3t3awSllgLFsr7C/O6CjQT8oNmc/AOqDCkyTSMpxISgoWMixy77HaWMXZ8Mn2p+nxo0@vger.kernel.org X-Gm-Message-State: AOJu0YxfZ7+6fP3RgwfIKw2p2rOA9dZ4Pq88vWGgmZ6Br8i/6kgHVf50 KvGXJ0DeFz24m43u/pXugK9CgTkbTAlE9rcGiPzzexwewxiQkqTQT/0p6kiDPxxDJiWe1Nt1i4h OFqY= X-Google-Smtp-Source: AGHT+IHro9qeKaCY792yMnKxlwgxFiEDVsOC5d/A0lnJdSBAxKmmf92zy4Bd/E6/xRJrnEvtOOeR/Q== X-Received: by 2002:a05:6512:ac7:b0:533:6f3:9857 with SMTP id 2adb3069b0e04-5343882e19bmr11853046e87.5.1724849164718; Wed, 28 Aug 2024 05:46:04 -0700 (PDT) Received: from [10.100.51.161] ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a86e582d896sm243412366b.131.2024.08.28.05.46.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 28 Aug 2024 05:46:04 -0700 (PDT) Message-ID: <742f7226-9c66-4cfb-ba31-222dfb54fc34@suse.com> Date: Wed, 28 Aug 2024 14:46:03 +0200 Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 05/19] gendwarfksyms: Expand base_type To: Sami Tolvanen Cc: Masahiro Yamada , Luis Chamberlain , Miguel Ojeda , Greg Kroah-Hartman , Matthew Maurer , Alex Gaynor , Wedson Almeida Filho , Gary Guo , Petr Pavlu , Neal Gompa , Hector Martin , Janne Grunau , Asahi Linux , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, rust-for-linux@vger.kernel.org References: <20240815173903.4172139-21-samitolvanen@google.com> <20240815173903.4172139-26-samitolvanen@google.com> Content-Language: en-US From: Petr Pavlu In-Reply-To: <20240815173903.4172139-26-samitolvanen@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 8/15/24 19:39, Sami Tolvanen wrote: > Start making gendwarfksyms more useful by adding support for > expanding DW_TAG_base_type types and basic DWARF attributes. > > Example: > > $ echo loops_per_jiffy | \ > scripts/gendwarfksyms/gendwarfksyms --debug vmlinux.o > ... > gendwarfksyms: process_exported_symbols: loops_per_jiffy > variable base_type unsigned long byte_size(8) encoding(7); > ... > > Signed-off-by: Sami Tolvanen > --- > scripts/gendwarfksyms/dwarf.c | 121 +++++++++++++++++++++++++++++++++- > 1 file changed, 120 insertions(+), 1 deletion(-) > > diff --git a/scripts/gendwarfksyms/dwarf.c b/scripts/gendwarfksyms/dwarf.c > index 956b30224316..a37c9049d18e 100644 > --- a/scripts/gendwarfksyms/dwarf.c > +++ b/scripts/gendwarfksyms/dwarf.c > @@ -5,6 +5,17 @@ > > #include "gendwarfksyms.h" > > +#define DEFINE_GET_ATTR(attr, type) \ > + static bool get_##attr##_attr(Dwarf_Die *die, unsigned int id, \ > + type *value) \ > + { \ > + Dwarf_Attribute da; \ > + return dwarf_attr(die, id, &da) && \ > + !dwarf_form##attr(&da, value); \ > + } > + > +DEFINE_GET_ATTR(udata, Dwarf_Word) > + > static bool get_ref_die_attr(Dwarf_Die *die, unsigned int id, Dwarf_Die *value) > { > Dwarf_Attribute da; > @@ -60,6 +71,74 @@ static int process(struct state *state, const char *s) > return 0; > } > > +#define MAX_FMT_BUFFER_SIZE 128 > + > +static int process_fmt(struct state *state, const char *fmt, ...) Nit: The state parameter is unused by a number of these process_*() functions, including the leaf process(). I suggest removing it so it doesn't need to be passed around unnecessarily. > +{ > + char buf[MAX_FMT_BUFFER_SIZE]; > + va_list args; > + int res; > + > + va_start(args, fmt); > + > + res = checkp(vsnprintf(buf, sizeof(buf), fmt, args)); > + if (res >= MAX_FMT_BUFFER_SIZE - 1) { This check looks off by one, though on the safe side: res >= sizeof(buf) > + error("vsnprintf overflow: increase MAX_FMT_BUFFER_SIZE"); > + res = -1; > + } else { > + res = check(process(state, buf)); > + } > + > + va_end(args); > + return res; > +} > + > +/* Process a fully qualified name from DWARF scopes */ > +static int process_fqn(struct state *state, Dwarf_Die *die) > +{ > + Dwarf_Die *scopes = NULL; > + const char *name; > + int res; > + int i; > + > + res = checkp(dwarf_getscopes_die(die, &scopes)); > + if (!res) { > + name = get_name(die); > + name = name ?: ""; > + return check(process(state, name)); > + } > + > + for (i = res - 1; i >= 0; i--) { > + if (dwarf_tag(&scopes[i]) == DW_TAG_compile_unit) > + continue; > + > + name = get_name(&scopes[i]); > + name = name ?: ""; > + check(process(state, name)); > + if (i > 0) > + check(process(state, "::")); Failed check(process()) calls here return immediately and so would leak scopes. However, I see this is fixed in the following patch "gendwarfksyms: Add a cache for processed DIEs" so it's ok. > + } > + > + free(scopes); > + return 0; > +} > + > +#define DEFINE_PROCESS_UDATA_ATTRIBUTE(attribute) \ > + static int process_##attribute##_attr(struct state *state, \ > + Dwarf_Die *die) \ > + { \ > + Dwarf_Word value; \ > + if (get_udata_attr(die, DW_AT_##attribute, &value)) \ > + check(process_fmt(state, \ > + " " #attribute "(%" PRIu64 ")", \ > + value)); \ > + return 0; \ > + } > + > +DEFINE_PROCESS_UDATA_ATTRIBUTE(alignment) > +DEFINE_PROCESS_UDATA_ATTRIBUTE(byte_size) > +DEFINE_PROCESS_UDATA_ATTRIBUTE(encoding) > + > bool match_all(Dwarf_Die *die) > { > return true; > @@ -81,6 +160,44 @@ int process_die_container(struct state *state, Dwarf_Die *die, > return 0; > } > > +static int process_type(struct state *state, Dwarf_Die *die); > + > +static int process_type_attr(struct state *state, Dwarf_Die *die) > +{ > + Dwarf_Die type; > + > + if (get_ref_die_attr(die, DW_AT_type, &type)) > + return check(process_type(state, &type)); > + > + /* Compilers can omit DW_AT_type -- print out 'void' to clarify */ > + return check(process(state, "base_type void")); > +} > + > +static int process_base_type(struct state *state, Dwarf_Die *die) > +{ > + check(process(state, "base_type ")); > + check(process_fqn(state, die)); > + check(process_byte_size_attr(state, die)); > + check(process_encoding_attr(state, die)); > + return check(process_alignment_attr(state, die)); > +} > + > +static int process_type(struct state *state, Dwarf_Die *die) > +{ > + int tag = dwarf_tag(die); > + > + switch (tag) { > + case DW_TAG_base_type: > + check(process_base_type(state, die)); > + break; > + default: > + debug("unimplemented type: %x", tag); > + break; > + } > + > + return 0; > +} > + > /* > * Exported symbol processing > */ > @@ -91,7 +208,9 @@ static int process_subprogram(struct state *state, Dwarf_Die *die) > > static int process_variable(struct state *state, Dwarf_Die *die) > { > - return check(process(state, "variable;\n")); > + check(process(state, "variable ")); > + check(process_type_attr(state, die)); > + return check(process(state, ";\n")); > } > > static int process_symbol_ptr(struct state *state, Dwarf_Die *die) -- Thanks, Petr