Received: by 2002:a89:d88:0:b0:1fa:5c73:8e2d with SMTP id eb8csp1046796lqb; Sat, 25 May 2024 03:48:56 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWfaQ0cDEvHffx2687Ociqe2wZp2ENiEbFLC1AwEI9m5X51Dnfi36ZEV5KAQ68T++isFv3ykfTLHcuQGkEgqF9xnF9ckWzdlDZ8/q4a3A== X-Google-Smtp-Source: AGHT+IFRQ6fzZnVZt9T/6Avdz3gW9QMDYpRvkeYVNTPYxeTl2U87HBovMddGiVk1JKe67V764Ckm X-Received: by 2002:a05:6808:118b:b0:3c9:9511:7377 with SMTP id 5614622812f47-3d1a585c436mr5743485b6e.14.1716634136168; Sat, 25 May 2024 03:48:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716634136; cv=pass; d=google.com; s=arc-20160816; b=qGc/ik2KMnY+ootvMhTDDBxLqakp87gs3UTAX9HZLhRRnXyWDhJHsdb6e4Vf3cjgNL dl5DDZDuC/rYchkjxnUaARUgXaQ6cSqIzv2VGaNHpfYbpNgXU1q50RFp+NrnLzWQDd9C 7akyRqMyb2fVipTqQUJaPFio3+kwpbI90JgHNxmkS4InwFgf59tSZyMxTQyUZEYlH5LJ KABpFwJ7o/aEMu7NeJQR0v/+OOOKiJ8EjONhKxjXxAmXIi983+qaIX6NOXQ3r5jtm+j2 lDFeNtwFZCCNhZSIfv6oyFepO+H463n7zEe0ZEt418bneyzaYvWEebS3IX5WRQjt5pgD VTqw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:message-id:references:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:in-reply-to:date :dkim-signature; bh=68mtJBq09Z6U4+kiICp8oV7LVeNEMo3w2MvxbeTmUX0=; fh=njR1Z/O7xKp+qsXusO4QMG/iAMARycSX6dvXFhiWYnQ=; b=oOCP2MHQq4LT2ItU2A/qwUmMo3aGBLOW8RzPCcdophbXK12LjbAbw5QKxEQjEVdw4s 4aIlQz9FgXlYxaulk9QcOTCHW+Iqn0yEgnnNOe3Uf9b1uS3tY4x1chgg/ByYbskV99QP fKf+2zcnWgbYGkz1eOjx6aMfemjgxnLJl/COvUA+r/IPRuTccpfDJRekQSdkfGD15/H9 lqRH3psgjB8+6UQI5+tvxziJBRAYv19G13Nfdl7acQHfbyHC8XsRxeC9IL3DD7J52TVx OYiCKstB8LnHGxYvDMBsVPT6dz0xBB+3Sd6m7jCViytil33rC9dDXAEZsCiP+04xUEiw zTQQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=zKdfvEvf; arc=pass (i=1 spf=pass spfdomain=flex--sesse.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-189339-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-189339-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id d75a77b69052e-43fb18b3d69si37218651cf.539.2024.05.25.03.48.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 May 2024 03:48:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-189339-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=zKdfvEvf; arc=pass (i=1 spf=pass spfdomain=flex--sesse.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-189339-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-189339-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id CD97D1C20A2C for ; Sat, 25 May 2024 10:48:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5960C43AD1; Sat, 25 May 2024 10:48:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="zKdfvEvf" Received: from mail-lf1-f73.google.com (mail-lf1-f73.google.com [209.85.167.73]) (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 2A51542073 for ; Sat, 25 May 2024 10:48:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716634097; cv=none; b=erQoLX/7PT/a0LGKEYPPZZOkhnUyxCDQPwjHxMLKL3dL3fXgJq6K4KWUt2guy9ywYbztEURMJhQoMySAhpRix3//lwkdoEAJppoXFmb41nn/fULT1Uxma9oiW2PI5VqmaQaXZn5tQMjJ8rUwktnuZSSp3M0oC6lt8d/jwdBSG98= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716634097; c=relaxed/simple; bh=Z77+HSWvlqJabrnuOO8/MBRymYEHpIley5nzd5KMILM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=aNMd+mG1rh62axXr5rZO9Or7KJaKq6nCB4aB4Yi7se8n6MPiMaAlQgmekKVDbPu3DuhxgH/Z/lkuZvpkDhm+gRtx3M1uV68xeuaTsMCFkpS9eyeNOo4vpGZ0TC/5fViUaVsqph+1I5pvQwWJ+9EkKBxyelBBUhcKEoPq41B6ut8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sesse.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=zKdfvEvf; arc=none smtp.client-ip=209.85.167.73 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--sesse.bounces.google.com Received: by mail-lf1-f73.google.com with SMTP id 2adb3069b0e04-529a8c727d3so67374e87.3 for ; Sat, 25 May 2024 03:48:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1716634093; x=1717238893; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=68mtJBq09Z6U4+kiICp8oV7LVeNEMo3w2MvxbeTmUX0=; b=zKdfvEvfkMc+H7Viwge35TkSgpsmxC9Q5XP/NXgfzh2j0j3PIEGujNLRsZDvzWwszy QoxpoIdlujpmm3OSuhJdZReo75RcklQdI//vy2m70Px/1bnjAzK6gLqUbnKinHDjsybq RfzPutHHHWzWeICt4PwyqadqvYMgbAO/8Z30u00Cs7MLur4cr8DkBEjkJxWmyEfdVAaM zO8COruetZhZm44nYnbnmnpaSBMjfmJATCBR18sUa+G2Fc5U0UWFB9jG7AXYprmuVL65 0j59CbhkUZeIgIfoFypNqqkQ1EDkoxA9UvnCI7c1lKYLJesqs2CkWmaZRv839UyZKSEj i22A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716634093; x=1717238893; h=cc: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=68mtJBq09Z6U4+kiICp8oV7LVeNEMo3w2MvxbeTmUX0=; b=DVc73lakTpArFSLds0EhfhyQwxLatTP06QutPpsMIyPFEw2Y7w1AOHOUap+2J9auj7 RTMM9UrJt6+cr6tp4UxW9mJDjTpFXDIetXib1JQ6vHTGx0iI+80XYJx9iSrzmyw8DVF4 5ukkONAM9830utP7QSgwhPNtzUunVJcS3gFgOcCcjf6M02M8bTJapqPGuJ5XgJc8CcEK lZbsHls5MFtoX9KViFdotANgJBVxJ9Lg40RTFYxAu9OTtMRrsKBMX5ymEXDbjTWiiyhY iR5DiBEab7gedWQ9pYlsElzkmPC6RFXaZlGF0bzpXBQfhSG3NBIo+Lv8qhv7JmrsUUkD d87g== X-Forwarded-Encrypted: i=1; AJvYcCULHOzuiOS/7TIOr5XNPYVobRHjAHe7Y+XYLnEZAaWBp3SsDW9smDW5Z3/IZIiJFdB7vBWK/I0d0qElO0jYvDDhIPt6Lql0tXimVdTL X-Gm-Message-State: AOJu0YxSkrLLCHRjf2nN1AGBn5ahmXZ9Y/+n1xoemd74MTh0E1nMTjvj 8ashcXcQz7UxhD5W1xBl/21Ti1RA5H4MV0MP8Oe2OpZyjG/qZuM+r70DHHzcyXb69/EeETzGqg= = X-Received: from sesse.osl.corp.google.com ([2a00:79e0:18:10:8cba:1aee:d3cd:626f]) (user=sesse job=sendgmr) by 2002:ac2:51a8:0:b0:51d:7976:6d1c with SMTP id 2adb3069b0e04-529667cf991mr3833e87.9.1716634093102; Sat, 25 May 2024 03:48:13 -0700 (PDT) Date: Sat, 25 May 2024 12:47:55 +0200 In-Reply-To: <20240525104755.324014-1-sesse@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240525104755.324014-1-sesse@google.com> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1-goog Message-ID: <20240525104755.324014-3-sesse@google.com> Subject: [PATCH v6 3/3] perf annotate: LLVM-based disassembler From: "Steinar H. Gunderson" To: acme@kernel.org Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, irogers@google.com, "Steinar H. Gunderson" Content-Type: text/plain; charset="UTF-8" Support using LLVM as a disassembler method, allowing helperless annotation in non-distro builds. (It is also much faster than using libbfd or bfd objdump on binaries with a lot of debug information.) This is nearly identical to the output of llvm-objdump; there are some very rare whitespace differences, some minor changes to demangling (since we use perf's regular demangling and not LLVM's own) and the occasional case where llvm-objdump makes a different choice when multiple symbols share the same address. It should work across all of LLVM's supported architectures, although I've only tested 64-bit x86, and finding the right triple from perf's idea of machine architecture can sometimes be a bit tricky. Ideally, we should have some way of finding the triplet just from the file itself. Signed-off-by: Steinar H. Gunderson --- tools/perf/util/disasm.c | 195 +++++++++++++++++++++++++++++ tools/perf/util/llvm-c-helpers.cpp | 62 +++++++++ tools/perf/util/llvm-c-helpers.h | 11 ++ 3 files changed, 268 insertions(+) diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index c0dbb955e61a..ee7c2365d066 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -43,6 +43,7 @@ static int call__scnprintf(struct ins *ins, char *bf, size_t size, static void ins__sort(struct arch *arch); static int disasm_line__parse(char *line, const char **namep, char **rawp); +static char *expand_tabs(char *line, char **storage, size_t *storage_len); static __attribute__((constructor)) void symbol__init_regexpr(void) { @@ -1378,7 +1379,9 @@ static int open_capstone_handle(struct annotate_args *args, bool is_64bit, return 0; } +#endif +#if defined(HAVE_LIBCAPSTONE_SUPPORT) || defined(HAVE_LIBLLVM_SUPPORT) struct find_file_offset_data { u64 ip; u64 offset; @@ -1442,7 +1445,9 @@ read_symbol(const char *filename, struct map *map, struct symbol *sym, free(buf); return NULL; } +#endif +#ifdef HAVE_LIBCAPSTONE_SUPPORT static void print_capstone_detail(cs_insn *insn, char *buf, size_t len, struct annotate_args *args, u64 addr) { @@ -1606,6 +1611,191 @@ static int symbol__disassemble_capstone(char *filename, struct symbol *sym, } #endif +#ifdef HAVE_LIBLLVM_SUPPORT +#include +#include +#include "util/llvm-c-helpers.h" + +struct symbol_lookup_storage { + u64 branch_addr; + u64 pcrel_load_addr; +}; + +/* + * Whenever LLVM wants to resolve an address into a symbol, it calls this + * callback. We don't ever actually _return_ anything (in particular, because + * it puts quotation marks around what we return), but we use this as a hint + * that there is a branch or PC-relative address in the expression that we + * should add some textual annotation for after the instruction. The caller + * will use this information to add the actual annotation. + */ +static const char * +symbol_lookup_callback(void *disinfo, uint64_t value, + uint64_t *ref_type, + uint64_t address __maybe_unused, + const char **ref __maybe_unused) +{ + struct symbol_lookup_storage *storage = + (struct symbol_lookup_storage *)disinfo; + if (*ref_type == LLVMDisassembler_ReferenceType_In_Branch) + storage->branch_addr = value; + else if (*ref_type == LLVMDisassembler_ReferenceType_In_PCrel_Load) + storage->pcrel_load_addr = value; + *ref_type = LLVMDisassembler_ReferenceType_InOut_None; + return NULL; +} + +static int symbol__disassemble_llvm(char *filename, struct symbol *sym, + struct annotate_args *args) +{ + struct annotation *notes = symbol__annotation(sym); + struct map *map = args->ms.map; + struct dso *dso = map__dso(map); + u64 start = map__rip_2objdump(map, sym->start); + u8 *buf; + u64 len; + u64 pc; + bool is_64bit; + char triplet[64]; + char disasm_buf[2048]; + size_t disasm_len; + struct disasm_line *dl; + LLVMDisasmContextRef disasm = NULL; + struct symbol_lookup_storage storage; + char *line_storage = NULL; + size_t line_storage_len = 0; + + if (args->options->objdump_path) + return -1; + + LLVMInitializeAllTargetInfos(); + LLVMInitializeAllTargetMCs(); + LLVMInitializeAllDisassemblers(); + + buf = read_symbol(filename, map, sym, &len, &is_64bit); + if (buf == NULL) + return -1; + + if (arch__is(args->arch, "x86")) { + if (is_64bit) + scnprintf(triplet, sizeof(triplet), "x86_64-pc-linux"); + else + scnprintf(triplet, sizeof(triplet), "i686-pc-linux"); + } else { + scnprintf(triplet, sizeof(triplet), "%s-linux-gnu", + args->arch->name); + } + + disasm = LLVMCreateDisasm( + triplet, &storage, 0, NULL, symbol_lookup_callback); + if (disasm == NULL) + goto err; + + if (args->options->disassembler_style && + !strcmp(args->options->disassembler_style, "intel")) + LLVMSetDisasmOptions( + disasm, LLVMDisassembler_Option_AsmPrinterVariant); + + /* + * This needs to be set after AsmPrinterVariant, due to a bug in LLVM; + * setting AsmPrinterVariant makes a new instruction printer, making it + * forget about the PrintImmHex flag (which is applied before if both + * are given to the same call). + */ + LLVMSetDisasmOptions(disasm, LLVMDisassembler_Option_PrintImmHex); + + /* add the function address and name */ + scnprintf(disasm_buf, sizeof(disasm_buf), "%#"PRIx64" <%s>:", + start, sym->name); + + args->offset = -1; + args->line = disasm_buf; + args->line_nr = 0; + args->fileloc = NULL; + args->ms.sym = sym; + + dl = disasm_line__new(args); + if (dl == NULL) + goto err; + + annotation_line__add(&dl->al, ¬es->src->source); + + pc = start; + for (u64 offset = 0; offset < len; ) { + unsigned int ins_len; + + storage.branch_addr = 0; + storage.pcrel_load_addr = 0; + + ins_len = LLVMDisasmInstruction( + disasm, buf + offset, len - offset, pc, + disasm_buf, sizeof(disasm_buf)); + if (ins_len == 0) + goto err; + disasm_len = strlen(disasm_buf); + + if (storage.branch_addr != 0) { + char *name = llvm_name_for_code( + dso, filename, storage.branch_addr); + if (name != NULL) { + disasm_len += scnprintf( + disasm_buf + disasm_len, + sizeof(disasm_buf) - disasm_len, + " <%s>", name); + free(name); + } + } + if (storage.pcrel_load_addr != 0) { + char *name = llvm_name_for_data( + dso, filename, storage.pcrel_load_addr); + disasm_len += scnprintf(disasm_buf + disasm_len, + sizeof(disasm_buf) - disasm_len, + " # %#"PRIx64, + storage.pcrel_load_addr); + if (name) { + disasm_len += scnprintf( + disasm_buf + disasm_len, + sizeof(disasm_buf) - disasm_len, + " <%s>", name); + free(name); + } + } + + args->offset = offset; + args->line = expand_tabs( + disasm_buf, &line_storage, &line_storage_len); + args->line_nr = 0; + args->fileloc = NULL; + args->ms.sym = sym; + + llvm_addr2line(filename, pc, &args->fileloc, + (unsigned int *)&args->line_nr, false, NULL); + + dl = disasm_line__new(args); + if (dl == NULL) + goto err; + + annotation_line__add(&dl->al, ¬es->src->source); + + free(args->fileloc); + pc += ins_len; + offset += ins_len; + } + + LLVMDisasmDispose(disasm); + free(buf); + free(line_storage); + return 0; + +err: + LLVMDisasmDispose(disasm); + free(buf); + free(line_storage); + return -1; +} +#endif + + /* * Possibly create a new version of line with tabs expanded. Returns the * existing or new line, storage is updated if a new line is allocated. If @@ -1730,6 +1920,11 @@ int symbol__disassemble(struct symbol *sym, struct annotate_args *args) strcpy(symfs_filename, tmp); } +#ifdef HAVE_LIBLLVM_SUPPORT + err = symbol__disassemble_llvm(symfs_filename, sym, args); + if (err == 0) + goto out_remove_tmp; +#endif #ifdef HAVE_LIBCAPSTONE_SUPPORT err = symbol__disassemble_capstone(symfs_filename, sym, args); if (err == 0) diff --git a/tools/perf/util/llvm-c-helpers.cpp b/tools/perf/util/llvm-c-helpers.cpp index 3cc967ec6f28..4070e2d5682f 100644 --- a/tools/perf/util/llvm-c-helpers.cpp +++ b/tools/perf/util/llvm-c-helpers.cpp @@ -8,6 +8,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" /* Needed for LLVM <= 15 */ #include +#include #pragma GCC diagnostic pop #include @@ -19,6 +20,9 @@ extern "C" { #include "symbol_conf.h" #include "llvm-c-helpers.h" +extern "C" +char *dso__demangle_sym(struct dso *dso, int kmodule, const char *elf_name); + using namespace llvm; using llvm::symbolize::LLVMSymbolizer; @@ -132,3 +136,61 @@ int llvm_addr2line(const char *dso_name, u64 addr, return extract_file_and_line(*res_or_err, file, line); } } + +static char * +make_symbol_relative_string(struct dso *dso, const char *sym_name, + u64 addr, u64 base_addr) +{ + if (!strcmp(sym_name, "")) + return NULL; + + char *demangled = dso__demangle_sym(dso, 0, sym_name); + if (base_addr && base_addr != addr) { + char buf[256]; + snprintf(buf, sizeof(buf), "%s+0x%lx", + demangled ? demangled : sym_name, addr - base_addr); + free(demangled); + return strdup(buf); + } else { + if (demangled) + return demangled; + else + return strdup(sym_name); + } +} + +extern "C" +char *llvm_name_for_code(struct dso *dso, const char *dso_name, u64 addr) +{ + LLVMSymbolizer *symbolizer = get_symbolizer(); + object::SectionedAddress sectioned_addr = { + addr, + object::SectionedAddress::UndefSection + }; + Expected res_or_err = + symbolizer->symbolizeCode(dso_name, sectioned_addr); + if (!res_or_err) { + return NULL; + } + return make_symbol_relative_string( + dso, res_or_err->FunctionName.c_str(), + addr, res_or_err->StartAddress ? *res_or_err->StartAddress : 0); +} + +extern "C" +char *llvm_name_for_data(struct dso *dso, const char *dso_name, u64 addr) +{ + LLVMSymbolizer *symbolizer = get_symbolizer(); + object::SectionedAddress sectioned_addr = { + addr, + object::SectionedAddress::UndefSection + }; + Expected res_or_err = + symbolizer->symbolizeData(dso_name, sectioned_addr); + if (!res_or_err) { + return NULL; + } + return make_symbol_relative_string( + dso, res_or_err->Name.c_str(), + addr, res_or_err->Start); +} diff --git a/tools/perf/util/llvm-c-helpers.h b/tools/perf/util/llvm-c-helpers.h index 1b28cdc9f9b7..e00e3f73a906 100644 --- a/tools/perf/util/llvm-c-helpers.h +++ b/tools/perf/util/llvm-c-helpers.h @@ -11,6 +11,8 @@ extern "C" { #endif +struct dso; + struct llvm_a2l_frame { char *filename; char *funcname; @@ -40,6 +42,15 @@ int llvm_addr2line(const char *dso_name, bool unwind_inlines, struct llvm_a2l_frame **inline_frames); +/* + * Simple symbolizers for addresses; will convert something like + * 0x12345 to "func+0x123". Will return NULL if no symbol was found. + * + * The returned value must be freed by the caller, with free(). + */ +char *llvm_name_for_code(struct dso *dso, const char *dso_name, u64 addr); +char *llvm_name_for_data(struct dso *dso, const char *dso_name, u64 addr); + #ifdef __cplusplus } #endif -- 2.45.1