Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49247345 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf probe: Check if dwarf_getlocations() is available 

If not, tell the user that:

  config/Makefile:273: Old libdw.h, finding variables at given 'perf probe' point will not work, install elfutils-devel/libdw-dev >= 0.157

And return -ENOTSUPP in die_get_var_range(), failing features that
need it, like the one pointed out above.

This fixes the build on older systems, such as Ubuntu 12.04.5.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Vinson Lee <vlee@freedesktop.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-9l7luqkq4gfnx7vrklkq4obs@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 62aa0e17

tools/build/Makefile.feature

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ endef 
FEATURE_TESTS_BASIC :=			\

	backtrace			\

	dwarf				\

	dwarf_getlocations		\

	fortify-source			\

	sync-compare-and-swap		\

	glibc				\
@@ -78,6 +79,7 @@ endif 


FEATURE_DISPLAY ?=			\

	dwarf				\

	dwarf_getlocations		\

	glibc				\

	gtk2				\

	libaudit			\

tools/build/feature/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ FILES= \ 
	test-backtrace.bin		\

	test-bionic.bin			\

	test-dwarf.bin			\

	test-dwarf_getlocations.bin	\

	test-fortify-source.bin		\

	test-sync-compare-and-swap.bin	\

	test-glibc.bin			\
@@ -82,6 +83,9 @@ endif 
$(OUTPUT)test-dwarf.bin:

	$(BUILD) $(DWARFLIBS)



$(OUTPUT)test-dwarf_getlocations.bin:

	$(BUILD) $(DWARFLIBS)



$(OUTPUT)test-libelf-mmap.bin:

	$(BUILD) -lelf

tools/build/feature/test-all.c

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ 
# include "test-dwarf.c"

#undef main



#define main main_test_dwarf_getlocations

# include "test-dwarf_getlocations.c"

#undef main



#define main main_test_libelf_getphdrnum

# include "test-libelf-getphdrnum.c"

#undef main
@@ -143,6 +147,7 @@ int main(int argc, char *argv[]) 
	main_test_libelf_mmap();

	main_test_glibc();

	main_test_dwarf();

	main_test_dwarf_getlocations();

	main_test_libelf_getphdrnum();

	main_test_libunwind();

	main_test_libaudit();

tools/build/feature/test-dwarf_getlocations.c

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#include <stdlib.h>

#include <elfutils/libdw.h>



int main(void)

{

	Dwarf_Addr base, start, end;

	Dwarf_Attribute attr;

	Dwarf_Op *op;

        size_t nops;

	ptrdiff_t offset = 0;

        return (int)dwarf_getlocations(&attr, offset, &base, &start, &end, &op, &nops);

}

tools/perf/config/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -268,6 +268,12 @@ else 
    ifneq ($(feature-dwarf), 1)

      msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);

      NO_DWARF := 1

    else

      ifneq ($(feature-dwarf_getlocations), 1)

        msg := $(warning Old libdw.h, finding variables at given 'perf probe' point will not work, install elfutils-devel/libdw-dev >= 0.157);

      else

        CFLAGS += -DHAVE_DWARF_GETLOCATIONS

      endif # dwarf_getlocations

    endif # Dwarf support

  endif # libelf support

endif # NO_LIBELF