From nobody Fri Oct 3 23:06:00 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.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 7348E143C61 for ; Sat, 23 Aug 2025 00:32:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755909177; cv=none; b=NaENB89s876wUWOaiF+bnwoJhGR5gsTqCq96yK+h3ZJ/dwGIPRdyWGATcTM1nJ5ZA0jh7sSPVOi5qWtp2+tqxbY8VuvplpTIXi//STXik1Tnypqgu9wJsg7W3JmWp4zDCHWufhi8bGIiA1Ww7NmPI9rzajWcx8SHBc352p2MG6k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755909177; c=relaxed/simple; bh=oMNPPVuQWueuqeTaC6AVAq9hnK5DBHVL3OMBSxQCNXc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=AKPEW1ZYn/uBfjycrboDuupGqy69jONKYNO/eJPG7j5g7BccsiYb2TKSBOj2TfZ7l8zW5E12okyc4n1LwNWrmewp8LVzMOl1D4wIHf2xLrzoOJltdrUJE+2vZEaPq8SlChWhkgWj1zWWjqdsUIePIyfawjaWVhqPbbrK+/BsRXg= 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=0kQKZkQB; arc=none smtp.client-ip=209.85.214.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="0kQKZkQB" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-244581ce388so57646475ad.2 for ; Fri, 22 Aug 2025 17:32:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755909175; x=1756513975; 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=xNiFno0XS+i9yOAQUiwWzS21Iglobe5u+DScZb3psQ8=; b=0kQKZkQBQb6uLI1TtotF5kQa9PuJVnjleSplklVRsoCWNDW96oEXo8on5OEfiIfxxq qMc6a9hZv0zWF9rT1JZj50EucRepyV16pnnZJKvBhdWJatP06yWYsfOUgYF9ShWq3AXa 6jt7jzgpoUJK3HqQ4sjMUpan4BpQ0rraWvZNiUd5rjziOlNlOLne/CKb+LnoaDPI6+ks ZS9aYU/8LkHBYFLPAPonYy4YQRSrzhU9N93kxMu/7WtKXvcTcVlGQG2hnV/4CKqWioFy uJHUjp+93pz+NucZDcnPXdfCMwWVueXg9JiaGiOU34o+bgvTle6b/i7cBpirKzWQ/IYw nOMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755909175; x=1756513975; 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=xNiFno0XS+i9yOAQUiwWzS21Iglobe5u+DScZb3psQ8=; b=J6lH+OgPyhiv8+hZpwuLsyQZP3Vlz44Ys5j5vgrczwq7k/K8VJDKQy3SyN79PV5tvG SoiB8azd+RW43fUrBBXrS21Ln7A32YCtGhNBDMw0ArJJ0Ywjom7K3RcY0dEg8egWdjdt CVpOOjFyZwLU7qcg5AWG5TBqWn6PywGAc08yq4Z2gGJ0Wjni0SHx6CxDf4D3i62n4ice ZVtCTJEsg2V9j7EEnUu0Ax17BEeaxSVuzfLT7BC5dzockG4YFso7uFXWjGbgbqqhtBNh kqCGcHDHFSoT9mNM1S2YdeUT0BASA0A6ApwbnHV+08rONpHEr2YkABpU9wuW7daJoy0W 4n9w== X-Forwarded-Encrypted: i=1; AJvYcCU5s/G2f1Km0Mn8SFufVGzDsUDEvlmPm1LPaKzDa9Pn91yhGO2JLIwbkwAMoh5A7+F7p7Kb3XoFl8UetBQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyZZU4Q876bhZZlrw26nqvpssgIdkrfR/FclnLm3iiQ+8h2SjjY 3YbgeKKWVfBuNrGGtEjiNGuhvEUi2TPgzwwtH8WJcPIka5rxErLV7qMfVomTj2KlCNwR5UWIj58 87tf7/BxENA== X-Google-Smtp-Source: AGHT+IHyLv9syzy5lC6+KqrMJVbX4BQiVno/sGwJNoIqQ9CLYpfd/7+Vm5oy4fKcRhcoOhNH0ahMu23+toeX X-Received: from plbme5.prod.google.com ([2002:a17:902:fc45:b0:235:6d5:688b]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ce81:b0:246:6446:8ae1 with SMTP id d9443c01a7336-2466446a05cmr27382065ad.19.1755909174770; Fri, 22 Aug 2025 17:32:54 -0700 (PDT) Date: Fri, 22 Aug 2025 17:32:08 -0700 In-Reply-To: <20250823003216.733941-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: <20250823003216.733941-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.rc2.233.g662b1ed5c5-goog Message-ID: <20250823003216.733941-13-irogers@google.com> Subject: [PATCH v5 12/19] perf dso: Clean up read_symbol error handling From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Aditya Gupta , "Steinar H. Gunderson" , Charlie Jenkins , Changbin Du , "Masami Hiramatsu (Google)" , James Clark , Kajol Jain , Athira Rajeev , Li Huafei , Dmitry Vyukov , Andi Kleen , Chaitanya S Prakash , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, llvm@lists.linux.dev, Song Liu , bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Ensure errno is set and return to caller for error handling. Unusually for perf the value isn't negated as expected by symbol__strerror_disassemble. Signed-off-by: Ian Rogers --- tools/perf/util/capstone.c | 3 ++- tools/perf/util/dso.c | 14 ++++++++++++-- tools/perf/util/llvm.c | 3 ++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/capstone.c b/tools/perf/util/capstone.c index 5aeae261f7ee..88e270237443 100644 --- a/tools/perf/util/capstone.c +++ b/tools/perf/util/capstone.c @@ -12,6 +12,7 @@ #include "symbol.h" #include "thread.h" #include +#include #include #include #include @@ -463,7 +464,7 @@ int symbol__disassemble_capstone(const char *filename _= _maybe_unused, buf =3D dso__read_symbol(dso, filename, map, sym, &code_buf, &buf_len, &is_64bit); if (buf =3D=3D NULL) - return -1; + return errno; =20 /* add the function address and name */ scnprintf(disasm_buf, sizeof(disasm_buf), "%#"PRIx64" <%s>:", diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 277c7e81f1c8..0f2051285393 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1831,6 +1831,7 @@ const u8 *dso__read_symbol(struct dso *dso, const cha= r *symfs_filename, =20 if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_IMAGE) { pr_debug("No BPF image disassembly support\n"); + errno =3D EOPNOTSUPP; return NULL; } else if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_PROG_INFO) { #ifdef HAVE_LIBBPF_SUPPORT @@ -1849,6 +1850,7 @@ const u8 *dso__read_symbol(struct dso *dso, const cha= r *symfs_filename, assert(len <=3D info_linear->info.jited_prog_len); #else pr_debug("No BPF program disassembly support\n"); + errno =3D EOPNOTSUPP; return NULL; #endif } else { @@ -1859,26 +1861,34 @@ const u8 *dso__read_symbol(struct dso *dso, const c= har *symfs_filename, .ip =3D start, }; u8 *code_buf =3D NULL; + int saved_errno; =20 nsinfo__mountns_enter(dso__nsinfo(dso), &nsc); fd =3D open(symfs_filename, O_RDONLY); + saved_errno =3D errno; nsinfo__mountns_exit(&nsc); - if (fd < 0) + if (fd < 0) { + errno =3D saved_errno; return NULL; + } =20 - if (file__read_maps(fd, /*exe=3D*/true, find_file_offset, &data, is_64bi= t) =3D=3D 0) { + if (file__read_maps(fd, /*exe=3D*/true, find_file_offset, &data, is_64bi= t) <=3D 0) { close(fd); + errno =3D ENOENT; return NULL; } buf =3D code_buf =3D malloc(len); if (buf =3D=3D NULL) { close(fd); + errno =3D ENOMEM; return NULL; } count =3D pread(fd, code_buf, len, data.offset); + saved_errno =3D errno; close(fd); if ((u64)count !=3D len) { free(code_buf); + errno =3D saved_errno; return NULL; } *out_buf =3D code_buf; diff --git a/tools/perf/util/llvm.c b/tools/perf/util/llvm.c index a28f130c8951..1607364ee736 100644 --- a/tools/perf/util/llvm.c +++ b/tools/perf/util/llvm.c @@ -9,6 +9,7 @@ #include "srcline.h" #include "symbol.h" #include +#include #include #include #include @@ -365,7 +366,7 @@ int symbol__disassemble_llvm(const char *filename, stru= ct symbol *sym, buf =3D dso__read_symbol(dso, filename, map, sym, &code_buf, &buf_len, &is_64bit); if (buf =3D=3D NULL) - return -1; + return errno; =20 init_llvm(); if (arch__is(args->arch, "x86")) { --=20 2.51.0.rc2.233.g662b1ed5c5-goog