Message-ID: <Z5QOhHx7-jS_aSHU@google.com>
Date: Fri, 24 Jan 2025 14:04:52 -0800
From: Namhyung Kim <namhyung@...nel.org>
To: Ian Rogers <irogers@...gle.com>
Cc: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>,
	Arnaldo Carvalho de Melo <acme@...nel.org>,
	Mark Rutland <mark.rutland@....com>,
	Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
	Jiri Olsa <jolsa@...nel.org>,
	Adrian Hunter <adrian.hunter@...el.com>,
	Kan Liang <kan.liang@...ux.intel.com>,
	Nathan Chancellor <nathan@...nel.org>,
	Nick Desaulniers <ndesaulniers@...gle.com>,
	Bill Wendling <morbo@...gle.com>,
	Justin Stitt <justinstitt@...gle.com>,
	Aditya Gupta <adityag@...ux.ibm.com>,
	"Steinar H. Gunderson" <sesse@...gle.com>,
	Charlie Jenkins <charlie@...osinc.com>,
	Changbin Du <changbin.du@...wei.com>,
	"Masami Hiramatsu (Google)" <mhiramat@...nel.org>,
	James Clark <james.clark@...aro.org>,
	Kajol Jain <kjain@...ux.ibm.com>,
	Athira Rajeev <atrajeev@...ux.vnet.ibm.com>,
	Li Huafei <lihuafei1@...wei.com>,
	Dmitry Vyukov <dvyukov@...gle.com>, Andi Kleen <ak@...ux.intel.com>,
	Chaitanya S Prakash <chaitanyas.prakash@....com>,
	linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org,
	llvm@...ts.linux.dev, Song Liu <song@...nel.org>,
	bpf@...r.kernel.org
Subject: Re: [PATCH v3 04/18] perf llvm: Move llvm functionality into its own
 file

