From nobody Mon Feb 9 07:07:51 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.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 C6A0F1BE86E for ; Wed, 22 Jan 2025 06:26:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737527164; cv=none; b=RVdElSU8Y3pClS0z/cK5oKQUiy23IXuNtpxznIZ6T/WVe4Pai+6E3j5VE1cJxLDTmM+Fgyc80Va8XGnXR92DzuBwhRU3xdkfZH2wERBb/4mboN7hwdIizm4Jc3ZYAyJ3qdC2Whx1vo9CCLy8Z7+uxfUBbRkH2jzSlykoEpwoFL0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737527164; c=relaxed/simple; bh=4eVzUx7LyXLmyBqZ04/qHfp1ubXNS/OOuZG0/Fwht+I=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=OMwDMixAB+lMNOofEdK2VF4X9Ppo8aYMlIYJdCxRaVdRQzSOLsivRr2JpAmUNZsQY28CzvtVhN3vaMNVBfMYHkfnxoPajOmlabCh5x1Veedl8gIC6ryOTlo7QkFlNUqr/AFXt+BbbVSaS1rCn1t/k7oGzsQjyOXMhr4wtCHtvUc= 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=uLMNP+2w; arc=none smtp.client-ip=209.85.219.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="uLMNP+2w" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e02fff66a83so13394085276.0 for ; Tue, 21 Jan 2025 22:26:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1737527161; x=1738131961; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=IKqawTnGAxAu0q/wc+BOpGtG2cpu0MmUyGjHNjJM5iE=; b=uLMNP+2wku+g8XHgq1a0QMm+DqUIPcXmglqPs9ADRx5Z7XsMkmeTpEaiMNLigiHPuc pQU85jRbMBR8VdNUkYhTvErGNQM/IveVkNZY0b92gn9pxSrGSFgBfSbLcidPbLgLGY2k pUp3DTqfc1ebfo/5X+lkvpVxqn5dD0or2DG4sWCYcFA+m737XyZ3KvDvqOxeIcAc1xRN WSiH7VbibKrYxKfR9p7vm0KNkRGP0NKcNbpHhfL4xQ4l/Q2qp/2Ik7cTpSUIWaIo91u6 jo8zG96/5a7jY3WuWkfUUEIr79n4B5rQ7X3MobGKbDgbLJVVI2g06PDF09+5k0vjOLbk NFaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737527161; x=1738131961; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=IKqawTnGAxAu0q/wc+BOpGtG2cpu0MmUyGjHNjJM5iE=; b=YE1WCkI2ad1kC2H6iL09Q60yQAnFiTZbS0zRT51jKbp1wEJ81TyXJAe4oZ44stPa2C YNmTUoNDCGpfK5JepVBebjlLrYIaD5bIL4oItT6ZJAOCos1rK/SzryU3VV91zvCZ4hrq LRSVJmV2QnimeSpDNfMQPVTakkMMwDDKfrGlQD3SqZ0MAwLD1ibvjFJBwsZ3jhgHgcaD F9c2PwUg27Hef3lifIPk456hvx2yakSmr1jfD3D7v0rYrPRlaZsSmtmDZK1qKxqchaUI 8CIDahzxL8+NDUVnUL6tLcIoStOANC3s+e2Z+0UygDNNbzt3addockGjMVgj4nyhaDu7 TtDg== X-Forwarded-Encrypted: i=1; AJvYcCXctnuvu9gPz5yw5k25H+A7k8DD2QO6+Nd77dEWz+8XSIzifNKrZlePa73NBIra8lGGJmjuAvcMROoSK0A=@vger.kernel.org X-Gm-Message-State: AOJu0YwTQFAVbKNGzoh/o+ZpE0SPYz5Wn6luK9CF2bxVIYKoo4zNp3rd 0yBROm7vcO4NtfLxo6712yJshb8wjOasWf2muDbOW0hy6JWNCv2CR0gF40ADOmagrjXnrGwGPhX HEBOEKg== X-Google-Smtp-Source: AGHT+IEIfcJLtTBEZluRA1nwsuELe3zQ6ijw/DfjYoqYE5QW7fzSo8dNRVRcgtzpL8L2iIcD9YGQFvcEtgOh X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:807b:be79:d5c3:ee5c]) (user=irogers job=sendgmr) by 2002:a25:c181:0:b0:e57:3e87:8c1b with SMTP id 3f1490d57ef6-e57b1337eacmr35774276.6.1737527160752; Tue, 21 Jan 2025 22:26:00 -0800 (PST) Date: Tue, 21 Jan 2025 22:23:31 -0800 In-Reply-To: <20250122062332.577009-1-irogers@google.com> Message-Id: <20250122062332.577009-17-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250122062332.577009-1-irogers@google.com> X-Mailer: git-send-email 2.48.0.rc2.279.g1de40edade-goog Subject: [PATCH v2 16/17] perf disasm: Remove disasm_bpf 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" BPF disassembly was handled in here by libbfd. The LLVM and capstone disassemblers now support BPF JIT disassembly. As libbfd support was removed the functions here no longer did anything remove them and associated error values. Signed-off-by: Ian Rogers --- tools/perf/util/Build | 1 - tools/perf/util/annotate.h | 1 - tools/perf/util/disasm.c | 12 +++--------- tools/perf/util/disasm_bpf.c | 29 ----------------------------- tools/perf/util/disasm_bpf.h | 12 ------------ 5 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 tools/perf/util/disasm_bpf.c delete mode 100644 tools/perf/util/disasm_bpf.h diff --git a/tools/perf/util/Build b/tools/perf/util/Build index eb00c599e179..4b757d157f13 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -14,7 +14,6 @@ perf-util-y +=3D copyfile.o perf-util-y +=3D ctype.o perf-util-y +=3D db-export.o perf-util-y +=3D disasm.o -perf-util-y +=3D disasm_bpf.o perf-util-y +=3D env.o perf-util-y +=3D event.o perf-util-y +=3D evlist.o diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index 0ba5846dad4d..e704a9c913f7 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -438,7 +438,6 @@ enum symbol_disassemble_errno { __SYMBOL_ANNOTATE_ERRNO__START =3D -10000, =20 SYMBOL_ANNOTATE_ERRNO__NO_VMLINUX =3D __SYMBOL_ANNOTATE_ERRNO__START, - SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF, SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING, SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP, SYMBOL_ANNOTATE_ERRNO__BPF_INVALID_FILE, diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 99b9c21e02b0..ebd86691acf8 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -17,7 +17,6 @@ #include "capstone.h" #include "debug.h" #include "disasm.h" -#include "disasm_bpf.h" #include "dso.h" #include "dwarf-regs.h" #include "env.h" @@ -1230,9 +1229,6 @@ int symbol__strerror_disassemble(struct map_symbol *m= s, int errnum, char *buf, s " --vmlinux vmlinux\n", build_id_msg ?: ""); } break; - case SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF: - scnprintf(buf, buflen, "Please link with binutils's libopcode to enable = BPF annotation"); - break; case SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP: scnprintf(buf, buflen, "Problems with arch specific instruction name reg= ular expressions."); break; @@ -1500,11 +1496,9 @@ 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); + if (dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_PROG_INFO || + dso__binary_type(dso) =3D=3D DSO_BINARY_TYPE__BPF_IMAGE) + return -1; =20 err =3D asprintf(&command, "%s %s%s --start-address=3D0x%016" PRIx64 diff --git a/tools/perf/util/disasm_bpf.c b/tools/perf/util/disasm_bpf.c deleted file mode 100644 index a891a0b909a7..000000000000 --- a/tools/perf/util/disasm_bpf.c +++ /dev/null @@ -1,29 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only - -#include "util/annotate.h" -#include "util/disasm_bpf.h" -#include "util/symbol.h" -#include -#include - -int symbol__disassemble_bpf(struct symbol *sym __maybe_unused, struct anno= tate_args *args __maybe_unused) -{ - return SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF; -} - -int symbol__disassemble_bpf_image(struct symbol *sym, struct annotate_args= *args) -{ - struct annotation *notes =3D symbol__annotation(sym); - struct disasm_line *dl; - - args->offset =3D -1; - args->line =3D strdup("to be implemented"); - args->line_nr =3D 0; - args->fileloc =3D NULL; - dl =3D disasm_line__new(args); - if (dl) - annotation_line__add(&dl->al, ¬es->src->source); - - zfree(&args->line); - return 0; -} diff --git a/tools/perf/util/disasm_bpf.h b/tools/perf/util/disasm_bpf.h deleted file mode 100644 index 2ecb19545388..000000000000 --- a/tools/perf/util/disasm_bpf.h +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only - -#ifndef __PERF_DISASM_BPF_H -#define __PERF_DISASM_BPF_H - -struct symbol; -struct annotate_args; - -int symbol__disassemble_bpf(struct symbol *sym, struct annotate_args *args= ); -int symbol__disassemble_bpf_image(struct symbol *sym, struct annotate_args= *args); - -#endif /* __PERF_DISASM_BPF_H */ --=20 2.48.0.rc2.279.g1de40edade-goog