From nobody Thu Oct 2 02:15:11 2025 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.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 1E947217736 for ; Mon, 29 Sep 2025 19:09:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759172950; cv=none; b=nttp0DK2QRSefJSy2cy3jsGdIXHJFYZD+2GgpQBVMHB629wcBiyMUhguaquoXvJPlTEmk0yhAuIPrcpS3q5YMTXVc7quX2ilFqNjTlHROCYqJ/+/3jLM8FG5riLAWfzqGODvchp7w5c/B4GoQQwvxNRNJs+o0uHP5dwsBxr1wwY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759172950; c=relaxed/simple; bh=612MmCdeynDCJhM2xzf4ABRBj4OerTlGO2/5DPdcThw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=UApWkxwJrAsc2pyYaonF8w8eozbq526gJEvxvh0/WSRtXCkqvLnwOwPwJiIdvaAYFePtxUgv4T5OEEEGe+9Z43qnNQuEJ6gTYcpz0tw4TNlaAAQw74SJYJVoGmPxuskhKbe41clwJsn1sMLNAq6/C7J+U/IT2Ir0l71QIz0nShk= 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=SMrVe3cf; arc=none smtp.client-ip=209.85.215.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="SMrVe3cf" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-b5533921eb2so3496015a12.0 for ; Mon, 29 Sep 2025 12:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759172947; x=1759777747; 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=T80LtbzuTq5QEV4YhukVhePJHtqZ6mXSdjQ51H1sVJk=; b=SMrVe3cfGPN5Sz2eC7qO0QXM1/jaCRSOZpO7E85PNWH4sDY2wJWuiFYFXGUhBNSMMX bkKHYnT3P2cnlh209NWzmnHcwLURoQFCAYg76Qok8D0Oe77EuHMd+HZJ5IO1KYJ7Mv/y l6SMGnkt222nca+N/mvEpCvLpi1vrFIATVB0XfDxZeCj9AfbaaVOjYj6A7EBZBQY5p+n TLLIxiM729qtF6YyqzYDPf1YL3SbOPcWMwwDLUBJXtcTTLxz1SQ7pTwuWhIobOKZEcDn 4PJ7mt6rLlfoP641Sb96y3t/Wy70HgZLWPego6mT3qIMx1mIWvmu7vz07uJE++Cnsn1H J3Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759172947; x=1759777747; 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=T80LtbzuTq5QEV4YhukVhePJHtqZ6mXSdjQ51H1sVJk=; b=shqMk/altqJWpFX+lKU3yGGf4xfV3d19XVJ19tkD9qE44s73NplPmVbLvTro3TpBUA x95q021fd3YBxampZLMCb3LpWXfRQpv4StWFVoYL30Co9v/vHbBeEpayH7l1Y0tgKzQZ 4hsIfn2hTJc3uHiBWAUh4QeHH1VqzMDtFpDPw64H5jH0cmM2AvXuu13Uh/dTvggjwFBu bI7Hq/nEoUa1adn8bZJDxMGG+/EloXsEbGJdnS5RufjV7iNSrfe4kLBu+E3YnqoZkyZF CP0ZzFcqrPikVhl0vsysxlBKaCvL3r0xedVc4ZM90xZtfVROOMundEHA2DaYt/wgcJbV KzRw== X-Forwarded-Encrypted: i=1; AJvYcCVuevtKGP6k9/88kDX5GrqHEEPFIqk6uhy6bGiTCpfTc3UnEqtqUOJDG4XiO/g9dUvMJr+kro3fGTW3fEM=@vger.kernel.org X-Gm-Message-State: AOJu0YwRG7lLXZJsk8+QZBXTvo9dvN8XJPHhOHBv1YLi72cad+3WxAw+ zRgqOJ+1ToLn1FIkJAVvfbvL05WF1wsoNuBb4Drh1Y3LcIlZpaxEZRF3JQN3jgmfAKyTD+bc+xh yK4/dGVLycA== X-Google-Smtp-Source: AGHT+IEvvky+/EgLWwl3K8Zs/55gu/czFI/PdGTNrcAlGJ4vN8lSEIzR8QJ/i33rJKHm2HVt07K26itw31Jq X-Received: from pgdf9.prod.google.com ([2002:a05:6a02:5149:b0:b52:19fd:897f]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:244c:b0:27e:ec72:f67 with SMTP id d9443c01a7336-27eec7211f2mr148076835ad.6.1759172947312; Mon, 29 Sep 2025 12:09:07 -0700 (PDT) Date: Mon, 29 Sep 2025 12:08:00 -0700 In-Reply-To: <20250929190805.201446-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: <20250929190805.201446-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.570.gb178f27e6d-goog Message-ID: <20250929190805.201446-11-irogers@google.com> Subject: [PATCH v6 10/15] perf dso: Support BPF programs in dso__read_symbol 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Set the buffer to the code in the BPF linear info. This enables BPF JIT code disassembly by LLVM and capstone. Move the common but minimal disassmble_bpf_image call to disassemble_objdump so that it is only called after falling back to the objdump option. Similarly move the disassmble_bpf function to disassemble_objdump and rename to disassmble_bpf_libbfd to make it clearer that this support relies on libbfd. Signed-off-by: Ian Rogers --- tools/perf/util/disasm.c | 12 +++-- tools/perf/util/dso.c | 100 ++++++++++++++++++++++++++------------- tools/perf/util/libbfd.c | 4 +- tools/perf/util/libbfd.h | 6 +-- 4 files changed, 80 insertions(+), 42 deletions(-) diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index a1240543c89c..e64902e520ab 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -1521,6 +1521,12 @@ static int symbol__disassemble_objdump(const char *f= ilename, struct symbol *sym, struct child_process objdump_process; int err; =20 + if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_PROG_INFO) + return symbol__disassemble_bpf_libbfd(sym, args); + + if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_IMAGE) + return symbol__disassemble_bpf_image(sym, args); + err =3D asprintf(&command, "%s %s%s --start-address=3D0x%016" PRIx64 " --stop-address=3D0x%016" PRIx64 @@ -1655,11 +1661,7 @@ int symbol__disassemble(struct symbol *sym, struct a= nnotate_args *args) =20 pr_debug("annotating [%p] %30s : [%p] %30s\n", dso, dso__long_name(dso), = sym, sym->name); =20 - if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_PROG_INFO) { - return symbol__disassemble_bpf(sym, args); - } else if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_IMAGE) { - return symbol__disassemble_bpf_image(sym, args); - } else if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__NOT_FOUND) { + if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__NOT_FOUND) { return SYMBOL_ANNOTATE_ERRNO__COULDNT_DETERMINE_FILE_TYPE; } else if (dso__is_kcore(dso)) { kce.addr =3D map__rip_2objdump(map, sym->start); diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 87d075942de6..0aed5c8691bd 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1816,23 +1816,17 @@ static int find_file_offset(u64 start, u64 len, u64= pgoff, void *arg) return 0; } =20 -const u8 *dso__read_symbol(struct dso *dso, const char *symfs_filename, - const struct map *map, const struct symbol *sym, - u8 **out_buf, u64 *out_buf_len, bool *is_64bit) +static const u8 *__dso__read_symbol(struct dso *dso, const char *symfs_fil= ename, + u64 start, size_t len, + u8 **out_buf, u64 *out_buf_len, bool *is_64bit) { struct nscookie nsc; - u64 start =3D map__rip_2objdump(map, sym->start); - u64 end =3D map__rip_2objdump(map, sym->end); - int fd, count; - u8 *buf =3D NULL; - size_t len; + int fd; + ssize_t count; struct find_file_offset_data data =3D { .ip =3D start, }; - - *out_buf =3D NULL; - *out_buf_len =3D 0; - *is_64bit =3D false; + u8 *code_buf =3D NULL; =20 nsinfo__mountns_enter(dso__nsinfo(dso), &nsc); fd =3D open(symfs_filename, O_RDONLY); @@ -1840,28 +1834,70 @@ const u8 *dso__read_symbol(struct dso *dso, const c= har *symfs_filename, if (fd < 0) return NULL; =20 - if (file__read_maps(fd, /*exe=3D*/true, find_file_offset, &data, is_64bit= ) =3D=3D 0) - goto err; - - len =3D end - start; - buf =3D malloc(len); - if (buf =3D=3D NULL) - goto err; - - count =3D pread(fd, buf, len, data.offset); + if (file__read_maps(fd, /*exe=3D*/true, find_file_offset, &data, is_64bit= ) =3D=3D 0) { + close(fd); + return NULL; + } + code_buf =3D malloc(len); + if (code_buf =3D=3D NULL) { + close(fd); + return NULL; + } + count =3D pread(fd, code_buf, len, data.offset); close(fd); - fd =3D -1; + if ((u64)count !=3D len) { + free(code_buf); + return NULL; + } + *out_buf =3D code_buf; + *out_buf_len =3D len; + return code_buf; +} =20 - if ((u64)count !=3D len) - goto err; +/* + * Read a symbol into memory for disassembly by a library like capstone of + * libLLVM. If memory is allocated out_buf holds it. + */ +const u8 *dso__read_symbol(struct dso *dso, const char *symfs_filename, + const struct map *map, const struct symbol *sym, + u8 **out_buf, u64 *out_buf_len, bool *is_64bit) +{ + u64 start =3D map__rip_2objdump(map, sym->start); + u64 end =3D map__rip_2objdump(map, sym->end); + size_t len =3D end - start; =20 - *out_buf =3D buf; - *out_buf_len =3D len; - return buf; + *out_buf =3D NULL; + *out_buf_len =3D 0; + *is_64bit =3D false; =20 -err: - if (fd >=3D 0) - close(fd); - free(buf); - return NULL; + if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_IMAGE) { + /* + * Note, there is fallback BPF image disassembly in the objdump + * version but it currently does nothing. + */ + return NULL; + } + if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_PROG_INFO) { +#ifdef HAVE_LIBBPF_SUPPORT + struct bpf_prog_info_node *info_node; + struct perf_bpil *info_linear; + + *is_64bit =3D sizeof(void *) =3D=3D sizeof(u64); + info_node =3D perf_env__find_bpf_prog_info(dso__bpf_prog(dso)->env, + dso__bpf_prog(dso)->id); + if (!info_node) { + errno =3D SYMBOL_ANNOTATE_ERRNO__BPF_MISSING_BTF; + return NULL; + } + info_linear =3D info_node->info_linear; + assert(len <=3D info_linear->info.jited_prog_len); + *out_buf_len =3D len; + return (const u8 *)(uintptr_t)(info_linear->info.jited_prog_insns); +#else + pr_debug("No BPF program disassembly support\n"); + return NULL; +#endif + } + return __dso__read_symbol(dso, symfs_filename, start, len, + out_buf, out_buf_len, is_64bit); } diff --git a/tools/perf/util/libbfd.c b/tools/perf/util/libbfd.c index 09a0eeb78a1a..01147fbf73b3 100644 --- a/tools/perf/util/libbfd.c +++ b/tools/perf/util/libbfd.c @@ -448,8 +448,8 @@ int libbfd_filename__read_debuglink(const char *filenam= e, char *debuglink, return err; } =20 -int symbol__disassemble_bpf(struct symbol *sym __maybe_unused, - struct annotate_args *args __maybe_unused) +int symbol__disassemble_bpf_libbfd(struct symbol *sym __maybe_unused, + struct annotate_args *args __maybe_unused) { #ifdef HAVE_LIBBPF_SUPPORT struct annotation *notes =3D symbol__annotation(sym); diff --git a/tools/perf/util/libbfd.h b/tools/perf/util/libbfd.h index 7441e95f8ec0..e300f171d1bd 100644 --- a/tools/perf/util/libbfd.h +++ b/tools/perf/util/libbfd.h @@ -29,7 +29,7 @@ int libbfd__read_build_id(const char *filename, struct bu= ild_id *bid, bool block =20 int libbfd_filename__read_debuglink(const char *filename, char *debuglink,= size_t size); =20 -int symbol__disassemble_bpf(struct symbol *sym, struct annotate_args *args= ); +int symbol__disassemble_bpf_libbfd(struct symbol *sym, struct annotate_arg= s *args); =20 #else // !defined(HAVE_LIBBFD_SUPPORT) #include "annotate.h" @@ -72,8 +72,8 @@ static inline int libbfd_filename__read_debuglink(const c= har *filename __always_ return -1; } =20 -static inline int symbol__disassemble_bpf(struct symbol *sym __always_unus= ed, - struct annotate_args *args __always_unused) +static inline int symbol__disassemble_bpf_libbfd(struct symbol *sym __alwa= ys_unused, + struct annotate_args *args __always_unused) { return SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF; } --=20 2.51.0.570.gb178f27e6d-goog