From nobody Fri Dec 19 08:06:15 2025 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 44287227E8A for ; Thu, 17 Apr 2025 23:08:16 +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=1744931297; cv=none; b=Jp29/XpV/LNmGhgnhGlFd97iZskW99D3uQ7/FxlByBu8NAmsAvRh0R6LW0pnDCRcqTd92PILG7fyw7ptDsM9BNucapqQV4/LwrCbp2H8Cxc/D/ynDmXNX8f2JxNK8kv4e7PZUuR96bS0rNj5NipXs9iN3coMklvkcWB/41kj8x4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744931297; c=relaxed/simple; bh=b778ItJAkgSzsZeREtScM1hNY+Ffpp+8QlSXkzwLw4c=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=Y9WVmLeDPRJE3JDhOXJ1q90iAYvrAzg3Uql1hoeOgKijuWvKU5mQtbuu0EeJckRxhOhsyWpE3AqWpSEvAgVZk+rfyFcbck8wdMvG5mYf12z4RC0wQ4egJswLpqr1qUCHnzwlxqZZsx4JNNjPLRSCocds6ooxNt0fcITacS6sJXM= 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=E4kzD/DN; 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="E4kzD/DN" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-30364fc706fso1163225a91.3 for ; Thu, 17 Apr 2025 16:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744931295; x=1745536095; 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=+ATo1kG4YAa83tuUgq+g3A09N22DQKM10QzKAR+cwLE=; b=E4kzD/DNqkIjviIW1fK7J00Fhkm9186RBel8UyU5KHhXMfhsxy7Nr+dy06uxI3hK8N x5SSDlBpRl1aURvjQVAYdqlwLDeq7FLdMTWHjM0rkz7FxjFQvZb0dOblb9abkrEqQsdV SidAPD/XEephenBZ975xI85mK8+RNcdYKLyBD1doE7l9zchDoq0cE27LgJsL3g+5bCBg Jhd/H4sDACrjKFLvoCj7IqVxfW7ZaZS50fsGripkltSoGZqa3nUZbu6+x7q/h5Nk8EE9 QWXJ9vvKKAf+iXIaOKcavfFSeifevU8J9PRgg1wPzS+7F0bvsf6EXSR53ySVAYlZcE+X zoPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744931295; x=1745536095; 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=+ATo1kG4YAa83tuUgq+g3A09N22DQKM10QzKAR+cwLE=; b=Mi8kXULa+Chg1dCS8yjIXGIk1dXm7pGk/ECBFqwq3gXa80e0Xy6RUrPOZeHv2MHZMj N25HyXo/asC58cYkpuQKgI5bgDZ1B1UBvekkjIkHEVr/9H4hTMge0I2CH5QQRMGlQ4Hg 7DU1EJzGpiNft/oYemo3b5jnQV7EQpLcKxwzOyg5ibOt/+K5cHNOSzhN+aZBfu01tbFc 3t8hEciymnvHM3m/yXrjkNUtrpUDiZsV8Wt9Zf1p7XeaLTsdZ0s9MccstZKqL2Jc8g42 G52Zf/KcA3MvdrG70Na+s3jWDQnoLgyXn2nmktlYLWNhLApEHca75KQlWulDy7rvd2Jc yMng== X-Forwarded-Encrypted: i=1; AJvYcCV+QpW/aV4+KrbOfuJ0CmZH6P0LHngYbzQoW6TRJNg3t1K6f/Uj9R7ix6zLpDpCHQbhIiUaRM6/8Qb1IGg=@vger.kernel.org X-Gm-Message-State: AOJu0YxSj4K/wJgwowPWRk8rv6wtg76whkmTyhkJ3RhhOLJcU7EeP+Zx v3a4TkGL0lcLVRd6inEiGFntFaTSbRJg+EG5+B2TyTq2x0hinNHJvTZLw5Ben1NAsy/U92XhQyF PNYc+Ew== X-Google-Smtp-Source: AGHT+IHH8UVkv/kmT/umdpA7zcimjqNLVkE4OP4Qq3nssLU4bZSOTO9d/zSoNOwy9xWN8TRKnJBaf5gC9JuN X-Received: from pjbsw12.prod.google.com ([2002:a17:90b:2c8c:b0:2f9:dc36:b11]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:56cd:b0:2ff:4bac:6fa2 with SMTP id 98e67ed59e1d1-3087bb62a73mr1192181a91.16.1744931295544; Thu, 17 Apr 2025 16:08:15 -0700 (PDT) Date: Thu, 17 Apr 2025 16:07:31 -0700 In-Reply-To: <20250417230740.86048-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: <20250417230740.86048-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.805.g082f7c87e0-goog Message-ID: <20250417230740.86048-11-irogers@google.com> Subject: [PATCH v4 10/19] 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 , 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" Set the buffer to the code in the BPF linear info. This enables BPF JIT code disassembly by LLVM and capstone. Move the disassmble_bpf calls to disassemble_objdump so that they are only called after falling back to the objdump option. Signed-off-by: Ian Rogers --- tools/perf/util/disasm.c | 12 +++--- tools/perf/util/dso.c | 85 +++++++++++++++++++++++++--------------- 2 files changed, 60 insertions(+), 37 deletions(-) diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 73343ae5fc96..175d9d3b5c97 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -1501,6 +1501,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(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 @@ -1635,11 +1641,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 9b1e3fb3b2b9..d08e2a1f49c1 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1798,48 +1798,69 @@ const u8 *dso__read_symbol(struct dso *dso, const c= har *symfs_filename, const struct map *map, const struct symbol *sym, 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; - struct find_file_offset_data data =3D { - .ip =3D start, - }; + const u8 *buf; + size_t len =3D end - start; =20 *out_buf =3D NULL; *out_buf_len =3D 0; *is_64bit =3D false; =20 - nsinfo__mountns_enter(dso__nsinfo(dso), &nsc); - fd =3D open(symfs_filename, O_RDONLY); - nsinfo__mountns_exit(&nsc); - if (fd < 0) + if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_IMAGE) { + pr_debug("No BPF image disassembly support\n"); return NULL; + } else 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; + buf =3D (const u8 *)(uintptr_t)(info_linear->info.jited_prog_insns); + assert(len <=3D info_linear->info.jited_prog_len); +#else + pr_debug("No BPF program disassembly support\n"); + return NULL; +#endif + } else { + struct nscookie nsc; + int fd; + ssize_t count; + struct find_file_offset_data data =3D { + .ip =3D start, + }; + u8 *code_buf =3D 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); - close(fd); - fd =3D -1; - - if ((u64)count !=3D len) - goto err; + nsinfo__mountns_enter(dso__nsinfo(dso), &nsc); + fd =3D open(symfs_filename, O_RDONLY); + nsinfo__mountns_exit(&nsc); + if (fd < 0) + return NULL; =20 - *out_buf =3D buf; + if (file__read_maps(fd, /*exe=3D*/true, find_file_offset, &data, is_64bi= t) =3D=3D 0) { + close(fd); + return NULL; + } + buf =3D code_buf =3D malloc(len); + if (buf =3D=3D NULL) { + close(fd); + return NULL; + } + count =3D pread(fd, code_buf, len, data.offset); + close(fd); + if ((u64)count !=3D len) { + free(code_buf); + return NULL; + } + *out_buf =3D code_buf; + } *out_buf_len =3D len; return buf; - -err: - if (fd >=3D 0) - close(fd); - free(buf); - return NULL; } --=20 2.49.0.805.g082f7c87e0-goog