On Wed, Jan 22, 2025 at 09:42:54AM -0800, Ian Rogers wrote:
> LLVM disassembly support was in disasm.c and addr2line support in
> srcline.c. Move support out of these files into llvm.[ch] and remove
> LLVM includes from those files. As disassembl routines can fail, make
> failure the only option without HAVE_LIBLLVM_SUPPORT. For simplicity's
> sake, duplicate the read_symbol utility function.
> 
> The intent with moving LLVM support into a single file is that dynamic
> support, using dlopen for libllvm, can be added in later patches. This
> can potentially always succeed or fail, so relying on ifdefs isn't
> sufficient. Using dlopen is a useful option to minimize the perf tools
> dependencies and potentially size.
> 
> Signed-off-by: Ian Rogers <irogers@...gle.com>
> ---
>  tools/perf/util/Build     |   1 +
>  tools/perf/util/disasm.c  | 262 +-----------------------------
>  tools/perf/util/disasm.h  |   2 +
>  tools/perf/util/llvm.c    | 326 ++++++++++++++++++++++++++++++++++++++
>  tools/perf/util/llvm.h    |  24 +++
>  tools/perf/util/srcline.c |  65 ++------
>  tools/perf/util/srcline.h |   6 +
>  7 files changed, 373 insertions(+), 313 deletions(-)
>  create mode 100644 tools/perf/util/llvm.c
>  create mode 100644 tools/perf/util/llvm.h
> 
> diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> index 9542decf9625..6fe0b5882c97 100644
> --- a/tools/perf/util/Build
> +++ b/tools/perf/util/Build
> @@ -26,6 +26,7 @@ perf-util-y += evswitch.o
>  perf-util-y += find_bit.o
>  perf-util-y += get_current_dir_name.o
>  perf-util-y += levenshtein.o
> +perf-util-y += llvm.o
>  perf-util-y += mmap.o
>  perf-util-y += memswap.o
>  perf-util-y += parse-events.o
> diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c
> index 0e5881189ae8..a9cc588a3006 100644
> --- a/tools/perf/util/disasm.c
> +++ b/tools/perf/util/disasm.c
> @@ -22,6 +22,7 @@
>  #include "dwarf-regs.h"
>  #include "env.h"
>  #include "evsel.h"
> +#include "llvm.h"
>  #include "map.h"
>  #include "maps.h"
>  #include "namespaces.h"
> @@ -50,7 +51,6 @@ 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 int disasm_line__parse_powerpc(struct disasm_line *dl);
> -static char *expand_tabs(char *line, char **storage, size_t *storage_len);
>  
>  static __attribute__((constructor)) void symbol__init_regexpr(void)
>  {
> @@ -1330,72 +1330,6 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil
>  	return 0;
>  }
>  
> -#if defined(HAVE_LIBLLVM_SUPPORT)
> -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 u8 *
> -read_symbol(const char *filename, struct map *map, struct symbol *sym,
> -	    u64 *len, bool *is_64bit)
> -{
> -	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);
> -	int fd, count;
> -	u8 *buf = NULL;
> -	struct find_file_offset_data data = {
> -		.ip = start,
> -	};
> -
> -	*is_64bit = false;
> -
> -	nsinfo__mountns_enter(dso__nsinfo(dso), &nsc);
> -	fd = open(filename, O_RDONLY);
> -	nsinfo__mountns_exit(&nsc);
> -	if (fd < 0)
> -		return NULL;
> -
> -	if (file__read_maps(fd, /*exe=*/true, find_file_offset, &data,
> -			    is_64bit) == 0)
> -		goto err;
> -
> -	*len = end - start;
> -	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;
> -
> -	return buf;
> -
> -err:
> -	if (fd >= 0)
> -		close(fd);
> -	free(buf);
> -	return NULL;
> -}
> -#endif
> -
>  static int symbol__disassemble_raw(char *filename, struct symbol *sym,
>  					struct annotate_args *args)
>  {
> @@ -1482,202 +1416,12 @@ static int symbol__disassemble_raw(char *filename, struct symbol *sym,
>  	goto out;
>  }
>  
> -#ifdef HAVE_LIBLLVM_SUPPORT
> -#include <llvm-c/Disassembler.h>
> -#include <llvm-c/Target.h>
> -#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 = 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;
> -	int ret = -1;
> -
> -	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, &notes->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, &notes->src->source);
> -
> -		free(args->fileloc);
> -		pc += ins_len;
> -		offset += ins_len;
> -	}
> -
> -	ret = 0;
> -
> -err:
> -	LLVMDisasmDispose(disasm);
> -	free(buf);
> -	free(line_storage);
> -	return ret;
> -}
> -#else // HAVE_LIBLLVM_SUPPORT
> -static int symbol__disassemble_llvm(const char *filename, struct symbol *sym,
> -				    struct annotate_args *args __maybe_unused)
> -{
> -	pr_debug("The LLVM disassembler isn't linked in for %s in %s\n",
> -		 sym->name, filename);
> -	return -1;
> -}
> -#endif // HAVE_LIBLLVM_SUPPORT
> -
>  /*
>   * 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
>   * allocation fails then NULL is returned.
>   */
> -static char *expand_tabs(char *line, char **storage, size_t *storage_len)
> +char *expand_tabs(char *line, char **storage, size_t *storage_len)
>  {
>  	size_t i, src, dst, len, new_storage_len, num_tabs;
>  	char *new_line;
> @@ -1876,9 +1620,7 @@ static int annotation_options__init_disassemblers(struct annotation_options *opt
>  
>  	if (options->disassemblers_str == NULL) {
>  		const char *default_disassemblers_str =
> -#ifdef HAVE_LIBLLVM_SUPPORT
>  				"llvm,"
> -#endif
>  				"capstone,"
>  				"objdump";
>  
> diff --git a/tools/perf/util/disasm.h b/tools/perf/util/disasm.h
> index c135db2416b5..2cb4e1a6bd30 100644
> --- a/tools/perf/util/disasm.h
> +++ b/tools/perf/util/disasm.h
> @@ -128,4 +128,6 @@ int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size,
>  
>  int symbol__disassemble(struct symbol *sym, struct annotate_args *args);
>  
> +char *expand_tabs(char *line, char **storage, size_t *storage_len);
> +
>  #endif /* __PERF_UTIL_DISASM_H */
> diff --git a/tools/perf/util/llvm.c b/tools/perf/util/llvm.c
> new file mode 100644
> index 000000000000..ddc737194692
> --- /dev/null
> +++ b/tools/perf/util/llvm.c
> @@ -0,0 +1,326 @@
> +// SPDX-License-Identifier: GPL-2.0
> +#include "llvm.h"
> +#include "annotate.h"
> +#include "debug.h"
> +#include "dso.h"
> +#include "map.h"
> +#include "namespaces.h"
> +#include "srcline.h"
> +#include "symbol.h"
> +#include <fcntl.h>
> +#include <unistd.h>
> +#include <linux/zalloc.h>
> +
> +#ifdef HAVE_LIBLLVM_SUPPORT
> +#include "llvm-c-helpers.h"
> +#include <llvm-c/Disassembler.h>
> +#include <llvm-c/Target.h>
> +#endif

Same comment as the previous one.

Thanks,
Namhyung

> +
> +#ifdef HAVE_LIBLLVM_SUPPORT
> +static void free_llvm_inline_frames(struct llvm_a2l_frame *inline_frames,
> +				    int num_frames)
> +{
> +	if (inline_frames != NULL) {
> +		for (int i = 0; i < num_frames; ++i) {
> +			zfree(&inline_frames[i].filename);
> +			zfree(&inline_frames[i].funcname);
> +		}
> +		zfree(&inline_frames);
> +	}
> +}
> +#endif
> +
> +int llvm__addr2line(const char *dso_name __maybe_unused, u64 addr __maybe_unused,
> +		     char **file __maybe_unused, unsigned int *line __maybe_unused,
> +		     struct dso *dso __maybe_unused, bool unwind_inlines __maybe_unused,
> +		     struct inline_node *node __maybe_unused, struct symbol *sym __maybe_unused)
> +{
> +#ifdef HAVE_LIBLLVM_SUPPORT
> +	struct llvm_a2l_frame *inline_frames = NULL;
> +	int num_frames = llvm_addr2line(dso_name, addr, file, line,
> +					node && unwind_inlines, &inline_frames);
> +
> +	if (num_frames == 0 || !inline_frames) {
> +		/* Error, or we didn't want inlines. */
> +		return num_frames;
> +	}
> +
> +	for (int i = 0; i < num_frames; ++i) {
> +		struct symbol *inline_sym =
> +			new_inline_sym(dso, sym, inline_frames[i].funcname);
> +		char *srcline = NULL;
> +
> +		if (inline_frames[i].filename) {
> +			srcline =
> +				srcline_from_fileline(inline_frames[i].filename,
> +						      inline_frames[i].line);
> +		}
> +		if (inline_list__append(inline_sym, srcline, node) != 0) {
> +			free_llvm_inline_frames(inline_frames, num_frames);
> +			return 0;
> +		}
> +	}
> +	free_llvm_inline_frames(inline_frames, num_frames);
> +
> +	return num_frames;
> +#else
> +	return -1;
> +#endif
> +}
> +
> +void dso__free_a2l_llvm(struct dso *dso __maybe_unused)
> +{
> +	/* Nothing to free. */
> +}
> +
> +
> +#if defined(HAVE_LIBLLVM_SUPPORT)
> +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 u8 *
> +read_symbol(const char *filename, struct map *map, struct symbol *sym,
> +	    u64 *len, bool *is_64bit)
> +{
> +	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);
> +	int fd, count;
> +	u8 *buf = NULL;
> +	struct find_file_offset_data data = {
> +		.ip = start,
> +	};
> +
> +	*is_64bit = false;
> +
> +	nsinfo__mountns_enter(dso__nsinfo(dso), &nsc);
> +	fd = open(filename, O_RDONLY);
> +	nsinfo__mountns_exit(&nsc);
> +	if (fd < 0)
> +		return NULL;
> +
> +	if (file__read_maps(fd, /*exe=*/true, find_file_offset, &data,
> +			    is_64bit) == 0)
> +		goto err;
> +
> +	*len = end - start;
> +	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;
> +
> +	return buf;
> +
> +err:
> +	if (fd >= 0)
> +		close(fd);
> +	free(buf);
> +	return NULL;
> +}
> +#endif
> +
> +/*
> + * 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.
> + */
> +#ifdef HAVE_LIBLLVM_SUPPORT
> +struct symbol_lookup_storage {
> +	u64 branch_addr;
> +	u64 pcrel_load_addr;
> +};
> +
> +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 = 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;
> +}
> +#endif
> +
> +int symbol__disassemble_llvm(const char *filename, struct symbol *sym,
> +			     struct annotate_args *args __maybe_unused)
> +{
> +#ifdef HAVE_LIBLLVM_SUPPORT
> +	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;
> +	int ret = -1;
> +
> +	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, &notes->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, &notes->src->source);
> +
> +		free(args->fileloc);
> +		pc += ins_len;
> +		offset += ins_len;
> +	}
> +
> +	ret = 0;
> +
> +err:
> +	LLVMDisasmDispose(disasm);
> +	free(buf);
> +	free(line_storage);
> +	return ret;
> +#else // HAVE_LIBLLVM_SUPPORT
> +	pr_debug("The LLVM disassembler isn't linked in for %s in %s\n",
> +		 sym->name, filename);
> +	return -1;
> +#endif
> +}
> diff --git a/tools/perf/util/llvm.h b/tools/perf/util/llvm.h
> new file mode 100644
> index 000000000000..8aa19bb6b068
> --- /dev/null
> +++ b/tools/perf/util/llvm.h
> @@ -0,0 +1,24 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef __PERF_LLVM_H
> +#define __PERF_LLVM_H
> +
> +#include <stdbool.h>
> +#include <linux/types.h>
> +
> +struct annotate_args;
> +struct dso;
> +struct inline_node;
> +struct symbol;
> +
> +int llvm__addr2line(const char *dso_name, u64 addr,
> +		char **file, unsigned int *line, struct dso *dso,
> +		bool unwind_inlines, struct inline_node *node,
> +		struct symbol *sym);
> +
> +
> +void dso__free_a2l_llvm(struct dso *dso);
> +
> +int symbol__disassemble_llvm(const char *filename, struct symbol *sym,
> +			     struct annotate_args *args);
> +
> +#endif /* __PERF_LLVM_H */
> diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
> index f32d0d4f4bc9..26fd55455efd 100644
> --- a/tools/perf/util/srcline.c
> +++ b/tools/perf/util/srcline.c
> @@ -17,9 +17,7 @@
>  #include "util/debug.h"
>  #include "util/callchain.h"
>  #include "util/symbol_conf.h"
> -#ifdef HAVE_LIBLLVM_SUPPORT
> -#include "util/llvm-c-helpers.h"
> -#endif
> +#include "llvm.h"
>  #include "srcline.h"
>  #include "string2.h"
>  #include "symbol.h"
> @@ -49,8 +47,7 @@ static const char *srcline_dso_name(struct dso *dso)
>  	return dso_name;
>  }
>  
> -static int inline_list__append(struct symbol *symbol, char *srcline,
> -			       struct inline_node *node)
> +int inline_list__append(struct symbol *symbol, char *srcline, struct inline_node *node)
>  {
>  	struct inline_list *ilist;
>  
> @@ -77,7 +74,7 @@ static const char *gnu_basename(const char *path)
>  	return base ? base + 1 : path;
>  }
>  
> -static char *srcline_from_fileline(const char *file, unsigned int line)
> +char *srcline_from_fileline(const char *file, unsigned int line)
>  {
>  	char *srcline;
>  
> @@ -93,9 +90,9 @@ static char *srcline_from_fileline(const char *file, unsigned int line)
>  	return srcline;
>  }
>  
> -static struct symbol *new_inline_sym(struct dso *dso,
> -				     struct symbol *base_sym,
> -				     const char *funcname)
> +struct symbol *new_inline_sym(struct dso *dso,
> +			      struct symbol *base_sym,
> +			      const char *funcname)
>  {
>  	struct symbol *inline_sym;
>  	char *demangled = NULL;
> @@ -135,58 +132,20 @@ static struct symbol *new_inline_sym(struct dso *dso,
>  #define MAX_INLINE_NEST 1024
>  
>  #ifdef HAVE_LIBLLVM_SUPPORT
> -
> -static void free_llvm_inline_frames(struct llvm_a2l_frame *inline_frames,
> -				    int num_frames)
> -{
> -	if (inline_frames != NULL) {
> -		for (int i = 0; i < num_frames; ++i) {
> -			zfree(&inline_frames[i].filename);
> -			zfree(&inline_frames[i].funcname);
> -		}
> -		zfree(&inline_frames);
> -	}
> -}
> +#include "llvm.h"
>  
>  static int addr2line(const char *dso_name, u64 addr,
>  		     char **file, unsigned int *line, struct dso *dso,
> -		     bool unwind_inlines, struct inline_node *node,
> -		     struct symbol *sym)
> +		      bool unwind_inlines, struct inline_node *node,
> +		      struct symbol *sym)
>  {
> -	struct llvm_a2l_frame *inline_frames = NULL;
> -	int num_frames = llvm_addr2line(dso_name, addr, file, line,
> -					node && unwind_inlines, &inline_frames);
> -
> -	if (num_frames == 0 || !inline_frames) {
> -		/* Error, or we didn't want inlines. */
> -		return num_frames;
> -	}
> -
> -	for (int i = 0; i < num_frames; ++i) {
> -		struct symbol *inline_sym =
> -			new_inline_sym(dso, sym, inline_frames[i].funcname);
> -		char *srcline = NULL;
> -
> -		if (inline_frames[i].filename) {
> -			srcline =
> -				srcline_from_fileline(inline_frames[i].filename,
> -						      inline_frames[i].line);
> -		}
> -		if (inline_list__append(inline_sym, srcline, node) != 0) {
> -			free_llvm_inline_frames(inline_frames, num_frames);
> -			return 0;
> -		}
> -	}
> -	free_llvm_inline_frames(inline_frames, num_frames);
> -
> -	return num_frames;
> +	return llvm__addr2line(dso_name, addr, file, line, dso, unwind_inlines, node, sym);
>  }
>  
> -void dso__free_a2l(struct dso *dso __maybe_unused)
> +void dso__free_a2l(struct dso *dso)
>  {
> -	/* Nothing to free. */
> +	dso__free_a2l_llvm(dso);
>  }
> -
>  #elif defined(HAVE_LIBBFD_SUPPORT)
>  
>  /*
> diff --git a/tools/perf/util/srcline.h b/tools/perf/util/srcline.h
> index 75010d39ea28..80c20169e250 100644
> --- a/tools/perf/util/srcline.h
> +++ b/tools/perf/util/srcline.h
> @@ -55,4 +55,10 @@ struct inline_node *inlines__tree_find(struct rb_root_cached *tree, u64 addr);
>  /* delete all nodes within the tree of inline_node s */
>  void inlines__tree_delete(struct rb_root_cached *tree);
>  
> +int inline_list__append(struct symbol *symbol, char *srcline, struct inline_node *node);
> +char *srcline_from_fileline(const char *file, unsigned int line);
> +struct symbol *new_inline_sym(struct dso *dso,
> +			      struct symbol *base_sym,
> +			      const char *funcname);
> +
>  #endif /* PERF_SRCLINE_H */
> -- 
> 2.48.1.262.g85cc9f2d1e-goog
> 

Powered by blists - more mailing lists