From nobody Wed Dec 17 21:14:20 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 C69B82C08B1 for ; Sun, 5 Oct 2025 21:22:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759699353; cv=none; b=Xu5DgVlQ6KzUoxXNYMRJsQ84SzNkVp4KwAEt1dRmZZNZuTOzqWAYM3PCMhRgm0HgJatHFGfCDKD5RMTLMfIiwaemIAUS9LAb74P4snjXxeaVxz5hH2TLVFNhJJC9qLjJvjxBX9G+xrPextE4dWl9bEHoxvwbWWyibNG+VKrKGmc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759699353; c=relaxed/simple; bh=Apk/dx4vry6NQH8mEaGDTQ4foAvl3cC+7BrNRcZnR4k=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=rbLVBrGnXX9I6etXoY5QoNTZYBzHZurzCC3Ew7HQrx/BYSvOcJQqIwfI1qdf7iCs2kGHmM+Tq2Hl6hWQKeFTfl9dwwMu0cJvU50j/pzZJseNL8cPRw33UaMx1i9LVGAb3wiqdlkFMjQzNfupRUDlIC236VAlaF5K+B4cVrIfqPA= 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=Qojujbkf; arc=none smtp.client-ip=209.85.214.202 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="Qojujbkf" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-286a252bfbfso83842355ad.3 for ; Sun, 05 Oct 2025 14:22:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759699351; x=1760304151; 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=DCU0ELaC9EV+pXq9bhGKOQtESKkLJzIPHgh+H1HErVM=; b=QojujbkfO5KiFAtldBpCsGcEmNRwxdIk1ERELte4Y78gihIoIZsWvq3zjLPWPIO6X8 4otoWE+vzvRAnp+8Sn9v9DtNO/VsHqRMg2kSpmWLSOJSsOyTbt+bP82ELLcdLeA17kly 5aPIa4j8KsdsXiL1yo67669f5H5GLMk1rTACliY47QtjYAo18DbyLwVeiwTrhFsnlutO HeyG/jvvY6UI6mHzN0afI2CIGDdSLdkOdpam7C4YB7zxOAZkx4wkB/j7Hs7qBbjJZMdI hhNb4ucf1GFO3ksVowYg0iDJwlGMtRb1TsMgsDACje2N239YlZFQ3d3Fage0IqFGtoU/ bo+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759699351; x=1760304151; 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=DCU0ELaC9EV+pXq9bhGKOQtESKkLJzIPHgh+H1HErVM=; b=AhXwsjM/b/MPPAp8IkKLXlX0LF/u4wdIC3L5P2R4oD2O9pu8qKF2K5UJfv5RaT7MqZ HYn87z+v1oUP05icfrL9b+8yVWTt3cUmxPe1DXnhcpCJWlIG+5iRwsyDrIC3BiC+gkQi 4VUWXw6FWSySzBF5p5HQPTGLLsAJbpBlUvV2qRjY8wuwmqMpN/WNwzK48fVDqjf6WBTD Fg49AeoItxdXb5nHea0CkRWd0+YcCUTlvTYtA00e+A8ZyZnW8UOUxgFGbHbY4atw109q e15xx6htyWqXakeY0lc7BY5K/AWCP/7fAoJg0H+0QV2hUExwfLx2dC9Lr+9C1Y4r2dVS AJvQ== X-Forwarded-Encrypted: i=1; AJvYcCXH9t59N5tVnWatSM6qokOLJEBhUAkJHBX2ZspWhm6MyuQmyl7F0orLZ/lVUQXjRLO0Ab2PTHpda4X3c54=@vger.kernel.org X-Gm-Message-State: AOJu0YxnPc2pajtXI8l0mpgopRWjKfzea1vIx+WKYi5GYiqOdGMt39xx 2lTEd6gq3PMXFYQc6K94xJ/UBQ35TSimPJ0b+sdISctWFKpzugd9mVXfr/KC2YuO8R8e96iBtMb 0EZ/TN1/4eQ== X-Google-Smtp-Source: AGHT+IEObakE2dl7ZB3J7e6NcFFPXma/CZs3oBgvcFiNAqIU+hl2VJBrud9gEmmuxGfQ8861tRaCUUzuXCrN X-Received: from plpa4.prod.google.com ([2002:a17:902:9004:b0:28e:804c:cc96]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2b04:b0:27e:ed58:25e5 with SMTP id d9443c01a7336-28e9a5b037fmr121304265ad.24.1759699351184; Sun, 05 Oct 2025 14:22:31 -0700 (PDT) Date: Sun, 5 Oct 2025 14:22:06 -0700 In-Reply-To: <20251005212212.2892175-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: <20251005212212.2892175-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251005212212.2892175-6-irogers@google.com> Subject: [PATCH v7 05/11] perf dso: Clean up read_symbol error handling From: Ian Rogers To: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Charlie Jenkins , Eric Biggers , "Masami Hiramatsu (Google)" , James Clark , Collin Funk , "Dr. David Alan Gilbert" , Li Huafei , Athira Rajeev , Stephen Brennan , Dmitry Vyukov , Alexandre Ghiti , Haibo Xu , Andi Kleen , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org, llvm@lists.linux.dev, Song Liu 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 | 15 ++++++++++++--- tools/perf/util/llvm.c | 3 ++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/capstone.c b/tools/perf/util/capstone.c index c23df911e91c..be5fd44b1f9d 100644 --- a/tools/perf/util/capstone.c +++ b/tools/perf/util/capstone.c @@ -11,6 +11,7 @@ #include "print_insn.h" #include "symbol.h" #include "thread.h" +#include #include #include =20 @@ -245,7 +246,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 0aed5c8691bd..344e689567ee 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1827,26 +1827,33 @@ static const u8 *__dso__read_symbol(struct dso *dso= , const char *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; - - if (file__read_maps(fd, /*exe=3D*/true, find_file_offset, &data, is_64bit= ) =3D=3D 0) { + } + if (file__read_maps(fd, /*exe=3D*/true, find_file_offset, &data, is_64bit= ) <=3D 0) { close(fd); + errno =3D ENOENT; return NULL; } code_buf =3D malloc(len); if (code_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; @@ -1875,6 +1882,7 @@ const u8 *dso__read_symbol(struct dso *dso, const cha= r *symfs_filename, * Note, there is fallback BPF image disassembly in the objdump * version but it currently does nothing. */ + errno =3D EOPNOTSUPP; return NULL; } if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_PROG_INFO) { @@ -1895,6 +1903,7 @@ const u8 *dso__read_symbol(struct dso *dso, const cha= r *symfs_filename, return (const u8 *)(uintptr_t)(info_linear->info.jited_prog_insns); #else pr_debug("No BPF program disassembly support\n"); + errno =3D EOPNOTSUPP; return NULL; #endif } diff --git a/tools/perf/util/llvm.c b/tools/perf/util/llvm.c index 0369f3adcdb6..2351393e33c5 100644 --- a/tools/perf/util/llvm.c +++ b/tools/perf/util/llvm.c @@ -7,6 +7,7 @@ #include "namespaces.h" #include "srcline.h" #include "symbol.h" +#include #include #include #include @@ -147,7 +148,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.618.g983fd99d29-goog