Received: by 2002:ab2:b82:0:b0:1f3:401:3cfb with SMTP id 2csp768189lqh; Thu, 28 Mar 2024 16:21:00 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXGOp49ORsbfVGYRRnBz9oqxg36jXSNOtWbVNkPPkYcrBDTQl9CwCJNXP5YBzwj8MDnTllcBeaOtbFG8Q/WiJruyvajIULBbFcYXm/xAA== X-Google-Smtp-Source: AGHT+IGwfgbeKuGNr6ssQM4cmwgU5dDSEzBKEn3kCVickbEnsn/Cch0ryv+YtGunjKEOf+mkaIjC X-Received: by 2002:a05:6512:368b:b0:515:bb3a:10ae with SMTP id d11-20020a056512368b00b00515bb3a10aemr583122lfs.13.1711668059785; Thu, 28 Mar 2024 16:20:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711668059; cv=pass; d=google.com; s=arc-20160816; b=axRuwu4oCavfg++NR/Lhu3ytNJGchceXdEVClcC/lMzYA77AJLwouygSbMFfAQXq8e yDdAbZtRc1vDYupqBmjw+wD1V34ovtEgW50UvmpsqqSXhTzgghVrYzUl7sw4jJCSqJ6X EEpiXGf/Z2ANVnyZbAlzD1SrF4U1rpthhBkQif9uKD7leEDFUqbHnGEBDFdwFSO3z15+ 6DAELi/fr0qySu9TuudSBom7Zng1j87tNXKeX03v8yQxf9GwmbUkiGqhE0jyqiRcb846 OuMF1v6ur3aeKo0G8jUGOr9SVikVMD+uu8np1mbPRxZaOxbW5/JD2QIB+hbbEWpW9O26 VSnA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Z2q+lAzMv01CDnr7rQzhB5u4mvRSSIBhyOOduN3vrxM=; fh=8Sv5nCPXMa4LXSOPSfwdAm5a0jrvTKlFawPSw9GHaY8=; b=MZ1eG2XQ5/1hRkkkWY8yFc1DepDJrsZSd1795IRmZdbCmlKxVH7JpQxZmbmCzIe2va J0uEMpt+QYyUqU5I30pb+KbPMpub7s8Aw+r+6ZDpMICGvfDsozSSGvyWEuf4yUiMqzDh BNiSrOP/MqBB4EQ87KjUxh27hw+3w2JSg2dveQUy8YYsGIanReTECPur8q/VdrTH7wFa ozHbqJQcnMiB/WdArmtgZmoiv8wCxSEdBXWASKsIkC01W3qR5DFLupT2m0QpW3URNIy/ Zm5Bj9bsIrpNNROrgztymgPbaqNnhsllxObnHonj0KRtsrIbyeWsX4JTtokLaQOYS0Fm PH6Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rCrm9lXC; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-123821-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-123821-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id ko11-20020a170906aa0b00b00a4649541994si1145798ejb.654.2024.03.28.16.20.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 16:20:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-123821-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rCrm9lXC; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-123821-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-123821-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org 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 am.mirrors.kernel.org (Postfix) with ESMTPS id 561871F24D17 for ; Thu, 28 Mar 2024 23:20:59 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 35AFE13AD3F; Thu, 28 Mar 2024 23:20:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rCrm9lXC" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CF1C13A240; Thu, 28 Mar 2024 23:20:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711668013; cv=none; b=M6uyLoIGFyzljHXNcszTNDtbLlY6upRtc+LeBaEIViHGOrjPgacLvbBBLfVSDvz8rV1Ff/SJQONdTdGu2H6slqzGaPypHbRGU2YkMAWoWYQIIVUIVEdmZWGbcL+PvPMe/wTIk/wQ4nye2RI5HUy8uVZQ9CyG2OglZJ8jzKft+D8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711668013; c=relaxed/simple; bh=lFsA0nS63Z5c6P80Aq7VRGRFpbOphmG2SkLmIULSo/s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D6+vmAo3h684Tw7gEctjEL2ySofzerp0FVx7B8BmzmFxd2CEgsy5c0+rxnpzZbWJtbP7CsWjrYx4X6WgYnn9eFY1xR2GarZvDsJD1MP3kinegl2ebHrokkyWPWjPnGgdCFvxA9iynOJFjvKoz7FkHMdm0fS75jcWkudeWRUy1+8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rCrm9lXC; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76714C433A6; Thu, 28 Mar 2024 23:20:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711668012; bh=lFsA0nS63Z5c6P80Aq7VRGRFpbOphmG2SkLmIULSo/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rCrm9lXC05qfenVdq4RX6asHVvozVufqTxtfg+3teFMon3bRH1yICsfaAIMsne0Lz vhouayYUcKBTWdiI2GHcHkUZvBtxc++QYj/zy63gL4VzI/V9pA+UeLfs/U0bLV0e+h euVnlcj0AvSSIunFCw6OTSvb1gjpnUIXFAgkWqkOSbeZhVFENgPdLKUkncDu0pcFNJ Zjr1ihK3xTZDr42AE0a2PLJ3xPozktV786w0sXxvb8DD7w+/nLt9DLwo1oP+DWjWCN jkXglENXX3J/T+G8vnI2u1Q1lZunZkZv8qsILifbfuDoiw8QMtojWqqCxxbk+bCkM2 603byW4wrwOIA== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Changbin Du Subject: [PATCH 4/4] perf annotate: Use libcapstone to disassemble Date: Thu, 28 Mar 2024 16:20:09 -0700 Message-ID: <20240328232009.466018-5-namhyung@kernel.org> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog In-Reply-To: <20240328232009.466018-1-namhyung@kernel.org> References: <20240328232009.466018-1-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Now it can use the capstone library to disassemble the instructions. Let's use that (if available) for perf annotate to speed up. Currently it only supports x86 architecture. With this change I can see ~3x speed up in data type profiling. But note that capstone cannot give the source file and line number info. For now, users should use the external objdump for that by specifying the --objdump option explicitly. Cc: Changbin Du Signed-off-by: Namhyung Kim --- tools/perf/util/disasm.c | 153 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 59ac37723990..c58ea6d822ed 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only #include #include +#include #include #include #include @@ -18,6 +19,7 @@ #include "evsel.h" #include "map.h" #include "maps.h" +#include "namespaces.h" #include "srcline.h" #include "symbol.h" @@ -1341,6 +1343,151 @@ symbol__disassemble_bpf_image(struct symbol *sym, return 0; } +#ifdef HAVE_LIBCAPSTONE_SUPPORT +#include + +static int open_capstone_handle(struct annotate_args *args, bool is_64bit, + csh *handle) +{ + struct annotation_options *opt = args->options; + cs_mode mode = is_64bit ? CS_MODE_64 : CS_MODE_32; + + /* TODO: support more architectures */ + if (!arch__is(args->arch, "x86")) + return -1; + + if (cs_open(CS_ARCH_X86, mode, handle) != CS_ERR_OK) + return -1; + + if (!opt->disassembler_style || + !strcmp(opt->disassembler_style, "att")) + cs_option(*handle, CS_OPT_SYNTAX, CS_OPT_SYNTAX_ATT); + + /* + * Resolving address operands to symbols is implemented + * on x86 by investigating instruction details. + */ + cs_option(*handle, CS_OPT_DETAIL, CS_OPT_ON); + + return 0; +} + +struct find_file_offset_data { + u64 ip; + u64 offset; +}; + +/* This will be called for each PHDR in an ELF binary */ +static int find_file_offset(u64 start, u64 len, u64 pgoff, void *arg) +{ + struct find_file_offset_data *data = arg; + + if (start <= data->ip && data->ip < start + len) { + data->offset = pgoff + data->ip - start; + return 1; + } + return 0; +} + +static int symbol__disassemble_capstone(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); + struct nscookie nsc; + u64 start = map__rip_2objdump(map, sym->start); + u64 end = map__rip_2objdump(map, sym->end); + u64 len = end - start; + u64 offset; + int i, fd, count; + bool is_64bit = false; + bool needs_cs_close = false; + u8 *buf = NULL; + struct find_file_offset_data data = { + .ip = start, + }; + csh handle; + cs_insn *insn; + + if (args->options->objdump_path) + return -1; + + nsinfo__mountns_enter(dso->nsinfo, &nsc); + fd = open(filename, O_RDONLY); + nsinfo__mountns_exit(&nsc); + if (fd < 0) + return -1; + + if (file__read_maps(fd, /*exe=*/true, find_file_offset, &data, + &is_64bit) == 0) + goto err; + + if (open_capstone_handle(args, is_64bit, &handle) < 0) + goto err; + + needs_cs_close = true; + + buf = malloc(len); + if (buf == NULL) + goto err; + + count = pread(fd, buf, len, data.offset); + close(fd); + fd = -1; + + if ((u64)count != len) + goto err; + + count = cs_disasm(handle, buf, len, start, len, &insn); + for (i = 0, offset = 0; i < count; i++) { + char disasm_buf[256]; + struct disasm_line *dl; + + scnprintf(disasm_buf, sizeof(disasm_buf), "%s %s", + insn[i].mnemonic, insn[i].op_str); + + args->offset = offset; + 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); + + offset += insn[i].size; + } + +out: + if (needs_cs_close) + cs_close(&handle); + free(buf); + return count < 0 ? count : 0; + +err: + if (fd >= 0) + close(fd); + if (needs_cs_close) { + struct disasm_line *dl, *tmp; + + /* + * It probably failed in the middle of the above loop. + * Release any resources it might add. + */ + list_for_each_entry_safe(dl, tmp, ¬es->src->source, al.node) { + list_del(&dl->al.node); + free(dl); + } + } + count = -1; + goto out; +} +#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 @@ -1463,6 +1610,12 @@ int symbol__disassemble(struct symbol *sym, struct annotate_args *args) strcpy(symfs_filename, tmp); } +#ifdef HAVE_LIBCAPSTONE_SUPPORT + err = symbol__disassemble_capstone(symfs_filename, sym, args); + if (err == 0) + goto out_remove_tmp; +#endif + err = asprintf(&command, "%s %s%s --start-address=0x%016" PRIx64 " --stop-address=0x%016" PRIx64 -- 2.44.0.478.gd926399ef9-goog