Capstone/llvm improvements + dlopen support
Subsystems (2)
Ian Rogers
reviewerv7 cover Capstone/llvm improvements + dlopen support
Linking against libcapstone and libLLVM can be a significant increase in dependencies and file size if building statically. For something like perf record the disassembler and addr2line functionality won't be used. Support dynamically loading these libraries using dlopen and then calling the appropriate functions found using dlsym.
The patch series:
1) feature check libLLVM support and avoid always reinitializing the disassembler.
2) adds BPF JIT disassembly support to in memory disassemblers (LLVM and capstone) by just directing them at the BPF info linear JIT instructions (note this doesn't support source lines);
3) adds fallback to srcline's addr2line so that llvm_addr2line is tried first, then the deprecated libbfd and then the forked command tried next, moving the code for forking out of the main srcline.c file in the process.
4) adds perf_ variants of the capstone/llvm functions that will either directly call the function or use dlsym to discover it;
The addr2line LLVM functionality is written in C++. To avoid linking against libLLVM for this, a new LIBLLVM_DYNAMIC option is added where the C++ code with the libLLVM dependency will be built into a libperf-llvm.so and that dlsym-ed and called against. Ideally LLVM would extend their C API to avoid this.
v7: Refactor now the first 5 patches, that largely moved code around,
have landed. Move the dlopen code to the end of the series so that the first 8 patches can be picked improving capstone/LLVM support without adding the dlopen code. Rename the cover letter and disassembler cleanup patches.
v6: Refactor the libbfd along with capstone and LLVM, previous patch
series had tried to avoid this by just removing the deprecated BUILD_NONDISTRO code. Remove the libtracefs removal into its own patch.
v5: Rebase and comment typo fix.
v4: Rebase and addition of a patch removing an unused struct variable.
v3: Add srcline addr2line fallback trying LLVM first then forking a
process. This came up in conversation with Steinar Gunderson <[email protected]>.
Tweak the cover letter message to try to address Andi Kleen's <[email protected]> feedback that the series doesn't really achieve anything.
v2: Add mangling of the function names in libperf-llvm.so to avoid
potential infinite recursion. Add BPF JIT disassembly support to LLVM and capstone. Add/rebase the BUILD_NONDISTRO cleanup onto the series from:
https://lore.kernel.org/lkml/[email protected]/
Some other minor additional clean up.
Ian Rogers (11):
perf check: Add libLLVM feature
perf llvm: Reduce LLVM initialization
perf dso: Move read_symbol from llvm/capstone to dso perf dso: Support BPF programs in dso__read_symbol perf dso: Clean up read_symbol error handling perf disasm: Make ins__scnprintf and ins__is_nop static perf srcline: Fallback between addr2line implementations perf disasm: Remove unused evsel from annotate_args perf capstone: Support for dlopen-ing libcapstone.so perf llvm: Support for dlopen-ing libLLVM.so perf llvm: Mangle libperf-llvm.so function names
tools/perf/Documentation/perf-check.txt | 1 + tools/perf/Makefile.config | 13 + tools/perf/Makefile.perf | 24 +- tools/perf/builtin-check.c | 1 + tools/perf/tests/make | 2 + tools/perf/util/Build | 3 +- tools/perf/util/addr2line.c | 439 +++++++++++++++++++++ tools/perf/util/addr2line.h | 20 + tools/perf/util/annotate.c | 1 - tools/perf/util/capstone.c | 352 ++++++++++++----- tools/perf/util/config.c | 2 +- tools/perf/util/disasm.c | 18 +- tools/perf/util/disasm.h | 4 - tools/perf/util/dso.c | 112 ++++++ tools/perf/util/dso.h | 4 + tools/perf/util/libbfd.c | 4 +- tools/perf/util/libbfd.h | 6 +- tools/perf/util/llvm-c-helpers.cpp | 120 +++++- tools/perf/util/llvm-c-helpers.h | 24 +- tools/perf/util/llvm.c | 374 +++++++++++++----- tools/perf/util/llvm.h | 3 - tools/perf/util/srcline.c | 495 ++---------------------- tools/perf/util/srcline.h | 1 - 23 files changed, 1314 insertions(+), 709 deletions(-) create mode 100644 tools/perf/util/addr2line.c create mode 100644 tools/perf/util/addr2line.h
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 1/11 perf check: Add libLLVM feature
Advertise when perf is built with the HAVE_LIBLLVM_SUPPORT option.
--- tools/perf/Documentation/perf-check.txt | 1 + tools/perf/builtin-check.c | 1 + 2 files changed, 2 insertions(+)
tools/perf/Documentation/perf-check.txt +1 -0
@@ -56,6 +56,7 @@ feature:: libcapstone / HAVE_LIBCAPSTONE_SUPPORT libdw-dwarf-unwind / HAVE_LIBDW_SUPPORT libelf / HAVE_LIBELF_SUPPORT + libLLVM / HAVE_LIBLLVM_SUPPORT libnuma / HAVE_LIBNUMA_SUPPORT libopencsd / HAVE_CSTRACE_SUPPORT libperl / HAVE_LIBPERL_SUPPORT
tools/perf/builtin-check.c +1 -0
@@ -48,6 +48,7 @@ struct feature_status supported_features[] = {FEATURE_STATUS ("libcapstone" ,HAVE_LIBCAPSTONE_SUPPORT ),FEATURE_STATUS ("libdw-dwarf-unwind" ,HAVE_LIBDW_SUPPORT ),FEATURE_STATUS ("libelf" ,HAVE_LIBELF_SUPPORT ), +FEATURE_STATUS ("libLLVM" ,HAVE_LIBLLVM_SUPPORT ),FEATURE_STATUS ("libnuma" ,HAVE_LIBNUMA_SUPPORT ),FEATURE_STATUS ("libopencsd" ,HAVE_CSTRACE_SUPPORT ), FEATURE_STATUS_TIP("libperl", HAVE_LIBPERL_SUPPORT, "Deprecated, use LIBPERL=1 and install perl-ExtUtils-Embed/libperl-dev to build with it"),
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 2/11 perf llvm: Reduce LLVM initialization
In reply to Ian RogersMove the 3 LLVM initialization routines to be called in a single init_llvm function that has its own bool to avoid repeated initialization. Reduce the scope of triplet and avoid copying strings for x86.
--- tools/perf/util/llvm.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)
tools/perf/util/llvm.c +20 -11
@@ -74,6 +74,17 @@ void dso__free_a2l_llvm(struct dso *dso __maybe_unused)/* Nothing to free. */ } +static void init_llvm (void ) +{ +static bool init; + +if (!init) { +LLVMInitializeAllTargetInfos (); +LLVMInitializeAllTargetMCs (); +LLVMInitializeAllDisassemblers (); + init = true; + } +}#if defined(HAVE_LIBLLVM_SUPPORT ) struct find_file_offset_data {
@@ -184,7 +195,6 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym,u64 len;u64 pc;bool is_64bit; -char triplet[64 ];char disasm_buf[2048 ];size_t disasm_len;struct disasm_line *dl;
@@ -197,26 +207,25 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym,if (args->options->objdump_path)return -1 ; -LLVMInitializeAllTargetInfos (); -LLVMInitializeAllTargetMCs (); -LLVMInitializeAllDisassemblers (); - buf =read_symbol (filename, map, sym, &len, &is_64bit);if (buf ==NULL )return -1 ; +init_llvm ();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" ); +const char *triplet = is_64bit ?"x86_64-pc-linux" :"i686-pc-linux" ; + + disasm =LLVMCreateDisasm (triplet, &storage,/*tag_type=*/ 0 , +/*get_op_info=*/ NULL , symbol_lookup_callback); }else { +char triplet[64 ]; +scnprintf (triplet,sizeof (triplet),"%s-linux-gnu" , args->arch->name); + disasm =LLVMCreateDisasm (triplet, &storage,/*tag_type=*/ 0 , +/*get_op_info=*/ NULL , symbol_lookup_callback); } - disasm =LLVMCreateDisasm (triplet, &storage,0 ,NULL , - symbol_lookup_callback);if (disasm ==NULL ) goto err;
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 3/11 perf dso: Move read_symbol from llvm/capstone to dso
In reply to Ian RogersMove the read_symbol function to dso.h, make the return type const and add a mutable out_buf out parameter. In future changes this will allow a code pointer to be returned without necessary allocating memory.
--- tools/perf/util/capstone.c | 66 +++++----------------------- tools/perf/util/dso.c | 67 +++++++++++++++++++++++++++++ tools/perf/util/dso.h | 4 ++ tools/perf/util/llvm.c | 88 +++++++------------------------------- 4 files changed, 97 insertions(+), 128 deletions(-)
tools/perf/util/capstone.c +11 -55
@@ -215,55 +215,6 @@ static int find_file_offset(u64 start, u64 len, u64 pgoff, void *arg) }#endif -#ifdef HAVE_LIBCAPSTONE_SUPPORT -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 -int symbol__disassemble_capstone (const char *filename__maybe_unused ,struct symbol *sym__maybe_unused ,struct annotate_args *args__maybe_unused )
@@ -271,13 +222,17 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused,#ifdef HAVE_LIBCAPSTONE_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); -u64 len;u64 offset;int i, count, free_count;bool is_64bit = false;bool needs_cs_close = false; -u8 *buf =NULL ; +/* Malloc-ed buffer containing instructions read from disk. */ +u8 *code_buf =NULL ; +/* Pointer to code to be disassembled. */ +const u8 *buf; +u64 buf_len;csh handle;cs_insn *insn =NULL ;char disasm_buf[512 ];
@@ -287,7 +242,8 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused,if (args->options->objdump_path)return -1 ; - buf =read_symbol (filename, map, sym, &len, &is_64bit); + buf =dso__read_symbol (dso, filename, map, sym, + &code_buf, &buf_len, &is_64bit);if (buf ==NULL )return -1 ;
@@ -316,7 +272,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, needs_cs_close = true; - free_count = count =cs_disasm (handle, buf, len, start, len, &insn); + free_count = count =cs_disasm (handle, buf, buf_len, start, buf_len, &insn);for (i =0 , offset =0 ; i < count; i++) {int printed;
@@ -340,7 +296,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, }/* It failed in the middle: probably due to unknown instructions */ -if (offset != len) { +if (offset != buf_len) {struct list_head *list = ¬es->src->source;/* Discard all lines and fallback to objdump */
@@ -359,7 +315,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused,if (free_count >0 )cs_free (insn, free_count); } -free (buf); +free (code_buf);return count <0 ? count :0 ; err:
tools/perf/util/dso.c +67 -0
70 lines not on this page · raw message
tools/perf/util/dso.h +4 -0
@@ -924,4 +924,8 @@ static inline struct debuginfo *dso__debuginfo(struct dso *dso) return debuginfo__new(dso__long_name(dso)); } +const u8 *dso__read_symbol (struct dso *dso,const char *symfs_filename, +const struct map *map,const struct symbol *sym, +u8 **out_buf,u64 *out_buf_len,bool *is_64bit); +#endif /* __PERF_DSO */
tools/perf/util/llvm.c +15 -73
123 lines not on this page · raw message
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 4/11 perf dso: Support BPF programs in dso__read_symbol
In reply to Ian RogersSet the buffer to the code in the BPF linear info. This enables BPF JIT code disassembly by LLVM and capstone. Move the common but minimal disassmble_bpf_image call to disassemble_objdump so that it is only called after falling back to the objdump option. Similarly move the disassmble_bpf function to disassemble_objdump and rename to disassmble_bpf_libbfd to make it clearer that this support relies on libbfd.
--- tools/perf/util/disasm.c | 12 +++-- tools/perf/util/dso.c | 100 ++++++++++++++++++++++++++------------- tools/perf/util/libbfd.c | 4 +- tools/perf/util/libbfd.h | 6 +-- 4 files changed, 80 insertions(+), 42 deletions(-)
tools/perf/util/disasm.c +7 -5
@@ -1521,6 +1521,12 @@ static int symbol__disassemble_objdump(const char *filename, struct symbol *sym,struct child_process objdump_process;int err; +if (dso__binary_type (dso) ==DSO_BINARY_TYPE__BPF_PROG_INFO ) +return symbol__disassemble_bpf_libbfd (sym, args); + +if (dso__binary_type (dso) ==DSO_BINARY_TYPE__BPF_IMAGE ) +return symbol__disassemble_bpf_image (sym, args); + err =asprintf (&command,"%s %s%s --start-address=0x%016" PRIx64 " --stop-address=0x%016" PRIx64
@@ -1655,11 +1661,7 @@ int symbol__disassemble(struct symbol *sym, struct annotate_args *args)pr_debug ("annotating [%p] %30s : [%p] %30s\n" , dso,dso__long_name (dso), sym, sym->name); -if (dso__binary_type (dso) ==DSO_BINARY_TYPE__BPF_PROG_INFO ) { -return symbol__disassemble_bpf (sym, args); - }else if (dso__binary_type (dso) ==DSO_BINARY_TYPE__BPF_IMAGE ) { -return symbol__disassemble_bpf_image (sym, args); - }else if (dso__binary_type (dso) ==DSO_BINARY_TYPE__NOT_FOUND ) { +if (dso__binary_type (dso) ==DSO_BINARY_TYPE__NOT_FOUND ) {return SYMBOL_ANNOTATE_ERRNO__COULDNT_DETERMINE_FILE_TYPE ; }else if (dso__is_kcore (dso)) { kce.addr =map__rip_2objdump (map, sym->start);
tools/perf/util/dso.c +68 -32
119 lines not on this page · raw message
tools/perf/util/libbfd.c +2 -2
@@ -448,8 +448,8 @@ int libbfd_filename__read_debuglink(const char *filename, char *debuglink,return err; } -int symbol__disassemble_bpf (struct symbol *sym__maybe_unused , -struct annotate_args *args__maybe_unused ) +int symbol__disassemble_bpf_libbfd (struct symbol *sym__maybe_unused , +struct annotate_args *args__maybe_unused ) {#ifdef HAVE_LIBBPF_SUPPORT struct annotation *notes =symbol__annotation (sym);
tools/perf/util/libbfd.h +3 -3
@@ -29,7 +29,7 @@ int libbfd__read_build_id(const char *filename, struct build_id *bid, bool blockint libbfd_filename__read_debuglink (const char *filename,char *debuglink,size_t size); -int symbol__disassemble_bpf (struct symbol *sym,struct annotate_args *args); +int symbol__disassemble_bpf_libbfd (struct symbol *sym,struct annotate_args *args);#else // !defined(HAVE_LIBBFD_SUPPORT) #include "annotate.h"
@@ -72,8 +72,8 @@ static inline int libbfd_filename__read_debuglink(const char *filename __always_return -1 ; } -static inline int symbol__disassemble_bpf (struct symbol *sym__always_unused , -struct annotate_args *args__always_unused ) +static inline int symbol__disassemble_bpf_libbfd (struct symbol *sym__always_unused , +struct annotate_args *args__always_unused ) {return SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF ; }
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 5/11 perf dso: Clean up read_symbol error handling
In reply to Ian RogersEnsure errno is set and return to caller for error handling. Unusually for perf the value isn't negated as expected by symbol__strerror_disassemble.
--- tools/perf/util/capstone.c | 3 ++- tools/perf/util/dso.c | 15 ++++++++++++--- tools/perf/util/llvm.c | 3 ++- 3 files changed, 16 insertions(+), 5 deletions(-)
tools/perf/util/capstone.c +2 -1
@@ -11,6 +11,7 @@#include "print_insn.h" #include "symbol.h" #include "thread.h" +#include <errno.h> #include <fcntl.h> #include <string.h>
@@ -245,7 +246,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, buf =dso__read_symbol (dso, filename, map, sym, &code_buf, &buf_len, &is_64bit);if (buf ==NULL ) -return -1 ; +return errno;/* add the function address and name */ scnprintf(disasm_buf, sizeof(disasm_buf), "%#"PRIx64" <%s>:",
tools/perf/util/dso.c +12 -3
@@ -1827,26 +1827,33 @@ static const u8 *__dso__read_symbol(struct dso *dso, const char *symfs_filename, .ip = start, };u8 *code_buf =NULL ; +int saved_errno;nsinfo__mountns_enter (dso__nsinfo (dso), &nsc); fd =open (symfs_filename,O_RDONLY ); + saved_errno = errno;nsinfo__mountns_exit (&nsc); -if (fd <0 ) +if (fd <0 ) { + errno = saved_errno;return NULL ; - -if (file__read_maps (fd,/*exe=*/ true, find_file_offset, &data, is_64bit) ==0 ) { + } +if (file__read_maps (fd,/*exe=*/ true, find_file_offset, &data, is_64bit) <=0 ) {close (fd); + errno =ENOENT ;return NULL ; } code_buf =malloc (len);if (code_buf ==NULL ) {close (fd); + errno =ENOMEM ;return NULL ; } count =pread (fd, code_buf, len, data.offset); + saved_errno = errno;close (fd);if ((u64 )count != len) {free (code_buf); + errno = saved_errno;return NULL ; } *out_buf = code_buf;
@@ -1875,6 +1882,7 @@ const u8 *dso__read_symbol(struct dso *dso, const char *symfs_filename,* Note, there is fallback BPF image disassembly in the objdump * version but it currently does nothing. */ + errno =EOPNOTSUPP ;return NULL ; }if (dso__binary_type (dso) ==DSO_BINARY_TYPE__BPF_PROG_INFO ) {
@@ -1895,6 +1903,7 @@ const u8 *dso__read_symbol(struct dso *dso, const char *symfs_filename,return (const u8 *)(uintptr_t )(info_linear->info.jited_prog_insns);#else pr_debug ("No BPF program disassembly support\n" ); + errno =EOPNOTSUPP ;return NULL ;#endif }
tools/perf/util/llvm.c +2 -1
@@ -7,6 +7,7 @@#include "namespaces.h" #include "srcline.h" #include "symbol.h" +#include <errno.h> #include <fcntl.h> #include <unistd.h> #include <linux/zalloc.h>
@@ -147,7 +148,7 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym, buf =dso__read_symbol (dso, filename, map, sym, &code_buf, &buf_len, &is_64bit);if (buf ==NULL ) -return -1 ; +return errno;init_llvm ();if (arch__is (args->arch,"x86" )) {
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 6/11 perf disasm: Make ins__scnprintf and ins__is_nop static
In reply to Ian RogersReduce the scope of ins__scnprintf and ins__is_nop that aren't used outside of disasm.c.
--- tools/perf/util/disasm.c | 6 +++--- tools/perf/util/disasm.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-)
tools/perf/util/disasm.c +3 -3
@@ -247,8 +247,8 @@ static int ins__raw_scnprintf(struct ins *ins, char *bf, size_t size,return scnprintf (bf, size,"%-*s %s" , max_ins_name, ins->name, ops->raw); } -int ins__scnprintf (struct ins *ins,char *bf,size_t size, -struct ins_operands *ops,int max_ins_name) +static int ins__scnprintf (struct ins *ins,char *bf,size_t size, +struct ins_operands *ops,int max_ins_name) {if (ins->ops->scnprintf)return ins->ops->scnprintf (ins, bf, size, ops, max_ins_name);
@@ -828,7 +828,7 @@ static struct ins_ops ret_ops = { .scnprintf = ins__raw_scnprintf, }; -bool ins__is_nop (const struct ins *ins) +static bool ins__is_nop (const struct ins *ins) {return ins->ops == &nop_ops; }
tools/perf/util/disasm.h +0 -3
@@ -110,13 +110,10 @@ struct arch *arch__find(const char *name);bool arch__is (struct arch *arch,const char *name);struct ins_ops *ins__find (struct arch *arch,const char *name,struct disasm_line *dl); -int ins__scnprintf (struct ins *ins,char *bf,size_t size, -struct ins_operands *ops,int max_ins_name);bool ins__is_call (const struct ins *ins);bool ins__is_jump (const struct ins *ins);bool ins__is_fused (struct arch *arch,const char *ins1,const char *ins2); -bool ins__is_nop (const struct ins *ins);bool ins__is_ret (const struct ins *ins);bool ins__is_lock (const struct ins *ins);
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 7/11 perf srcline: Fallback between addr2line implementations
In reply to Ian RogersFactor the addr2line function implementation into separate source files (addr2line.[ch]) and rename the addr2line function cmd__addr2line. In srcline replace the ifdef-ed addr2line implementations with one that first tries the llvm__addr2line implementation, then the deprecated libbfd__addr2line function and on failure uses cmd__addr2line.
If HAVE_LIBLLVM_SUPPORT is enabled the llvm__addr2line will execute against the libLLVM.so it is linked against.
If HAVE_LIBLLVM_DYNAMIC is enabled then libperf-llvm.so (that links against libLLVM.so) will be dlopened. If the dlopen succeeds then the behavior should match HAVE_LIBLLVM_SUPPORT. On failure cmd__addr2line is used. The dlopen is only tried once.
If HAVE_LIBLLVM_DYNAMIC isn't enabled then llvm__addr2line immediately fails and cmd__addr2line is used.
Clean up the dso__free_a2l logic, which is only needed in the non-LLVM version and moved to addr2line.c.
--- tools/perf/util/Build | 1 + tools/perf/util/addr2line.c | 439 ++++++++++++++++++++++++++++++++ tools/perf/util/addr2line.h | 20 ++ tools/perf/util/config.c | 2 +- tools/perf/util/llvm.c | 5 - tools/perf/util/llvm.h | 3 - tools/perf/util/srcline.c | 495 ++---------------------------------- tools/perf/util/srcline.h | 1 - 8 files changed, 485 insertions(+), 481 deletions(-) create mode 100644 tools/perf/util/addr2line.c create mode 100644 tools/perf/util/addr2line.h
tools/perf/util/Build +1 -0
@@ -2,6 +2,7 @@ include $(srctree)/tools/scripts/Makefile.include include $(srctree)/tools/scripts/utilities.mak perf-util-y += arm64-frame-pointer-unwind-support.o +perf-util-y += addr2line.o perf-util-y += addr_location.o perf-util-y += annotate.o perf-util-y += block-info.o
tools/perf/util/addr2line.c new file +439 -0
439 lines not on this page · raw message
tools/perf/util/addr2line.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __PERF_ADDR2LINE_H +#define __PERF_ADDR2LINE_H + +#include <linux/types.h> + +struct dso ; +struct inline_node ; +struct symbol ; + +extern int addr2line_timeout_ms; + +int cmd__addr2line (const char *dso_name,u64 addr, +char **file,unsigned int *line_nr, +struct dso *dso, +bool unwind_inlines, +struct inline_node *node, +struct symbol *sym); + +#endif /* __PERF_ADDR2LINE_H */
tools/perf/util/config.c +1 -1
@@ -19,7 +19,7 @@#include "util/hist.h" /* perf_hist_config */ #include "util/stat.h" /* perf_stat__set_big_num */ #include "util/evsel.h" /* evsel__hw_names, evsel__use_bpf_counters */ -#include "util/srcline.h" /* addr2line_timeout_ms */ +#include "util/addr2line.h" /* addr2line_timeout_ms */ #include "build-id.h" #include "debug.h" #include "config.h"
tools/perf/util/llvm.c +0 -5
@@ -70,11 +70,6 @@ int llvm__addr2line(const char *dso_name __maybe_unused, u64 addr __maybe_unused#endif } -void dso__free_a2l_llvm (struct dso *dso__maybe_unused ) -{ -/* Nothing to free. */ -} -static void init_llvm (void ) {static bool init;
tools/perf/util/llvm.h +0 -3
@@ -15,9 +15,6 @@ int llvm__addr2line(const char *dso_name, u64 addr, 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);
tools/perf/util/srcline.c +24 -471
533 lines not on this page · raw message
tools/perf/util/srcline.h +0 -1
@@ -9,7 +9,6 @@struct dso ;struct symbol ; -extern int addr2line_timeout_ms;extern bool srcline_full_filename;char *get_srcline (struct dso *dso,u64 addr,struct symbol *sym,bool show_sym,bool show_addr,u64 ip);
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 8/11 perf disasm: Remove unused evsel from annotate_args
In reply to Ian RogersSet in symbol__annotate but never used.
--- tools/perf/util/annotate.c | 1 - tools/perf/util/disasm.h | 1 - 2 files changed, 2 deletions(-)
tools/perf/util/annotate.c +0 -1
@@ -1015,7 +1015,6 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,struct symbol *sym = ms->sym;struct annotation *notes =symbol__annotation (sym);struct annotate_args args = { - .evsel = evsel, .options = &annotate_opts, };struct arch *arch =NULL ;
tools/perf/util/disasm.h +0 -1
@@ -98,7 +98,6 @@ struct ins_ops {struct annotate_args {struct arch *arch;struct map_symbol ms; -struct evsel *evsel;struct annotation_options *options;s64 offset;char *line;
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 9/11 perf capstone: Support for dlopen-ing libcapstone.so
In reply to Ian RogersIf perf wasn't built against libcapstone, no HAVE_LIBCAPSTONE_SUPPORT, support dlopen-ing libcapstone.so and then calling the necessary functions by looking them up using dlsym. Reverse engineer the types in the API using pahole, adding only what's used in the perf code or necessary for the sake of struct size and alignment.
--- tools/perf/util/capstone.c | 285 ++++++++++++++++++++++++++++++++----- 1 file changed, 248 insertions(+), 37 deletions(-)
tools/perf/util/capstone.c +248 -37
@@ -11,20 +11,250 @@#include "print_insn.h" #include "symbol.h" #include "thread.h" +#include <dlfcn.h> #include <errno.h> #include <fcntl.h> +#include <inttypes.h> #include <string.h> #ifdef HAVE_LIBCAPSTONE_SUPPORT #include <capstone/capstone.h> +#else +typedef size_t csh ; +enum cs_arch { +CS_ARCH_ARM =0 , +CS_ARCH_ARM64 =1 , +CS_ARCH_X86 =3 , +CS_ARCH_SYSZ =6 , +}; +enum cs_mode { +CS_MODE_ARM =0 , +CS_MODE_32 =1 <<2 , +CS_MODE_64 =1 <<3 , +CS_MODE_V8 =1 <<6 , +CS_MODE_BIG_ENDIAN =1 <<31 , +}; +enum cs_opt_type { +CS_OPT_SYNTAX =1 , +CS_OPT_DETAIL =2 , +}; +enum cs_opt_value { +CS_OPT_SYNTAX_ATT =2 , +CS_OPT_ON =3 , +}; +enum cs_err { +CS_ERR_OK =0 , +CS_ERR_HANDLE =3 , +}; +enum x86_op_type { +X86_OP_IMM =2 , +X86_OP_MEM =3 , +}; +enum x86_reg { +X86_REG_RIP =41 , +}; +typedef int32_t x86_avx_bcast ; +struct x86_op_mem { +enum x86_reg segment; +enum x86_reg base; +enum x86_reg index; +int scale; +int64_t disp; +}; + +struct cs_x86_op { +enum x86_op_type type; +union { +enum x86_reg reg; +int64_t imm; +struct x86_op_mem mem; + }; +uint8_t size; +uint8_t access; +x86_avx_bcast avx_bcast; +bool avx_zero_opmask; +}; +struct cs_x86_encoding { +uint8_t modrm_offset; +uint8_t disp_offset; +uint8_t disp_size; +uint8_t imm_offset; +uint8_t imm_size; +}; +typedef int32_t x86_xop_cc ; +typedef int32_t x86_sse_cc ; +typedef int32_t x86_avx_cc ; +typedef int32_t x86_avx_rm ; +struct cs_x86 { +uint8_t prefix[4 ]; +uint8_t opcode[4 ]; +uint8_t rex; +uint8_t addr_size; +uint8_t modrm; +uint8_t sib; +int64_t disp; +enum x86_reg sib_index; +int8_t sib_scale; +enum x86_reg sib_base; +x86_xop_cc xop_cc; +x86_sse_cc sse_cc; +x86_avx_cc avx_cc; +bool avx_sae; +x86_avx_rm avx_rm; +union { +uint64_t eflags; +uint64_t fpu_flags; + }; +uint8_t op_count; +struct cs_x86_op operands[8 ]; +struct cs_x86_encoding encoding; +}; +struct cs_detail { +uint16_t regs_read[12 ]; +uint8_t regs_read_count; +uint16_t regs_write[20 ]; +uint8_t regs_write_count; +uint8_t groups[8 ]; +uint8_t groups_count; + +union { +struct cs_x86 x86; + }; +}; +struct cs_insn { +unsigned int id; +uint64_t address; +uint16_t size; +uint8_t bytes[16 ]; +char mnemonic[32 ]; +char op_str[160 ]; +struct cs_detail *detail; +}; +#endif + +#ifndef HAVE_LIBCAPSTONE_SUPPORT +static void *perf_cs_dll_handle (void ) +{ +static bool dll_handle_init; +static void *dll_handle; + +if (!dll_handle_init) { + dll_handle_init = true; + dll_handle =dlopen ("libcapstone.so" ,RTLD_LAZY ); +if (!dll_handle) +pr_debug ("dlopen failed for libcapstone.so\n" ); + } +return dll_handle; +} +#endif + +static enum cs_err perf_cs_open (enum cs_arch arch,enum cs_mode mode,csh *handle) +{ +#ifdef HAVE_LIBCAPSTONE_SUPPORT +return cs_open (arch, mode, handle); +#else +static bool fn_init; +static enum cs_err (*fn)(enum cs_arch arch,enum cs_mode mode,csh *handle); + +if (!fn_init) { + fn =dlsym (perf_cs_dll_handle (),"cs_open" ); +if (!fn) +pr_debug ("dlsym failed for cs_open\n" ); + fn_init = true; + } +if (!fn) +return CS_ERR_HANDLE ; +return fn (arch, mode, handle); +#endif +} + +static enum cs_err perf_cs_option (csh handle,enum cs_opt_type type,size_t value) +{ +#ifdef HAVE_LIBCAPSTONE_SUPPORT +return cs_option (handle, type, value); +#else +static bool fn_init; +static enum cs_err (*fn)(csh handle,enum cs_opt_type type,size_t value); + +if (!fn_init) { + fn =dlsym (perf_cs_dll_handle (),"cs_option" ); +if (!fn) +pr_debug ("dlsym failed for cs_option\n" ); + fn_init = true; + } +if (!fn) +return CS_ERR_HANDLE ; +return fn (handle, type, value); +#endif +} + +static size_t perf_cs_disasm (csh handle,const uint8_t *code,size_t code_size, +uint64_t address,size_t count,struct cs_insn **insn) +{ +#ifdef HAVE_LIBCAPSTONE_SUPPORT +return cs_disasm (handle, code, code_size, address, count, insn); +#else +static bool fn_init; +static enum cs_err (*fn)(csh handle,const uint8_t *code,size_t code_size, +uint64_t address,size_t count,struct cs_insn **insn); + +if (!fn_init) { + fn =dlsym (perf_cs_dll_handle (),"cs_disasm" ); +if (!fn) +pr_debug ("dlsym failed for cs_disasm\n" ); + fn_init = true; + } +if (!fn) +return CS_ERR_HANDLE ; +return fn (handle, code, code_size, address, count, insn);#endif +} +static void perf_cs_free (struct cs_insn *insn,size_t count) +{#ifdef HAVE_LIBCAPSTONE_SUPPORT +cs_free (insn, count); +#else +static bool fn_init; +static void (*fn)(struct cs_insn *insn,size_t count); + +if (!fn_init) { + fn =dlsym (perf_cs_dll_handle (),"cs_free" ); +if (!fn) +pr_debug ("dlsym failed for cs_free\n" ); + fn_init = true; + } +if (!fn) +return ; +fn (insn, count); +#endif +} + +static enum cs_err perf_cs_close (csh *handle) +{ +#ifdef HAVE_LIBCAPSTONE_SUPPORT +return cs_close (handle); +#else +static bool fn_init; +static enum cs_err (*fn)(csh *handle); + +if (!fn_init) { + fn =dlsym (perf_cs_dll_handle (),"cs_close" ); +if (!fn) +pr_debug ("dlsym failed for cs_close\n" ); + fn_init = true; + } +if (!fn) +return CS_ERR_HANDLE ; +return fn (handle); +#endif +} +static int capstone_init (struct machine *machine,csh *cs_handle,bool is64,bool disassembler_style) { -cs_arch arch; -cs_mode mode; +enum cs_arch arch; +enum cs_mode mode;if (machine__is (machine,"x86_64" ) && is64) { arch =CS_ARCH_X86 ;
@@ -45,7 +275,7 @@ static int capstone_init(struct machine *machine, csh *cs_handle, bool is64,return -1 ; } -if (cs_open (arch, mode, cs_handle) !=CS_ERR_OK ) { +if (perf_cs_open (arch, mode, cs_handle) !=CS_ERR_OK ) {pr_warning_once ("cs_open failed\n" );return -1 ; }
@@ -57,27 +287,25 @@ static int capstone_init(struct machine *machine, csh *cs_handle, bool is64,* is set via annotation args */ if (disassembler_style) -cs_option (*cs_handle,CS_OPT_SYNTAX ,CS_OPT_SYNTAX_ATT ); +perf_cs_option (*cs_handle,CS_OPT_SYNTAX ,CS_OPT_SYNTAX_ATT );/* * Resolving address operands to symbols is implemented * on x86 by investigating instruction details. */ - cs_option(*cs_handle, CS_OPT_DETAIL, CS_OPT_ON); +perf_cs_option (*cs_handle,CS_OPT_DETAIL ,CS_OPT_ON ); }return 0 ; } -#endif -#ifdef HAVE_LIBCAPSTONE_SUPPORT -static size_t print_insn_x86 (struct thread *thread,u8 cpumode,cs_insn *insn, +static size_t print_insn_x86 (struct thread *thread,u8 cpumode,struct cs_insn *insn,int print_opts,FILE *fp) {struct addr_location al;size_t printed =0 ;if (insn->detail && insn->detail->x86.op_count ==1 ) { -cs_x86_op *op = &insn->detail->x86.operands[0 ]; +struct cs_x86_op *op = &insn->detail->x86.operands[0 ];addr_location__init (&al); if (op->type == X86_OP_IMM &&
@@ -95,7 +323,6 @@ static size_t print_insn_x86(struct thread *thread, u8 cpumode, cs_insn *insn, printed +=fprintf (fp,"%s %s" , insn[0 ].mnemonic, insn[0 ].op_str);return printed; } -#endif ssize_t capstone__fprintf_insn_asm(struct machine *machine __maybe_unused,
@@ -106,9 +333,8 @@ ssize_t capstone__fprintf_insn_asm(struct machine *machine __maybe_unused, uint64_t ip __maybe_unused, int *lenp __maybe_unused, int print_opts __maybe_unused, FILE *fp __maybe_unused) { -#ifdef HAVE_LIBCAPSTONE_SUPPORT size_t printed; -cs_insn *insn; +struct cs_insn *insn;csh cs_handle;size_t count;int ret;
@@ -118,7 +344,7 @@ ssize_t capstone__fprintf_insn_asm(struct machine *machine __maybe_unused,if (ret <0 )return ret; - count =cs_disasm (cs_handle, code, code_size, ip,1 , &insn); + count =perf_cs_disasm (cs_handle, code, code_size, ip,1 , &insn);if (count >0 ) {if (machine__normalized_is (machine,"x86" )) printed =print_insn_x86 (thread, cpumode, &insn[0 ], print_opts, fp);
@@ -126,20 +352,16 @@ ssize_t capstone__fprintf_insn_asm(struct machine *machine __maybe_unused, printed =fprintf (fp,"%s %s" , insn[0 ].mnemonic, insn[0 ].op_str);if (lenp) *lenp = insn->size; - cs_free(insn, count); +perf_cs_free (insn, count); }else { printed =-1 ; } -cs_close (&cs_handle); +perf_cs_close (&cs_handle);return printed; -#else -return -1 ; -#endif } -#ifdef HAVE_LIBCAPSTONE_SUPPORT -static void print_capstone_detail (cs_insn *insn,char *buf,size_t len, +static void print_capstone_detail (struct cs_insn *insn,char *buf,size_t len,struct annotate_args *args,u64 addr) {int i;
@@ -154,7 +376,7 @@ static void print_capstone_detail(cs_insn *insn, char *buf, size_t len,return ;for (i =0 ; i < insn->detail->x86.op_count; i++) { -cs_x86_op *op = &insn->detail->x86.operands[i]; +struct cs_x86_op *op = &insn->detail->x86.operands[i];u64 orig_addr;if (op->type !=X86_OP_MEM )
@@ -195,9 +417,7 @@ static void print_capstone_detail(cs_insn *insn, char *buf, size_t len,break ; } } -#endif -#ifdef HAVE_LIBCAPSTONE_SUPPORTstruct find_file_offset_data {u64 ip;u64 offset;
@@ -214,13 +434,11 @@ static int find_file_offset(u64 start, u64 len, u64 pgoff, void *arg) }return 0 ; } -#endif int symbol__disassemble_capstone (const char *filename__maybe_unused ,struct symbol *sym__maybe_unused ,struct annotate_args *args__maybe_unused ) { -#ifdef HAVE_LIBCAPSTONE_SUPPORT struct annotation *notes =symbol__annotation (sym);struct map *map = args->ms.map;struct dso *dso =map__dso (map);
@@ -235,7 +453,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused,const u8 *buf;u64 buf_len;csh handle; -cs_insn *insn =NULL ; +struct cs_insn *insn =NULL ;char disasm_buf[512 ];struct disasm_line *dl;bool disassembler_style = false;
@@ -273,7 +491,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, needs_cs_close = true; - free_count = count =cs_disasm (handle, buf, buf_len, start, buf_len, &insn); + free_count = count =perf_cs_disasm (handle, buf, buf_len, start, buf_len, &insn);for (i =0 , offset =0 ; i < count; i++) {int printed;
@@ -312,9 +530,9 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, out:if (needs_cs_close) { -cs_close (&handle); +perf_cs_close (&handle);if (free_count >0 ) -cs_free (insn, free_count); +perf_cs_free (insn, free_count); }free (code_buf);return count <0 ? count :0 ;
@@ -334,16 +552,12 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused, } count =-1 ; goto out; -#else -return -1 ; -#endif }int symbol__disassemble_capstone_powerpc (const char *filename__maybe_unused ,struct symbol *sym__maybe_unused ,struct annotate_args *args__maybe_unused ) { -#ifdef HAVE_LIBCAPSTONE_SUPPORT struct annotation *notes =symbol__annotation (sym);struct map *map = args->ms.map;struct dso *dso =map__dso (map);
@@ -456,7 +670,7 @@ int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused, out:if (needs_cs_close) -cs_close (&handle); +perf_cs_close (&handle);free (buf);return count <0 ? count :0 ;
@@ -465,7 +679,4 @@ int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused,close (fd); count =-1 ; goto out; -#else -return -1 ; -#endif }
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 10/11 perf llvm: Support for dlopen-ing libLLVM.so
In reply to Ian RogersIf perf wasn't built against libLLVM, no HAVE_LIBLLVM_SUPPORT, support dlopen-ing libLLVM.so and then calling the necessary functions by looking them up using dlsym. As the C++ code in llvm-c-helpers used for addr2line is problematic to call using dlsym, build that C++ code against libLLVM.so as a separate shared object, and support dynamic loading of it. This build option is enabled with LIBLLVM_DYNAMIC=1
--- tools/perf/Makefile.config | 13 ++ tools/perf/Makefile.perf | 23 ++- tools/perf/tests/make | 2 + tools/perf/util/Build | 2 +- tools/perf/util/llvm-c-helpers.cpp | 113 +++++++++++- tools/perf/util/llvm.c | 273 +++++++++++++++++++++++++---- 6 files changed, 388 insertions(+), 38 deletions(-)
tools/perf/Makefile.config +13 -0
@@ -960,6 +960,19 @@ ifndef NO_LIBLLVM NO_LIBLLVM := 1 endif endif +ifdef LIBLLVM_DYNAMIC + ifndef NO_LIBLLVM + $(error LIBLLVM_DYNAMIC should be used with NO_LIBLLVM) + endif + $(call feature_check,llvm-perf) + ifneq ($(feature-llvm-perf), 1) + $(warning LIBLLVM_DYNAMIC requires libLLVM.so which wasn't feature detected) + endif + CFLAGS += -DHAVE_LIBLLVM_DYNAMIC + CFLAGS += $(shell $(LLVM_CONFIG) --cflags) + CXXFLAGS += -DHAVE_LIBLLVM_DYNAMIC + CXXFLAGS += $(shell $(LLVM_CONFIG) --cxxflags) +endif ifndef NO_DEMANGLE $(call feature_check,cxa-demangle)
tools/perf/Makefile.perf +22 -1
@@ -423,6 +423,12 @@ ifndef NO_JVMTI PROGRAMS += $(OUTPUT)$(LIBJVMTI) endif +LIBPERF_LLVM = libperf-llvm.so + +ifdef LIBLLVM_DYNAMIC +PROGRAMS += $(OUTPUT)$(LIBPERF_LLVM) +endif + DLFILTERS := dlfilter-test-api-v0.so dlfilter-test-api-v2.so dlfilter-show-cycles.so DLFILTERS := $(patsubst %,$(OUTPUT)dlfilters/%,$(DLFILTERS))
@@ -995,6 +1001,16 @@ $(LIBSYMBOL)-clean: $(call QUIET_CLEAN, libsymbol) $(Q)$(RM) -r -- $(LIBSYMBOL_OUTPUT) +ifdef LIBLLVM_DYNAMIC +LIBPERF_LLVM_CXXFLAGS := $(call filter-out,-DHAVE_LIBLLVM_DYNAMIC,$(CXXFLAGS)) -DHAVE_LIBLLVM_SUPPORT +LIBPERF_LLVM_LIBS = -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM) -lstdc++ + +$(OUTPUT)$(LIBPERF_LLVM): util/llvm-c-helpers.cpp + $(QUIET_LINK)$(CXX) $(LIBPERF_LLVM_CXXFLAGS) $(LIBPERF_LLVM_LIBS) -shared -o $@ $< + +$(OUTPUT)perf: $(OUTPUT)$(LIBPERF_LLVM) +endif + help: @echo 'Perf make targets:' @echo ' doc - make *all* documentation (see below)'
@@ -1096,6 +1112,11 @@ ifndef NO_JVMTI $(call QUIET_INSTALL, $(LIBJVMTI)) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)'; \ $(INSTALL) $(OUTPUT)$(LIBJVMTI) '$(DESTDIR_SQ)$(libdir_SQ)'; +endif +ifdef LIBLLVM_DYNAMIC + $(call QUIET_INSTALL, $(LIBPERF_LLVM)) \ + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(libdir_SQ)'; \ + $(INSTALL) $(OUTPUT)$(LIBPERF_LLVM) '$(DESTDIR_SQ)$(libdir_SQ)'; endif $(call QUIET_INSTALL, libexec) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
@@ -1281,7 +1302,7 @@ clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $( -name '\.*.cmd' -delete -o -name '\.*.d' -delete -o -name '*.shellcheck_log' -delete $(Q)$(RM) $(OUTPUT).config-detected $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 \ - perf-read-vdsox32 $(OUTPUT)$(LIBJVMTI).so + perf-read-vdsox32 $(OUTPUT)$(LIBJVMTI) $(OUTPUT)$(LIBPERF_LLVM) $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo \ $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE \ $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \
tools/perf/tests/make +2 -0
@@ -93,6 +93,7 @@ make_no_libbpf := NO_LIBBPF=1 make_libbpf_dynamic := LIBBPF_DYNAMIC=1 make_no_libbpf_DEBUG := NO_LIBBPF=1 DEBUG=1 make_no_libllvm := NO_LIBLLVM=1 +make_libllvm_dynamic := NO_LIBLLVM=1 LIBLLVM_DYNAMIC=1 make_with_babeltrace:= LIBBABELTRACE=1 make_with_coresight := CORESIGHT=1 make_no_sdt := NO_SDT=1
@@ -162,6 +163,7 @@ run += make_no_auxtrace run += make_no_libbpf run += make_no_libbpf_DEBUG run += make_no_libllvm +run += make_libllvm_dynamic run += make_no_sdt run += make_no_syscall_tbl run += make_with_babeltrace
tools/perf/util/Build +1 -1
@@ -27,6 +27,7 @@ perf-util-y += find_bit.o perf-util-y += levenshtein.o perf-util-$(CONFIG_LIBBFD) += libbfd.o perf-util-y += llvm.o +perf-util-y += llvm-c-helpers.o perf-util-y += mmap.o perf-util-y += memswap.o perf-util-y += parse-events.o
@@ -249,7 +250,6 @@ perf-util-$(CONFIG_CXX_DEMANGLE) += demangle-cxx.o perf-util-y += demangle-ocaml.o perf-util-y += demangle-java.o perf-util-y += demangle-rust-v0.o -perf-util-$(CONFIG_LIBLLVM) += llvm-c-helpers.o CFLAGS_demangle-rust-v0.o += -Wno-shadow -Wno-declaration-after-statement \ -Wno-switch-default -Wno-switch-enum -Wno-missing-field-initializers
tools/perf/util/llvm-c-helpers.cpp +107 -6
192 lines not on this page · raw message
tools/perf/util/llvm.c +243 -30
369 lines not on this page · raw message
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH v7 11/11 perf llvm: Mangle libperf-llvm.so function names
In reply to Ian RogersFor a function like llvm_addr2line having the libperf-llvm.so exported symbol named llvm_addr2line meant that the perf llvm_addr2line could sometimes erroneously be returned. This led to infinite recursion and eventual stack overflow. To avoid this conflict add a new BUILDING_PERF_LLVMSO when libperf-llvm.so is being built and use it to alter the behavior of MANGLE_PERF_LLVM_API, a macro that prefixes the name when libperf-llvm.so is being built. The prefixed named avoids the name collision.
--- tools/perf/Makefile.perf | 3 ++- tools/perf/util/llvm-c-helpers.cpp | 29 ++++++++++++++++++----------- tools/perf/util/llvm-c-helpers.h | 24 ++++++++++++++++-------- 3 files changed, 36 insertions(+), 20 deletions(-)
tools/perf/Makefile.perf +2 -1
@@ -1002,7 +1002,8 @@ $(LIBSYMBOL)-clean: $(Q)$(RM) -r -- $(LIBSYMBOL_OUTPUT) ifdef LIBLLVM_DYNAMIC -LIBPERF_LLVM_CXXFLAGS := $(call filter-out,-DHAVE_LIBLLVM_DYNAMIC,$(CXXFLAGS)) -DHAVE_LIBLLVM_SUPPORT +LIBPERF_LLVM_CXXFLAGS := $(call filter-out,-DHAVE_LIBLLVM_DYNAMIC,$(CXXFLAGS)) +LIBPERF_LLVM_CXXFLAGS += -DHAVE_LIBLLVM_SUPPORT -DBUILDING_PERF_LLVMSO LIBPERF_LLVM_LIBS = -L$(shell $(LLVM_CONFIG) --libdir) $(LIBLLVM) -lstdc++ $(OUTPUT)$(LIBPERF_LLVM): util/llvm-c-helpers.cpp
tools/perf/util/llvm-c-helpers.cpp +18 -11
@@ -99,10 +99,12 @@ static int extract_file_and_line(const DILineInfo &line_info, char **file, #endif extern "C" -int llvm_addr2line(const char *dso_name __maybe_unused, u64 addr __maybe_unused, - char **file __maybe_unused, unsigned int *line __maybe_unused, - bool unwind_inlines __maybe_unused, - llvm_a2l_frame **inline_frames __maybe_unused) +int MANGLE_PERF_LLVM_API(llvm_addr2line)(const char *dso_name __maybe_unused, + u64 addr __maybe_unused, + char **file __maybe_unused, + unsigned int *line __maybe_unused, + bool unwind_inlines __maybe_unused, + llvm_a2l_frame **inline_frames __maybe_unused) { #if defined(HAVE_LIBLLVM_SUPPORT) && !defined(HAVE_LIBLLVM_DYNAMIC) LLVMSymbolizer *symbolizer = get_symbolizer();
@@ -177,7 +179,8 @@ int llvm_addr2line(const char *dso_name __maybe_unused, u64 addr __maybe_unused, if (!handle) return 0; - fn = reinterpret_cast<decltype(fn)>(dlsym(handle, "llvm_addr2line")); + fn = reinterpret_cast<decltype(fn)>( + dlsym(handle, MANGLE_PERF_LLVM_API_STR(llvm_addr2line))); if (!fn) pr_debug("dlsym failed for llvm_addr2line\n"); fn_init = true;
@@ -215,8 +218,9 @@ make_symbol_relative_string(struct dso *dso, const char *sym_name, #endif extern "C" -char *llvm_name_for_code(struct dso *dso __maybe_unused, const char *dso_name __maybe_unused, - u64 addr __maybe_unused) +char *MANGLE_PERF_LLVM_API(llvm_name_for_code)(struct dso *dso __maybe_unused, + const char *dso_name __maybe_unused, + u64 addr __maybe_unused) { #if defined(HAVE_LIBLLVM_SUPPORT) && !defined(HAVE_LIBLLVM_DYNAMIC) LLVMSymbolizer *symbolizer = get_symbolizer();
@@ -242,7 +246,8 @@ char *llvm_name_for_code(struct dso *dso __maybe_unused, const char *dso_name __ if (!handle) return NULL; - fn = reinterpret_cast<decltype(fn)>(dlsym(handle, "llvm_name_for_code")); + fn = reinterpret_cast<decltype(fn)>( + dlsym(handle, MANGLE_PERF_LLVM_API_STR(llvm_name_for_code))); if (!fn) pr_debug("dlsym failed for llvm_name_for_code\n"); fn_init = true;
@@ -256,8 +261,9 @@ char *llvm_name_for_code(struct dso *dso __maybe_unused, const char *dso_name __ } extern "C" -char *llvm_name_for_data(struct dso *dso __maybe_unused, const char *dso_name __maybe_unused, - u64 addr __maybe_unused) +char *MANGLE_PERF_LLVM_API(llvm_name_for_data)(struct dso *dso __maybe_unused, + const char *dso_name __maybe_unused, + u64 addr __maybe_unused) { #if defined(HAVE_LIBLLVM_SUPPORT) && !defined(HAVE_LIBLLVM_DYNAMIC) LLVMSymbolizer *symbolizer = get_symbolizer();
@@ -283,7 +289,8 @@ char *llvm_name_for_data(struct dso *dso __maybe_unused, const char *dso_name __ if (!handle) return NULL; - fn = reinterpret_cast<decltype(fn)>(dlsym(handle, "llvm_name_for_data")); + fn = reinterpret_cast<decltype(fn)>( + dlsym(handle, MANGLE_PERF_LLVM_API_STR(llvm_name_for_data))); if (!fn) pr_debug("dlsym failed for llvm_name_for_data\n"); fn_init = true;
tools/perf/util/llvm-c-helpers.h +16 -8
@@ -13,6 +13,14 @@ extern "C" { #endif +/* Support name mangling so that libperf_llvm.so's names don't match those in perf. */ +#ifdef BUILDING_PERF_LLVMSO +#define MANGLE_PERF_LLVM_API(x) PERF_LLVM_SO_ ## x +#else +#define MANGLE_PERF_LLVM_API(x) x +#endif +#define MANGLE_PERF_LLVM_API_STR(x) "PERF_LLVM_SO_" #x + struct dso; struct llvm_a2l_frame {
@@ -37,12 +45,12 @@ struct llvm_a2l_frame {* a newly allocated array with that length. The caller is then responsible * for freeing both the strings and the array itself. */ -int llvm_addr2line (const char * dso_name, -u64 addr, -char ** file, -unsigned int * line, -bool unwind_inlines, -struct llvm_a2l_frame ** inline_frames); +int MANGLE_PERF_LLVM_API (llvm_addr2line )(const char *dso_name, +u64 addr, +char **file, +unsigned int *line, +bool unwind_inlines, +struct llvm_a2l_frame **inline_frames);/* * Simple symbolizers for addresses; will convert something like
@@ -50,8 +58,8 @@ int llvm_addr2line(const char* dso_name,* * 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); +char *MANGLE_PERF_LLVM_API (llvm_name_for_code )(struct dso *dso,const char *dso_name,u64 addr); +char *MANGLE_PERF_LLVM_API (llvm_name_for_data )(struct dso *dso,const char *dso_name,u64 addr); #ifdef __cplusplus }
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Arnaldo Carvalho de Melo
maintainerQuoted 25 lines · Ian Rogers
Linking against libcapstone and libLLVM can be a significant increase in dependencies and file size if building statically. For something like
perf recordthe disassembler and addr2line functionality won't be used. Support dynamically loading these libraries using dlopen and then calling the appropriate functions found using dlsym.The patch series:
1) feature check libLLVM support and avoid always reinitializing the disassembler.
2) adds BPF JIT disassembly support to in memory disassemblers (LLVM and capstone) by just directing them at the BPF info linear JIT instructions (note this doesn't support source lines);
3) adds fallback to srcline's addr2line so thatllvm_addr2lineis tried first, then the deprecated libbfd and then the forked command tried next, moving the code for forking out of the mainsrcline.cfile in the process.
4) addsperf_variants of the capstone/llvm functions that will either directly call the function or use dlsym to discover it;The addr2line LLVM functionality is written in C++. To avoid linking against libLLVM for this, a new
LIBLLVM_DYNAMICoption is added where the C++ code with the libLLVM dependency will be built into a libperf-llvm.so and that dlsym-ed and called against. Ideally LLVM would extend their C API to avoid this.
Quoted 3 lines
v7: Refactor now the first 5 patches, that largely moved code around,
have landed. Move the dlopen code to the end of the series so that the first 8 patches can be picked improving capstone/LLVM support
So I tentatively picked the first 8 patches, will test it now, hopefully we can go with it to have BPF annotation...
Wait, will try to fix this one:
⬢ [acme@toolbx perf-tools-next]$ git log --oneline -1 ; time make -C tools/perf build-test
make_static: cd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 NO_LIBTRACEEVENT=1 NO_LIBELF=1 -j32 DESTDIR=/tmp/tmp.w26bDGykTM
cd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 NO_LIBTRACEEVENT=1 NO_LIBELF=1 -j32 DESTDIR=/tmp/tmp.w26bDGykTM
BUILD: Doing 'make -j32' parallel build
<SNIP>
Auto-detecting system features:
... libdw: [ OFF ]
... glibc: [ on ]
... libelf: [ OFF ]
... libnuma: [ OFF ]
... numa_num_possible_cpus: [ OFF ]
... libpython: [ OFF ]
... libcapstone: [ OFF ]
... llvm-perf: [ OFF ]
... zlib: [ OFF ]
... lzma: [ OFF ]
... get_cpuid: [ on ]
... bpf: [ on ]
... libaio: [ on ]
... libzstd: [ OFF ]
<SNIP>
CC tests/api-io.o
CC util/sha1.o
CC util/smt.o
LD util/intel-pt-decoder/perf-util-in.o
CC tests/demangle-java-test.o
CC util/strbuf.o
CC util/string.o
CC tests/demangle-ocaml-test.o
CC util/strlist.o
CC tests/demangle-rust-v0-test.o
CC tests/pfm.o
CC tests/parse-metric.o
CC util/strfilter.o
CC tests/pe-file-parsing.o
util/llvm.c: In function ‘init_llvm’:
util/llvm.c:78:17: error: implicit declaration of function ‘LLVMInitializeAllTargetInfos’ [-Wimplicit-function-declaration]
78 | LLVMInitializeAllTargetInfos();
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
util/llvm.c:79:17: error: implicit declaration of function ‘LLVMInitializeAllTargetMCs’ [-Wimplicit-function-declaration]
79 | LLVMInitializeAllTargetMCs();
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
util/llvm.c:80:17: error: implicit declaration of function ‘LLVMInitializeAllDisassemblers’ [-Wimplicit-function-declaration]
80 | LLVMInitializeAllDisassemblers();
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
util/llvm.c: At top level:
util/llvm.c:73:13: error: ‘init_llvm’ defined but not used [-Werror=unused-function]
73 | static void init_llvm(void)
| ^~~~~~~~~
cc1: all warnings being treated as errors
CC tests/expand-cgroup.o
CC util/top.o
CC tests/perf-time-to-tsc.o
CC util/usage.o
make[6]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:86: util/llvm.o] Error 1
make[6]: *** Waiting for unfinished jobs....
CC tests/dlfilter-test.o
CC tests/sigtrap.o
CC tests/event_groups.oQuoted 64 lines
without adding the dlopen code. Rename the cover letter and disassembler cleanup patches.
v6: Refactor the libbfd along with capstone and LLVM, previous patch
series had tried to avoid this by just removing the deprecatedBUILD_NONDISTROcode. Remove the libtracefs removal into its own patch.
v5: Rebase and comment typo fix.
v4: Rebase and addition of a patch removing an unused struct variable.
v3: Add srcline addr2line fallback trying LLVM first then forking a
process. This came up in conversation with Steinar Gunderson <[email protected]>.
Tweak the cover letter message to try to address Andi Kleen's <[email protected]> feedback that the series doesn't really achieve anything.
v2: Add mangling of the function names in libperf-llvm.so to avoid
potential infinite recursion. Add BPF JIT disassembly support to LLVM and capstone. Add/rebase theBUILD_NONDISTROcleanup onto the series from:
https://lore.kernel.org/lkml/[email protected]/
Some other minor additional clean up.Ian Rogers (11):
perf check: Add libLLVM feature
perf llvm: Reduce LLVM initialization
perf dso: Moveread_symbolfrom llvm/capstone to dso perf dso: Support BPF programs indso__read_symbolperf dso: Clean upread_symbolerror handling perf disasm: Makeins__scnprintfandins__is_nopstatic perf srcline: Fallback between addr2line implementations perf disasm: Remove unused evsel fromannotate_argsperf capstone: Support for dlopen-ing libcapstone.so perf llvm: Support for dlopen-ing libLLVM.so perf llvm: Mangle libperf-llvm.so function namestools/perf/Documentation/perf-check.txt | 1 + tools/perf/Makefile.config | 13 + tools/perf/Makefile.perf | 24 +- tools/perf/builtin-check.c | 1 + tools/perf/tests/make | 2 + tools/perf/util/Build | 3 +- tools/perf/util/addr2line.c | 439 +++++++++++++++++++++ tools/perf/util/addr2line.h | 20 + tools/perf/util/annotate.c | 1 - tools/perf/util/capstone.c | 352 ++++++++++++----- tools/perf/util/config.c | 2 +- tools/perf/util/disasm.c | 18 +- tools/perf/util/disasm.h | 4 - tools/perf/util/dso.c | 112 ++++++ tools/perf/util/dso.h | 4 + tools/perf/util/libbfd.c | 4 +- tools/perf/util/libbfd.h | 6 +- tools/perf/util/llvm-c-helpers.cpp | 120 +++++- tools/perf/util/llvm-c-helpers.h | 24 +- tools/perf/util/llvm.c | 374 +++++++++++++----- tools/perf/util/llvm.h | 3 - tools/perf/util/srcline.c | 495 ++---------------------- tools/perf/util/srcline.h | 1 - 23 files changed, 1314 insertions(+), 709 deletions(-) create mode 100644 tools/perf/util/addr2line.c create mode 100644 tools/perf/util/addr2line.hSignature · 1 line
2.51.0.618.g983fd99d29-goog
Arnaldo Carvalho de Melo
maintainerQuoted 61 lines · Arnaldo Carvalho de Melo
Quoted 3 lines · Ian Rogers
v7: Refactor now the first 5 patches, that largely moved code around,
have landed. Move the dlopen code to the end of the series so that the first 8 patches can be picked improving capstone/LLVM supportSo I tentatively picked the first 8 patches, will test it now, hopefully we can go with it to have BPF annotation...
Wait, will try to fix this one:
⬢ [acme@toolbx perf-tools-next]$ git log --oneline -1 ; time make -C
tools/perfbuild-testmake_static: cd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 NO_LIBTRACEEVENT=1 NO_LIBELF=1 -j32 DESTDIR=/tmp/tmp.w26bDGykTMcd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 NO_LIBTRACEEVENT=1 NO_LIBELF=1 -j32 DESTDIR=/tmp/tmp.w26bDGykTM
BUILD: Doing 'make -j32' parallel build
<SNIP>
Auto-detecting system features:
... libdw: [ OFF ]
... glibc: [ on ]
... libelf: [ OFF ]
... libnuma: [ OFF ]
...numa_num_possible_cpus: [ OFF ]
... libpython: [ OFF ]
... libcapstone: [ OFF ]
... llvm-perf: [ OFF ]
... zlib: [ OFF ]
... lzma: [ OFF ]... get_cpuid: [ on ] ... bpf: [ on ] ... libaio: [ on ] ... libzstd: [ OFF ] <SNIP> CC tests/api-io.o CC util/sha1.o CC util/smt.o LD util/intel-pt-decoder/perf-util-in.o CC tests/demangle-java-test.o CC util/strbuf.o CC util/string.o CC tests/demangle-ocaml-test.o CC util/strlist.o CC tests/demangle-rust-v0-test.o CC tests/pfm.o CC tests/parse-metric.o CC util/strfilter.o CC tests/pe-file-parsing.o util/llvm.c: In function ‘init_llvm’: util/llvm.c:78:17: error: implicit declaration of function ‘LLVMInitializeAllTargetInfos’ [-Wimplicit-function-declaration] 78 | LLVMInitializeAllTargetInfos(); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ util/llvm.c:79:17: error: implicit declaration of function ‘LLVMInitializeAllTargetMCs’ [-Wimplicit-function-declaration] 79 | LLVMInitializeAllTargetMCs(); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ util/llvm.c:80:17: error: implicit declaration of function ‘LLVMInitializeAllDisassemblers’ [-Wimplicit-function-declaration] 80 | LLVMInitializeAllDisassemblers(); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ util/llvm.c: At top level: util/llvm.c:73:13: error: ‘init_llvm’ defined but not used [-Werror=unused-function] 73 | static void init_llvm(void) | ^~~~~~~~~ cc1: all warnings being treated as errors CC tests/expand-cgroup.o
Quoted 8 lines
CC util/top.o CC tests/perf-time-to-tsc.o CC util/usage.o make[6]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:86: util/llvm.o] Error 1 make[6]: *** Waiting for unfinished jobs.... CC tests/dlfilter-test.o CC tests/sigtrap.o CC tests/event_groups.o
Guess this will be enough:
tools/perf/util/llvm.c +1 -1
@@ -70,6 +70,7 @@ int llvm__addr2line(const char *dso_name __maybe_unused, u64 addr __maybe_unused#endif } +#ifdef HAVE_LIBLLVM_SUPPORT static void init_llvm (void ) {static bool init;
@@ -90,7 +91,6 @@ static void init_llvm(void)* should add some textual annotation for after the instruction. The caller * will use this information to add the actual annotation. */ -#ifdef HAVE_LIBLLVM_SUPPORTstruct symbol_lookup_storage {u64 branch_addr;u64 pcrel_load_addr;
Ian Rogers
reviewerQuoted 87 lines · Arnaldo Carvalho de Melo
Quoted 61 lines · Arnaldo Carvalho de Melo
Quoted 3 lines · Ian Rogers
v7: Refactor now the first 5 patches, that largely moved code around,
have landed. Move the dlopen code to the end of the series so that the first 8 patches can be picked improving capstone/LLVM supportSo I tentatively picked the first 8 patches, will test it now, hopefully we can go with it to have BPF annotation...
Wait, will try to fix this one:
⬢ [acme@toolbx perf-tools-next]$ git log --oneline -1 ; time make -C
tools/perfbuild-testmake_static: cd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 NO_LIBTRACEEVENT=1 NO_LIBELF=1 -j32 DESTDIR=/tmp/tmp.w26bDGykTMcd . && make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1 NO_LIBTRACEEVENT=1 NO_LIBELF=1 -j32 DESTDIR=/tmp/tmp.w26bDGykTM
BUILD: Doing 'make -j32' parallel build
<SNIP>
Auto-detecting system features:
... libdw: [ OFF ]
... glibc: [ on ]
... libelf: [ OFF ]
... libnuma: [ OFF ]
...numa_num_possible_cpus: [ OFF ]
... libpython: [ OFF ]
... libcapstone: [ OFF ]
... llvm-perf: [ OFF ]
... zlib: [ OFF ]
... lzma: [ OFF ]... get_cpuid: [ on ] ... bpf: [ on ] ... libaio: [ on ] ... libzstd: [ OFF ] <SNIP> CC tests/api-io.o CC util/sha1.o CC util/smt.o LD util/intel-pt-decoder/perf-util-in.o CC tests/demangle-java-test.o CC util/strbuf.o CC util/string.o CC tests/demangle-ocaml-test.o CC util/strlist.o CC tests/demangle-rust-v0-test.o CC tests/pfm.o CC tests/parse-metric.o CC util/strfilter.o CC tests/pe-file-parsing.o util/llvm.c: In function ‘init_llvm’: util/llvm.c:78:17: error: implicit declaration of function ‘LLVMInitializeAllTargetInfos’ [-Wimplicit-function-declaration] 78 | LLVMInitializeAllTargetInfos(); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ util/llvm.c:79:17: error: implicit declaration of function ‘LLVMInitializeAllTargetMCs’ [-Wimplicit-function-declaration] 79 | LLVMInitializeAllTargetMCs(); | ^~~~~~~~~~~~~~~~~~~~~~~~~~ util/llvm.c:80:17: error: implicit declaration of function ‘LLVMInitializeAllDisassemblers’ [-Wimplicit-function-declaration] 80 | LLVMInitializeAllDisassemblers(); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ util/llvm.c: At top level: util/llvm.c:73:13: error: ‘init_llvm’ defined but not used [-Werror=unused-function] 73 | static void init_llvm(void) | ^~~~~~~~~ cc1: all warnings being treated as errors CC tests/expand-cgroup.oQuoted 8 lines
CC util/top.o CC tests/perf-time-to-tsc.o CC util/usage.o make[6]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:86: util/llvm.o] Error 1 make[6]: *** Waiting for unfinished jobs.... CC tests/dlfilter-test.o CC tests/sigtrap.o CC tests/event_groups.oGuess this will be enough:
tools/perf/util/llvm.c +1
-0@@ -70,6 +70,7 @@ int llvm__addr2line(const char *dso_name __maybe_unused, u64 addr __maybe_unused#endif } +#ifdef HAVE_LIBLLVM_SUPPORT static void init_llvm (void ) {static bool init;
tools/perf/util/llvm.c static void init_llvm(void) · line 96
Quoted 7 lines
tools/perf/util/llvm.c +0
-1@@ -90,7 +91,6 @@ static void init_llvm(void)* should add some textual annotation for after the instruction. The caller * will use this information to add the actual annotation. */ -#ifdef HAVE_LIBLLVM_SUPPORTstruct symbol_lookup_storage {u64 branch_addr;u64 pcrel_load_addr;
Ah crap. Yeah, it's a PITA trying to keep LLVM and not LLVM builds happy. perf_LLVM* fixes this by possibly always punting to the dlopen/dlsym version when HAVE_LIBLLVM_SUPPORT isn't there - hence a lot of the comments I've been making. I forgot to rebuild without libLLVM and so missed needing the extra #ifdefs. I agree with the fix but the fix can be removed in the (now) later patches that use dlopen/dlsym.
Thanks,
Ian