From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 AEDD6286D50 for ; Mon, 29 Sep 2025 19:09:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759172957; cv=none; b=NFrHsd1hnlAPltZPVm6U1aHD7CWMNep5Y5HAoIracWp7D6g44eDCm5mIRe7ObKaSk9G5jkuV6s4PnLgh6gPt/I7Bk5vyGychhBe9dsz9xLuKiIL/CUgxruRnMoCS2N4M5x30LqxNFJn67Q+Ize6Jiy/FurHGAkFoT+Ass3rab1g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759172957; c=relaxed/simple; bh=3x6uHsyrBbNmgRCRMDBpOpkaIRMxB51Rh5aACDVUbqQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=mt8+TOTVUvIPNGG4ljB+3XQ/gCpd0R4EeV2NUV7zvBlon1q25DqsCz2pfHAFYcdpeXb8DQACkMhhRFFpIpyEy0rSsX9Y9UJcyVcx6CmaLHjfdd1ythyDc9/anwI0B+rq95r6NZ1xNoVoxsOKWn/fbDUXjQ3A2ujaHXE/f7/jhzk= 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=3vBjYnyE; arc=none smtp.client-ip=209.85.210.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="3vBjYnyE" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-77f68c697d3so3522258b3a.1 for ; Mon, 29 Sep 2025 12:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759172955; x=1759777755; darn=lists.linux.dev; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=3VdaBDHiSOtBGNqPCgDdEXCvLGYer8aP4O1DydDNh98=; b=3vBjYnyEaYM70JT2J3dMNU+KEC/2r5xezRbCoxvWXm5iE+s7mgncnjvbRJoFNr/esa QoHnecqVgM0klwzBYxAU5Q0obqGZ0Umz7Ngvl19BDp/evbwsPgZDgkFyh3awOJ22IIfv lyoRds6LTX93bXyaXJUvb/OEy5EzXSG001dVL+mgN8v36yIt4MJXxMVEmr/lkHkJ0055 h0aysWIM699FSB1+EdTegkXbNQHNR8lDOEF9KEjDc4FcFiRkTKZx574TYkvIV7uyWzr5 W8oXfGWsTu13s0P0z713xrZmGjzntMP8J3Pn9kadF4OSgcVV3NTltn9hb7ZQNaQ0WnX/ jVIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759172955; x=1759777755; 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=3VdaBDHiSOtBGNqPCgDdEXCvLGYer8aP4O1DydDNh98=; b=rrKguyHWKF14BrYjiHg+ureE6mmTHjGDFKbjcpXsBna/EByLEjQh8hXqaZfuTvLSLk pMRS5ntlLoFrokLRwNlUseWr99p2ciwcvr+FY5aYWOwKd8Xm1y/H6+9SIcsLQzqozJVE +y16pvTgE0hmM0v70xUr54JTVyE/LKVT7VtHml5hEiUZhXV/2WVQjsA31WPsysgBYiX2 qf08fucrkdmPYCn48HAzvZF4ZM0cqpRZFMp5pZLzNjcFpSmmDPJ5jGih+Pe5su6I6gEe nLroYPitY0vpPZjTE7FDPgFpKzwakeHMf9YnoQSpuMMRth0Esz8v2IKDuidcQa6SHjKL 2/HQ== X-Forwarded-Encrypted: i=1; AJvYcCWC3KkRB3fiKwuGiUFDXwB2i3yZ87i78f+hky4oktNY5qjBfE3T0JwFxCm6TY/GoiqaANkb@lists.linux.dev X-Gm-Message-State: AOJu0YxkTEPgYt36mIZsMVUoDie0SiWMCVJoN02I9yNN/ymfdYaosCEA TbAUvF7/poPe51K7S3/c02aDHKKMcXNKGcbGb/92Z4+FoEiUZyUrQOPNir7Jj1ntAvSlw9nP83v 5QqoHPFok3w== X-Google-Smtp-Source: AGHT+IFGhoOWjQgkF0L/NciS7Xfc7ntjSvsp7meQoiLbtTvTPGEmfOtvs2UKevw6zAF7rh0zR61UX/7++OhU X-Received: from pgng22.prod.google.com ([2002:a63:3756:0:b0:b56:3de0:d767]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:12cb:b0:2d9:b2ee:7855 with SMTP id adf61e73a8af0-2e7d7c04d2dmr19511013637.51.1759172954887; Mon, 29 Sep 2025 12:09:14 -0700 (PDT) Date: Mon, 29 Sep 2025 12:08:02 -0700 In-Reply-To: <20250929190805.201446-1-irogers@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250929190805.201446-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.570.gb178f27e6d-goog Message-ID: <20250929190805.201446-13-irogers@google.com> Subject: [PATCH v6 12/15] 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 , 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-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 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 = dso__read_symbol(dso, filename, map, sym, &code_buf, &buf_len, &is_64bit); if (buf == NULL) - return -1; + return errno; /* 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 = start, }; u8 *code_buf = NULL; + int saved_errno; nsinfo__mountns_enter(dso__nsinfo(dso), &nsc); fd = open(symfs_filename, O_RDONLY); + saved_errno = errno; nsinfo__mountns_exit(&nsc); - if (fd < 0) + if (fd < 0) { + errno = saved_errno; return NULL; - - if (file__read_maps(fd, /*exe=*/true, find_file_offset, &data, is_64bit) == 0) { + } + if (file__read_maps(fd, /*exe=*/true, find_file_offset, &data, is_64bit) <= 0) { close(fd); + errno = ENOENT; return NULL; } code_buf = malloc(len); if (code_buf == NULL) { close(fd); + errno = ENOMEM; return NULL; } count = pread(fd, code_buf, len, data.offset); + saved_errno = errno; close(fd); if ((u64)count != len) { free(code_buf); + errno = saved_errno; return NULL; } *out_buf = code_buf; @@ -1875,6 +1882,7 @@ const u8 *dso__read_symbol(struct dso *dso, const char *symfs_filename, * Note, there is fallback BPF image disassembly in the objdump * version but it currently does nothing. */ + errno = EOPNOTSUPP; return NULL; } if (dso__binary_type(dso) == DSO_BINARY_TYPE__BPF_PROG_INFO) { @@ -1895,6 +1903,7 @@ const u8 *dso__read_symbol(struct dso *dso, const char *symfs_filename, return (const u8 *)(uintptr_t)(info_linear->info.jited_prog_insns); #else pr_debug("No BPF program disassembly support\n"); + errno = EOPNOTSUPP; return NULL; #endif } 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, struct symbol *sym, buf = dso__read_symbol(dso, filename, map, sym, &code_buf, &buf_len, &is_64bit); if (buf == NULL) - return -1; + return errno; init_llvm(); if (arch__is(args->arch, "x86")) { -- 2.51.0.570.gb178f27e6d-goog