From nobody Mon Feb 9 03:33:26 2026 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.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 08EE6218E9F for ; Wed, 22 Jan 2025 17:43:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737567821; cv=none; b=d6aW9wUwQAEDps0OCiFchFur4dqmRYIUw/mA84licytR3EhlKt9kswJtccWjxkYrrV5HnCE/XBAr7FH287fB+Okkyml+eu9OXEOCliqVSfw7RGItZzAd5wvUydfP6YzY15ZqwAZfWHIxHG3sv4b4oLXPnyUG59lMHoHVkOyORfA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737567821; c=relaxed/simple; bh=qDGVbxupBPhehpggHu43Ttvfz1Jydc4UfVpiUQ9BNUw=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=SSPK5mLEnwGpGgEQBvCypdM+PWyGXUS+mcowbXRP3ro2iTwrEUqz1WpR6yqzy/yV3pO4ByzPR2hXubP6ejwwBdxkCl8A8gcBywn0YTPWHB9D6/Rg4xc9I1nMHTAHswul2RX5DAl8eeRZjkdpvtoRG7E17jl7hSEsQxiq4PXVKu8= 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=Dlq/2Gyn; arc=none smtp.client-ip=209.85.219.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="Dlq/2Gyn" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e5742f52896so18076363276.3 for ; Wed, 22 Jan 2025 09:43:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1737567819; x=1738172619; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=G8iKYF3csT963Oh0FXrUrlrS8IS249puoLm4/xmteLU=; b=Dlq/2GynidgaXxIKElqlIRz5xJcHp5p/4+YBd/d+ZI2pU0u0kDMLkPQQkfx1WYpKn4 THfhprr7hckpY+wqj2KqRq5V2niH5hrwg3p+8f2DYf9eg7FEyItEk5gXhSgv7RJy+Ke9 y04QnIctg6SwAJnodM/1AeDSlIgCWHnIIJbUbzkrDNydvZgETHnMeVpXXebC8Hm3pvlY zRqs5fYgX7cwOUp94rEqJ3FWlKRT6uvw7uFGSLUiO/Zmc6tbRtQ/2TgnLEIbE+ripjJm sdgWh6ospjum0oCeB6StkCSRbAljU0d1XO9J6SPo5vNojczLdZk4QJJme2/nchfDmsBG 0jjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737567819; x=1738172619; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=G8iKYF3csT963Oh0FXrUrlrS8IS249puoLm4/xmteLU=; b=ofdIvFgKserzXaGDNBtYt2d+4BQn+wNpNrDGxnrZdWGmQSuUOQogu7qr5Ny94dzpIl 0Hi9VuRMIcmDnlXTaGDHG1btnyklmCb4iI8CpEpuDaf1IAORHs27hCbWelx6SRT0XR8/ T1ngSEXTsMzr+Lyr+kPR29s2rnyuyEY/BZqGBVbGH2vsG0RioCBVQFIuaan1HECil6jw HeUs5V4siJURrpxrGw1JSQwzvwC0UIl1VQ/vpMUnpEUwxbg3v+ybDbcWgoL8fkRgdKrp R3Z0ih3AoFbzCDSv6kl3WScDEG9lKvZ9M9AawWX9mOh+zfQrVv85OLKv1um0WNQzeStF OeBA== X-Forwarded-Encrypted: i=1; AJvYcCWamxsiMx9/SYuas7daY/ak3SL7lgRidBfYN60abKJ7Mlbjut1KrKdYYNb3O10MJBBgXCzmaH2ZX8Rfycw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5qHkR4CJK8XwAL5zTBplaApyOt5QePBVzFcCMDeGRmrCyDpZg mugGSVgUuSBleWdHOPsMjuSy5f1Y6Jle5zoAkVUhwOwrJf4TtxZYZRrNIGszF0xM2WJ9MvJVt5H z09Ntxg== X-Google-Smtp-Source: AGHT+IEtRfnG1IrLEczd4lBlgALNrOa6BIlr7CTXw96GqaqmTOdAqOOF5wM1aeXH+2lC6ztXYgWsTiZsp3cM X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:807b:be79:d5c3:ee5c]) (user=irogers job=sendgmr) by 2002:a25:b291:0:b0:e3d:da4c:7981 with SMTP id 3f1490d57ef6-e57b138d74bmr40604276.7.1737567819204; Wed, 22 Jan 2025 09:43:39 -0800 (PST) Date: Wed, 22 Jan 2025 09:43:02 -0800 In-Reply-To: <20250122174308.350350-1-irogers@google.com> Message-Id: <20250122174308.350350-13-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250122174308.350350-1-irogers@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog Subject: [PATCH v3 12/18] 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 f103988184c8..032548828925 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 a90799bed230..247e59605f26 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1697,6 +1697,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 @@ -1715,6 +1716,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 { @@ -1725,26 +1727,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.48.1.262.g85cc9f2d1e-goog