From nobody Tue Dec 2 01:06:35 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 C485D278E47 for ; Mon, 1 Dec 2025 20:55:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764622548; cv=none; b=Fm0CaWDISUSfheTeaw/jBL+MtwQigmdwx6KAbSGTHBeoeRKoNzxwfpvSumeQjpqhjPWOzQrW2+a2Wmt/gdYZIL6SvGF08cQtk/HVJNsry9VCUjJHaTb6VzVpsRsAryh93at5CUequDe5YzzAru/zpkdaV41KW8PjDk9lo4l5qUk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764622548; c=relaxed/simple; bh=fjLI72kegeSJqfZ6jGUOurYAdTweSGw5ZtcUlLf1AoM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=Q2NmhZOmKebP7S9uiOzILLx5SF2OkLn1zc0Udu35ud3bu8tvkL/cE31JMKn0wP839ybnmPmo4A+4nU7EXkJi9H3FmXaus8uO45KSGgtBpQA8q0aJ56C0QCOvLiAJhTroWU4TwLIWPCNG0NQrK063SPX9+cnz74a6tHnscoa1drQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=IYHQy8Pv; arc=none smtp.client-ip=209.85.215.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--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="IYHQy8Pv" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-bddf9ce4935so3701715a12.1 for ; Mon, 01 Dec 2025 12:55:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764622546; x=1765227346; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=c7HvpJfXVkoUBz8+ZXfXdSN3qFolYiwgdTVJfU/maPo=; b=IYHQy8PvH+rEkVJaR55cp0WNy5u8nfe9lJSRDg4bp0Gr881BEwJwvlZOZqrzp8kOo7 QPsAT5gJoc51bBr31IzBmobLUf936C+quSi8d/z9xem5VcOqUAp+hfmNQBXisvsiUoVX P9hs9MagOHUM7aGfzbjl8/faE1KLLFXz1O/Xxs9PltShAv7ZG6C79a/412kgkW6uBmvH ASG9UJYbjVkYqOiNCkRCeTqfWJlm27y3tZW+6+N9J9lO5FEGTjQMSzwenVdLKl+RivBL hYOlEeJ2ZJmeTSTAyJfrDUKsDs/zcO9Y4++3L2+/hg/emch84nsIxgSzxDUzPQ5uCYCB mvJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764622546; x=1765227346; h=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=c7HvpJfXVkoUBz8+ZXfXdSN3qFolYiwgdTVJfU/maPo=; b=Zd/ysD4ZEuUDRT25VfqXNwbufZWHEOv/0oJf1AI6L0brsH6uz8JbT3bP5RQPYvNO9q 3ZW4GRiv+PjdxrzMUPFdirox62dIvgtC02bg5cKrtsNn9TfGPq+O5wX/cWE4BtuyQRmY W6E0b5K/ZE1EBO34FAmxxC1FwUDp6dcTopwbHEjU0abUtTEhPNTPLM/RiicXvKAk2gg/ q+CzDxj3XKsQu0Dnxfp8pJesIgiUdFMjoQe/wwc/dVpgq0IqWJfatPixIrxtTjbOgKCB Ydyr9ha8ZAIHtkr4cMUmbRj1iBzuzULZYJFY1FetFrI9p0agO4qIiu4czllkGrpyjvpd CXTg== X-Forwarded-Encrypted: i=1; AJvYcCVXFA4q/UaRo4+jDnbPIZilyWOHFhFmaQSKS9Xm2FS2sgfJP3/i/nx8O/Oqjn2weA2d/E/X2Wy+QeYRxwI=@vger.kernel.org X-Gm-Message-State: AOJu0YxkCUNY0Xuq3kG1JhXiDLA4btCovhs0Yz23DHP+nf1boquir3ZL KaofjtUt1bAwqZGDC79b9lXCgnydfLlZ1PC6gicf+YXAaBhAYcc3QFk/To26Ia3HwKvglSPSw1G MHBGJ6ZBc4Q== X-Google-Smtp-Source: AGHT+IGOxiUBhvMxSqyCELGqzF5enfB5jhNuSSvdzglSimtj4YnpmrdDi5VRYzuCfIRwh+KGF1PB54ol3qFa X-Received: from dybqf13.prod.google.com ([2002:a05:7301:648d:b0:2a4:7cf4:5bc0]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:d4cd:b0:2a4:5eaa:a9a7 with SMTP id 5a478bee46e88-2a9415730cemr17893504eec.1.1764622546182; Mon, 01 Dec 2025 12:55:46 -0800 (PST) Date: Mon, 1 Dec 2025 12:55:06 -0800 In-Reply-To: <20251201205509.195451-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251201205509.195451-1-irogers@google.com> X-Mailer: git-send-email 2.52.0.158.g65b55ccf14-goog Message-ID: <20251201205509.195451-8-irogers@google.com> Subject: [PATCH v2 07/10] perf symbol: Use fallbacks for filename__read_debuglink From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Suzuki K Poulose , Mike Leach , James Clark , John Garry , Will Deacon , Leo Yan , Athira Rajeev , tanze , Stephen Brennan , Andi Kleen , Chun-Tse Shao , Thomas Falcon , Dapeng Mi , "Dr. David Alan Gilbert" , Christophe Leroy , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , "Masami Hiramatsu (Google)" , Alexandre Ghiti , Haibo Xu , Sergei Trofimovich , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Try libbfd and then libelf in symbol.c. Remove the non-existent symbol-minimal version. Signed-off-by: Ian Rogers --- tools/perf/util/perf-libelf.c | 52 +++++++++++++++++++++++++++++ tools/perf/util/perf-libelf.h | 10 ++++++ tools/perf/util/symbol-elf.c | 56 -------------------------------- tools/perf/util/symbol-minimal.c | 9 ----- tools/perf/util/symbol.c | 10 ++++++ 5 files changed, 72 insertions(+), 65 deletions(-) diff --git a/tools/perf/util/perf-libelf.c b/tools/perf/util/perf-libelf.c index c7fa08a177d0..a8a8c39056da 100644 --- a/tools/perf/util/perf-libelf.c +++ b/tools/perf/util/perf-libelf.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "perf-libelf.h" =20 +#include #include #include #include @@ -143,3 +144,54 @@ int libelf__read_build_id(int _fd, const char *filenam= e, struct build_id *bid) out: return err; } + +int libelf_filename__read_debuglink(const char *filename, char *debuglink,= size_t size) +{ + int fd, err =3D -1; + Elf *elf; + GElf_Ehdr ehdr; + GElf_Shdr shdr; + Elf_Data *data; + Elf_Scn *sec; + Elf_Kind ek; + + fd =3D open(filename, O_RDONLY); + if (fd < 0) + goto out; + + elf =3D elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL); + if (elf =3D=3D NULL) { + pr_debug2("%s: cannot read %s ELF file.\n", __func__, filename); + goto out_close; + } + + ek =3D elf_kind(elf); + if (ek !=3D ELF_K_ELF) + goto out_elf_end; + + if (gelf_getehdr(elf, &ehdr) =3D=3D NULL) { + pr_err("%s: cannot get elf header.\n", __func__); + goto out_elf_end; + } + + sec =3D elf_section_by_name(elf, &ehdr, &shdr, + ".gnu_debuglink", NULL); + if (sec =3D=3D NULL) + goto out_elf_end; + + data =3D elf_getdata(sec, NULL); + if (data =3D=3D NULL) + goto out_elf_end; + + /* the start of this section is a zero-terminated string */ + strncpy(debuglink, data->d_buf, size); + + err =3D 0; + +out_elf_end: + elf_end(elf); +out_close: + close(fd); +out: + return err; +} diff --git a/tools/perf/util/perf-libelf.h b/tools/perf/util/perf-libelf.h index 931597493b1f..167679f9fc9b 100644 --- a/tools/perf/util/perf-libelf.h +++ b/tools/perf/util/perf-libelf.h @@ -2,6 +2,8 @@ #ifndef __PERF_LIBELF_H #define __PERF_LIBELF_H =20 +#include + struct build_id; =20 #ifdef HAVE_LIBELF_SUPPORT @@ -30,6 +32,7 @@ Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep, GEl= f_Shdr *shp, const char int __libelf__read_build_id(Elf *elf, void *bf, size_t size); =20 int libelf__read_build_id(int _fd, const char *filename, struct build_id *= bid); +int libelf_filename__read_debuglink(const char *filename, char *debuglink,= size_t size); =20 #else // !defined(HAVE_LIBELF_SUPPORT) =20 @@ -40,6 +43,13 @@ static inline int libelf__read_build_id(int fd __always_= unused, return -1; } =20 +static inline int libelf_filename__read_debuglink(const char *filename __a= lways_unused, + char *debuglink __always_unused, + size_t size __always_unused) +{ + return -1; +} + #endif // defined(HAVE_LIBELF_SUPPORT) =20 #endif /* __PERF_LIBELF_H */ diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 8fb7bf743ca6..9ceb746b6c59 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -801,62 +801,6 @@ int sysfs__read_build_id(const char *filename, struct = build_id *bid) return err; } =20 -int filename__read_debuglink(const char *filename, char *debuglink, - size_t size) -{ - int fd, err =3D -1; - Elf *elf; - GElf_Ehdr ehdr; - GElf_Shdr shdr; - Elf_Data *data; - Elf_Scn *sec; - Elf_Kind ek; - - err =3D libbfd_filename__read_debuglink(filename, debuglink, size); - if (err >=3D 0) - goto out; - - fd =3D open(filename, O_RDONLY); - if (fd < 0) - goto out; - - elf =3D elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL); - if (elf =3D=3D NULL) { - pr_debug2("%s: cannot read %s ELF file.\n", __func__, filename); - goto out_close; - } - - ek =3D elf_kind(elf); - if (ek !=3D ELF_K_ELF) - goto out_elf_end; - - if (gelf_getehdr(elf, &ehdr) =3D=3D NULL) { - pr_err("%s: cannot get elf header.\n", __func__); - goto out_elf_end; - } - - sec =3D elf_section_by_name(elf, &ehdr, &shdr, - ".gnu_debuglink", NULL); - if (sec =3D=3D NULL) - goto out_elf_end; - - data =3D elf_getdata(sec, NULL); - if (data =3D=3D NULL) - goto out_elf_end; - - /* the start of this section is a zero-terminated string */ - strncpy(debuglink, data->d_buf, size); - - err =3D 0; - -out_elf_end: - elf_end(elf); -out_close: - close(fd); -out: - return err; -} - bool symsrc__possibly_runtime(struct symsrc *ss) { return ss->dynsym || ss->opdsec; diff --git a/tools/perf/util/symbol-minimal.c b/tools/perf/util/symbol-mini= mal.c index b71cf8caf282..445307f230af 100644 --- a/tools/perf/util/symbol-minimal.c +++ b/tools/perf/util/symbol-minimal.c @@ -77,15 +77,6 @@ static int read_build_id(void *note_data, size_t note_le= n, struct build_id *bid, return -1; } =20 -#ifndef HAVE_LIBELF_SUPPORT -int filename__read_debuglink(const char *filename __maybe_unused, - char *debuglink __maybe_unused, - size_t size __maybe_unused) -{ - return -1; -} -#endif - /* * Just try PT_NOTE header otherwise fails */ diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 8d461974a69f..da75a1c159f2 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -2050,6 +2050,16 @@ int filename__read_build_id(const char *filename, st= ruct build_id *bid) return err; } =20 +int filename__read_debuglink(const char *filename, char *debuglink, size_t= size) +{ + int err =3D libbfd_filename__read_debuglink(filename, debuglink, size); + + if (err =3D=3D 0) + return 0; + + return libelf_filename__read_debuglink(filename, debuglink, size); +} + static char *dso__find_kallsyms(struct dso *dso, struct map *map) { struct build_id bid =3D { .size =3D 0, }; --=20 2.52.0.158.g65b55ccf14-goog