From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 1BF1122ACFB for ; Thu, 17 Apr 2025 23:08:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744931301; cv=none; b=r64aPIH+2OKZ28IqJuyt/YsWIs1krL1qsXhm654p0IaPOEgmntGt7lgkpYKSDP2P8fwAchB99jRpYcJV7tq5k7hn2CYwPcv8m7trSYq6sh8+9LpXGSSVc0kVCrGfvz8VROcSwAejuRPdeYyxQCEbXG50ihY8oHtMmbwU533uQIw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744931301; c=relaxed/simple; bh=r/o/FTdC44ei+b0RvMj4m3YZsDqShIjlMhUtWnKQGP0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=maspbVDGpS18l2usAOJLt8MUoQbT9x6hAYRckSuDb4+l9TgS+kWhITre2RD6vhtHziKgwzBeu2CND1iNsBen8a7qPMReprJFbJ4U3nEnrSYJM2ovbWpvT3Jsy11HQvQO7wFKibsBivYIpf5q2oIprr2Xh5YqqjBA+ccAvULNovc= 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=j1r67Gc1; arc=none smtp.client-ip=209.85.216.74 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="j1r67Gc1" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3085f5855c4so1144997a91.1 for ; Thu, 17 Apr 2025 16:08:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744931299; x=1745536099; 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=EHDpsk8SNrUR44AfS89J23CqH741UDdp/AyDnz+ulKM=; b=j1r67Gc1Jzt+ERQ5lTOFPuYRllOZJgSLfD97cO7RV6tCEqj8ZFoQhHYdmqSB8GvaU6 SawuumxS1mlhaYIRowIrRNjsRuRCceNmGP9CXQ/+cDDq5O8kqOSqzd5/eUJOrwl8C445 4drKxsGvlenA4I1TV+DoEWEelmqafEZiSG3n7763ZNAPt4kNcLPyLaPADe//jIQlVj6o VLFSW2LfVfq75mdyvE9nxgDO8r5VAXGKMMtDD1P4eUcxXXRCA/BP+TKc8+Rwnhzm1WfS Ut62JPwQifTd4HHE8EdEX0t9ZGM0jXqDqwHltgg2CAMSuReJDfuQoJmVxykYbTUJZxvS Ag6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744931299; x=1745536099; 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=EHDpsk8SNrUR44AfS89J23CqH741UDdp/AyDnz+ulKM=; b=Q3cfZibrbtQytSNgxU0bjOB5OhWfd0FEeig8Bg+bj3U+MLSo/kWz9tV0L9iBdnZ/1Y E72tSC0SCjNDthoTMyLhtppcfxaRT6zLQkQEvbSx1mtye/Sh/ADXknHc899K1oCXf3o6 yEiuVHfKuwvhqR/svg1pfGaIatiWyRbJZa02q3KhB9ohXiq+j/VamEi+555KLlGS60M2 uQg+1jwhCXXNZpmgFds7cnzR6897EQbwiXKcJurbBHo+TSiIgL959fnHfqIbQGB3C+tf iDfDe2p9vTZMP9XQTbM3J7KmBCa26dnLgGMaYXWFrKk37y0tdVASyhWTpxdlSA0IdhR6 kMAw== X-Forwarded-Encrypted: i=1; AJvYcCWYQES4xkbgRSbeWR2IvTQgpPRDqV2FNfvIG+rlkway6it9s67RiD0eow82V1RxBUYuyPU=@vger.kernel.org X-Gm-Message-State: AOJu0YzEWBdbocOrRCWasOiPATGM0BtEL7imZaIbzZBE9OXKzva9hEBN h1VuLFC9Px8OVsl+1WirEZt5YMwvkMdsI5x41LLDaGZ+st4lNojpNNZZViMcal/Nfh2FSZKNpBN 9ejsxnQ== X-Google-Smtp-Source: AGHT+IFYwuA7D18/EJ4yrdKqcla6KAmqMKe4gcSykzoeeKn1WlVOiGHm924Np2e3rbawCT909KQILgiK9qYN X-Received: from pjx16.prod.google.com ([2002:a17:90b:5690:b0:2ff:852c:ceb8]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:3b8d:b0:2ee:aed2:c15c with SMTP id 98e67ed59e1d1-3087bbaeb98mr890482a91.28.1744931299447; Thu, 17 Apr 2025 16:08:19 -0700 (PDT) Date: Thu, 17 Apr 2025 16:07:33 -0700 In-Reply-To: <20250417230740.86048-1-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250417230740.86048-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.805.g082f7c87e0-goog Message-ID: <20250417230740.86048-13-irogers@google.com> Subject: [PATCH v4 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-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 = 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 d08e2a1f49c1..243fc33cc449 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1809,6 +1809,7 @@ const u8 *dso__read_symbol(struct dso *dso, const char *symfs_filename, if (dso__binary_type(dso) == DSO_BINARY_TYPE__BPF_IMAGE) { pr_debug("No BPF image disassembly support\n"); + errno = EOPNOTSUPP; return NULL; } else if (dso__binary_type(dso) == DSO_BINARY_TYPE__BPF_PROG_INFO) { #ifdef HAVE_LIBBPF_SUPPORT @@ -1827,6 +1828,7 @@ const u8 *dso__read_symbol(struct dso *dso, const char *symfs_filename, assert(len <= info_linear->info.jited_prog_len); #else pr_debug("No BPF program disassembly support\n"); + errno = EOPNOTSUPP; return NULL; #endif } else { @@ -1837,26 +1839,34 @@ 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; } buf = code_buf = malloc(len); if (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; 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.49.0.805.g082f7c87e0-goog