Received: by 2002:ab2:7855:0:b0:1f9:5764:f03e with SMTP id m21csp870349lqp; Thu, 23 May 2024 02:30:41 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUW8wQDVhihQW78xBkOUSAlXf5sOvuGS/A7g+odWCApNwikMmZYrueAooRxJcRY8MEA692khh3GS+l0axsk3sfU7FxmDbIFdxwDyn+t5g== X-Google-Smtp-Source: AGHT+IHEScZNERoBQf6NXzLmLQVMWZ5FIua1//b2LJ6g/4IYrtwugIiWoVBcqGPXQEmqMpF8T+li X-Received: by 2002:a05:6214:4806:b0:6a8:ef64:8317 with SMTP id 6a1803df08f44-6ab8f634787mr26949556d6.30.1716456641114; Thu, 23 May 2024 02:30:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716456641; cv=pass; d=google.com; s=arc-20160816; b=cVYx/W+awCb3GadM7l2bBsuxUEG4IVFHIqC919ihBFNaqYItq5MKcrDe49/Jttd6zo FJ1+GPBGxTwdC8+MDqYftGeODRRGEcP3734e4GLkWxTwF1FxKZVNt5W6yvCYYkYRthLJ aJ27U2/cwA6c+iYnTM/S/Ddeu17ZEfq8nVReHjyC3DPaQGvDRVKc1KE3hSUqNfiSoYTE 1CNm2Zsn+SiyUMMBE17PT7dV7cfFmrCVJ5KmwXe3DHB6v53XcLVoEgqHLugepgNHDgiY ArU+7HftZKco6uakI2OVVOSc7eKO72si5BzzEizdHNaj4/eVzbhRuTeK07Sl62uMPZ1L 56ww== 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=xFFrjsWT4NZH+pAqgWoVjiQ47/9f6fzinw0iFw6xqnc=; fh=9wkKkBLdNIcacUQ/1jHs5zHPNrDauTz0lVJmaKakW/0=; b=Y48gnYBidh+9awB/nKft1rHXud2W+IdwnM4E/6I528h3pLJb9tlAk3zcXoE53uHGmL UViDhCGW/uelQEkRdJ+1VvJh4XIrmoM1D5RjUce83Wk5NDw111gjw6s+NxBMh70MjDxl uopXpuQrWXjfo8yjlqI7KQjJv4hN2pjt0BEBhhS2xuTH6ztP+7hOkt2Uhkg8nYJHHHZr TzxgWn6YTBoPbNsbszmycEnT+MLKcCb4NC3RLpVj5vkx3Ji5Qtkt/5NfqIkv82FFRRQZ orS9+Z1Np2H6I8UAGqRUNqV3gVoDJqDCXS9mSD+1ZrOvgJmlpiNjPVc28pxVwlqDgQ1i ZpDw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=ex0lMMjv; 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-187270-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-187270-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 6a1803df08f44-6a15f2e570esi4913086d6.434.2024.05.23.02.30.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 02:30:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-187270-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=ex0lMMjv; 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-187270-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-187270-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 C474A1C21B0F for ; Thu, 23 May 2024 09:30:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3C6DF13D53A; Thu, 23 May 2024 09:29:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ex0lMMjv" Received: from mail-lj1-f202.google.com (mail-lj1-f202.google.com [209.85.208.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 D41F713D538 for ; Thu, 23 May 2024 09:29:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716456577; cv=none; b=pvjiWrYDG6NzdyG25ALco8HDOViranClWNPvt6cpYl+VmmW88eJj8/MA3T4BVqd6eEbpQ+XitITRlQ1G7VCuHKCCvbR5ui5NuzBVePCJ0EsO6pzoxI5nvoHHlk4rA55Dnur4+F0m6yHta5oFGBBll4ybbI8e5+Y5ot8UbwO66yk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716456577; c=relaxed/simple; bh=eplE5oa+dNgnGIWa2RsDt0Ig7k+rNTZud3p/V5T2qQA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tsnJpEBziLEZktVzb1zHc+AQGStMzAkA+yPksOllUaz/GXX9oQtUBCqDEXFjg66YXo2slEHDEtpSN8ZrWMgDjbV688ig1Xdx7p2kqvev1y8zei50AR7XeYvGH289S+vvBOBHqIvb3n7+xfPazE7VhSlR8JTUe2xp0EuYUwz5z0E= 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=ex0lMMjv; arc=none smtp.client-ip=209.85.208.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--sesse.bounces.google.com Received: by mail-lj1-f202.google.com with SMTP id 38308e7fff4ca-2e3eaa1e094so9050731fa.0 for ; Thu, 23 May 2024 02:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1716456574; x=1717061374; 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=xFFrjsWT4NZH+pAqgWoVjiQ47/9f6fzinw0iFw6xqnc=; b=ex0lMMjv2Z/0TRV2X4EpneUSsVWbilc8TAaCx91XdoA85MeFieLnKKKAdC/6UgimNI J1j56EAa3YXWt2i4Vp5ocJNUq2Ed0obozXCUmHX86oWkJkQ7H8ZbuxVc4r4tcVH56LVv PTAfznEPJMeajn7jE/QA6NNcd4TpWAuAvTZEpSH7MBnxL4eH2w3ImI9cJ0MET4zkmgkM GE453liqvojD9kDzOhQlWIf2lUex938f1a8bnKAIo6+xNdGmvXyBL6w17pCunG0ueRxc ynZM/jVm3IKMJjyndjJ8HloWktas04FO1gmBRWYkr0M7D+1ucODRnVY19AQRTVQweuVA cudg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716456574; x=1717061374; 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=xFFrjsWT4NZH+pAqgWoVjiQ47/9f6fzinw0iFw6xqnc=; b=OTIFvOIA/YrKKuRp9QT+72YyAmWJ4+LsF27YMqjdSV91mkVEirDHCq27hqZjqjnHkM OGrdMTdr4V+8YBpMXJ8J4snBkmFE8E3MIoBah4QfG31B++ETH7FK7y6nYni5sg5FPVE0 5CWsDWQdA5U3Eh+6ALaJbfLiAAu+KIRjrdU9x95X6Oqzhuy6qyUBd67cEb59f334hUdM LrIeg8bVyAnnVMeIuyJ0/L7j6UOI/3hnt5y+V7YE2wx9BUTGImTdgBvo++FMqlB0dsHe 43A1r5o9tfkfE0WD2+GMd6U1gecpi8x+sCfLKMwSsiRbNmqjOWQgls1D+cWRvkRGe2+w yhcw== X-Forwarded-Encrypted: i=1; AJvYcCVTQsotRlFLiiqwqVNIPZQAJ4+KastFG3m0nIe0l4aOfA2bYTzk7+9iYgroe2NskP82/KuNSEKHBq8m/enVHseh4k0lbAISE/ZVyi+n X-Gm-Message-State: AOJu0Yy8Ha9sIeDFD/sIkmP2biXIluADbPzCIX6QXFVEI6CjrIaVCY0f EaQtCjcd1rqTPnuevFcQNggCGO0p+OYF7HelzxyMtocrpL3nTKQVN9jWlZfVLcZLlid2P2U3AQ= = X-Received: from sesse.osl.corp.google.com ([2a00:79e0:18:10:4571:1ce:5c15:9ee]) (user=sesse job=sendgmr) by 2002:a2e:84ca:0:b0:2e9:517d:529d with SMTP id 38308e7fff4ca-2e9517d5484mr18871fa.8.1716456573754; Thu, 23 May 2024 02:29:33 -0700 (PDT) Date: Thu, 23 May 2024 11:29:20 +0200 In-Reply-To: <20240523092920.3355004-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: <20240523092920.3355004-1-sesse@google.com> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1-goog Message-ID: <20240523092920.3355004-3-sesse@google.com> Subject: [PATCH v5 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..9c07d2a8c8a8 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_LLVM_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_LLVM_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_LLVM_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 cde3f1f03af0..ef10cc191344 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 @@ -16,6 +17,9 @@ #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; @@ -128,3 +132,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