mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <ast@plumgrid.com>,
	<brendan.d.gregg@gmail.com>, <daniel@iogearbox.net>,
	<namhyung@kernel.org>, <masami.hiramatsu.pt@hitachi.com>,
	<paulus@samba.org>, <a.p.zijlstra@chello.nl>, <mingo@redhat.com>,
	<jolsa@kernel.org>, <dsahern@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, <lizefan@huawei.com>,
	<hekuang@huawei.com>, <xiakaixu@huawei.com>, <pi3orama@163.com>
Subject: [RFC PATCH v10 23/50] perf tools: Make perf depend on libbpf
Date: Wed, 1 Jul 2015 02:14:11 +0000	[thread overview]
Message-ID: <1435716878-189507-24-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1435716878-189507-1-git-send-email-wangnan0@huawei.com>

By adding libbpf into perf's Makefile, this patch enables perf to
build libbpf during building if libelf is found and neither NO_LIBELF
nor NO_LIBBPF is set. The newly introduced code is similar to libapi
and libtraceevent building in Makefile.perf.

MANIFEST is also updated for 'make perf-*-src-pkg'.

Append make_no_libbpf to tools/perf/tests/make.

'bpf' feature check is appended into default FEATURE_TESTS and
FEATURE_DISPLAY, so perf will check API version of bpf in
/path/to/kernel/include/uapi/linux/bpf.h. Which should not fail
except when we are trying to port this code to an old kernel.

Error messages are also updated to notify users about the disable of
BPF support of 'perf record' if libelf is missed or BPF API check
failed.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
 tools/build/Makefile.feature |  6 ++++--
 tools/perf/MANIFEST          |  3 +++
 tools/perf/Makefile.perf     | 19 +++++++++++++++++--
 tools/perf/config/Makefile   | 19 ++++++++++++++++++-
 tools/perf/tests/make        |  4 +++-
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index 2975632..5ec6b37 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -51,7 +51,8 @@ FEATURE_TESTS ?=			\
 	timerfd				\
 	libdw-dwarf-unwind		\
 	zlib				\
-	lzma
+	lzma				\
+	bpf
 
 FEATURE_DISPLAY ?=			\
 	dwarf				\
@@ -67,7 +68,8 @@ FEATURE_DISPLAY ?=			\
 	libunwind			\
 	libdw-dwarf-unwind		\
 	zlib				\
-	lzma
+	lzma				\
+	bpf
 
 # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.
 # If in the future we need per-feature checks/flags for features not
diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST
index fe50a1b..2c430dd 100644
--- a/tools/perf/MANIFEST
+++ b/tools/perf/MANIFEST
@@ -17,6 +17,7 @@ tools/build
 tools/arch/x86/include/asm/atomic.h
 tools/arch/x86/include/asm/rmwcc.h
 tools/lib/traceevent
+tools/lib/bpf
 tools/lib/api
 tools/lib/symbol/kallsyms.c
 tools/lib/symbol/kallsyms.h
@@ -67,6 +68,8 @@ include/linux/poison.h
 include/linux/hw_breakpoint.h
 include/linux/rbtree_augmented.h
 include/uapi/linux/perf_event.h
+include/uapi/linux/bpf.h
+include/uapi/linux/bpf_common.h
 include/uapi/linux/const.h
 include/uapi/linux/swab.h
 include/uapi/linux/hw_breakpoint.h
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 1af0cfe..5f453a8 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -125,6 +125,7 @@ STRIP   = strip
 
 LIB_DIR          = $(srctree)/tools/lib/api/
 TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/
+BPF_DIR = $(srctree)/tools/lib/bpf/
 
 # include config/Makefile by default and rule out
 # non-config cases
@@ -160,6 +161,7 @@ strip-libs = $(filter-out -l%,$(1))
 
 ifneq ($(OUTPUT),)
   TE_PATH=$(OUTPUT)
+  BPF_PATH=$(OUTPUT)
 ifneq ($(subdir),)
   LIB_PATH=$(OUTPUT)/../lib/api/
 else
@@ -168,6 +170,7 @@ endif
 else
   TE_PATH=$(TRACE_EVENT_DIR)
   LIB_PATH=$(LIB_DIR)
+  BPF_PATH=$(BPF_DIR)
 endif
 
 LIBTRACEEVENT = $(TE_PATH)libtraceevent.a
@@ -179,6 +182,8 @@ LIBTRACEEVENT_DYNAMIC_LIST_LDFLAGS = -Xlinker --dynamic-list=$(LIBTRACEEVENT_DYN
 LIBAPI = $(LIB_PATH)libapi.a
 export LIBAPI
 
+LIBBPF = $(BPF_PATH)libbpf.a
+
 # python extension build directories
 PYTHON_EXTBUILD     := $(OUTPUT)python_ext_build/
 PYTHON_EXTBUILD_LIB := $(PYTHON_EXTBUILD)lib/
@@ -231,6 +236,9 @@ export PERL_PATH
 LIB_FILE=$(OUTPUT)libperf.a
 
 PERFLIBS = $(LIB_FILE) $(LIBAPI) $(LIBTRACEEVENT)
+ifndef NO_LIBBPF
+  PERFLIBS += $(LIBBPF)
+endif
 
 # We choose to avoid "if .. else if .. else .. endif endif"
 # because maintaining the nesting to match is a pain.  If
@@ -400,6 +408,13 @@ $(LIBAPI)-clean:
 	$(call QUIET_CLEAN, libapi)
 	$(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null
 
+$(LIBBPF): FORCE
+	$(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a
+
+$(LIBBPF)-clean:
+	$(call QUIET_CLEAN, libbpf)
+	$(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) clean >/dev/null
+
 help:
 	@echo 'Perf make targets:'
 	@echo '  doc		- make *all* documentation (see below)'
@@ -439,7 +454,7 @@ INSTALL_DOC_TARGETS += quick-install-doc quick-install-man quick-install-html
 $(DOC_TARGETS):
 	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:doc=all)
 
-TAG_FOLDERS= . ../lib/traceevent ../lib/api ../lib/symbol
+TAG_FOLDERS= . ../lib/traceevent ../lib/api ../lib/symbol ../lib/bpf
 TAG_FILES= ../../include/uapi/linux/perf_event.h
 
 TAGS:
@@ -542,7 +557,7 @@ config-clean:
 	$(call QUIET_CLEAN, config)
 	$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
 
-clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean
+clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
 	$(call QUIET_CLEAN, core-objs)  $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
 	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
 	$(Q)$(RM) .config-detected
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 317001c..1b387ec 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -106,6 +106,7 @@ ifdef LIBBABELTRACE
   FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf
 endif
 
+FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/arch/$(ARCH)/include/uapi -I$(srctree)/include/uapi
 # include ARCH specific config
 -include $(src-perf)/arch/$(ARCH)/Makefile
 
@@ -233,6 +234,7 @@ ifdef NO_LIBELF
   NO_DEMANGLE := 1
   NO_LIBUNWIND := 1
   NO_LIBDW_DWARF_UNWIND := 1
+  NO_LIBBPF := 1
 else
   ifeq ($(feature-libelf), 0)
     ifeq ($(feature-glibc), 1)
@@ -242,13 +244,14 @@ else
       LIBC_SUPPORT := 1
     endif
     ifeq ($(LIBC_SUPPORT),1)
-      msg := $(warning No libelf found, disables 'probe' tool, please install elfutils-libelf-devel/libelf-dev);
+      msg := $(warning No libelf found, disables 'probe' tool and BPF support in 'perf record', please install elfutils-libelf-devel/libelf-dev);
 
       NO_LIBELF := 1
       NO_DWARF := 1
       NO_DEMANGLE := 1
       NO_LIBUNWIND := 1
       NO_LIBDW_DWARF_UNWIND := 1
+      NO_LIBBPF := 1
     else
       ifneq ($(filter s% -static%,$(LDFLAGS),),)
         msg := $(error No static glibc found, please install glibc-static);
@@ -301,6 +304,13 @@ ifndef NO_LIBELF
       $(call detected,CONFIG_DWARF)
     endif # PERF_HAVE_DWARF_REGS
   endif # NO_DWARF
+
+  ifndef NO_LIBBPF
+    ifeq ($(feature-bpf), 1)
+      CFLAGS += -DHAVE_LIBBPF_SUPPORT
+      $(call detected,CONFIG_LIBBPF)
+    endif
+  endif # NO_LIBBPF
 endif # NO_LIBELF
 
 ifeq ($(ARCH),powerpc)
@@ -316,6 +326,13 @@ ifndef NO_LIBUNWIND
   endif
 endif
 
+ifndef NO_LIBBPF
+  ifneq ($(feature-bpf), 1)
+    msg := $(warning BPF API too old. Please install recent kernel headers. BPF support in 'perf record' is disabled.)
+    NO_LIBBPF := 1
+  endif
+endif
+
 dwarf-post-unwind := 1
 dwarf-post-unwind-text := BUG
 
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 729112f..89e0f3d 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -44,6 +44,7 @@ make_no_libnuma     := NO_LIBNUMA=1
 make_no_libaudit    := NO_LIBAUDIT=1
 make_no_libbionic   := NO_LIBBIONIC=1
 make_no_auxtrace    := NO_AUXTRACE=1
+make_no_libbpf	    := NO_LIBBPF=1
 make_tags           := tags
 make_cscope         := cscope
 make_help           := help
@@ -65,7 +66,7 @@ make_static         := LDFLAGS=-static
 make_minimal        := NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1
 make_minimal        += NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1
 make_minimal        += NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1
-make_minimal        += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1
+make_minimal        += NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1 NO_LIBBPF=1
 
 # $(run) contains all available tests
 run := make_pure
@@ -93,6 +94,7 @@ run += make_no_libnuma
 run += make_no_libaudit
 run += make_no_libbionic
 run += make_no_auxtrace
+run += make_no_libbpf
 run += make_help
 run += make_doc
 run += make_perf_o
-- 
1.8.3.4


  parent reply	other threads:[~2015-07-01  2:27 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-01  2:13 [RFC PATCH v10 00/50] perf tools: filtering events using eBPF programs Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 01/50] bpf: Use correct #ifdef controller for trace_call_bpf() Wang Nan
2015-08-07  7:15   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 02/50] tracing, perf: Implement BPF programs attached to uprobes Wang Nan
2015-08-07  7:16   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 03/50] bpf tools: Introduce 'bpf' library and add bpf feature check Wang Nan
2015-08-08  8:09   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 04/50] bpf tools: Allow caller to set printing function Wang Nan
2015-08-08  8:09   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 05/50] bpf tools: Open eBPF object file and do basic validation Wang Nan
2015-08-08  8:10   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 06/50] bpf tools: Read eBPF object from buffer Wang Nan
2015-08-08  8:10   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 07/50] bpf tools: Check endianness and make libbpf fail early Wang Nan
2015-08-08  8:10   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 08/50] bpf tools: Iterate over ELF sections to collect information Wang Nan
2015-08-08  8:11   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 09/50] bpf tools: Collect version and license from ELF sections Wang Nan
2015-08-08  8:11   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 10/50] bpf tools: Collect map definitions from 'maps' section Wang Nan
2015-08-08  8:11   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:13 ` [RFC PATCH v10 11/50] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-07-07 15:10   ` Arnaldo Carvalho de Melo
2015-08-08  8:12   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 12/50] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-07-07 15:17   ` Arnaldo Carvalho de Melo
2015-08-08  8:12   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 13/50] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-08-08  8:12   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 14/50] bpf tools: Record map accessing instructions for each program Wang Nan
2015-08-08  8:13   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 15/50] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-08-08  8:13   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 16/50] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-08-08  8:14   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 17/50] bpf tools: Relocate eBPF programs Wang Nan
2015-08-08  8:14   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 18/50] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-08-08  8:14   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 19/50] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-08-08  8:15   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 20/50] bpf tools: Introduce accessors for struct bpf_program Wang Nan
2015-07-07 19:37   ` Arnaldo Carvalho de Melo
2015-08-08  8:15   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 21/50] bpf tools: Introduce accessors for struct bpf_object Wang Nan
2015-07-07 19:39   ` Arnaldo Carvalho de Melo
2015-07-01  2:14 ` [RFC PATCH v10 22/50] bpf tools: Link all bpf objects onto a list Wang Nan
2015-07-07 19:47   ` Arnaldo Carvalho de Melo
2015-08-08  8:15   ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-01  2:14 ` Wang Nan [this message]
2015-07-07 19:54   ` [RFC PATCH v10 23/50] perf tools: Make perf depend on libbpf Arnaldo Carvalho de Melo
2015-07-07 20:16     ` Arnaldo Carvalho de Melo
2015-07-08  2:03       ` Alexei Starovoitov
2015-07-08 13:03         ` Arnaldo Carvalho de Melo
2015-07-08 11:45       ` Wangnan (F)
2015-07-08 13:02         ` Arnaldo Carvalho de Melo
2015-07-01  2:14 ` [RFC PATCH v10 24/50] perf tools: Introduce llvm config options Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 25/50] perf tools: Call clang to compile C source to object code Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 26/50] perf tests: Add LLVM test for eBPF on-the-fly compiling Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 27/50] perf tools: Auto detecting kernel build directory Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 28/50] perf tools: Auto detecting kernel include options Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 29/50] perf record: Enable passing bpf object file to --event Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 30/50] perf record: Compile scriptlets if pass '.c' " Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 31/50] perf tools: Parse probe points of eBPF programs during preparation Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 32/50] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 33/50] perf record: Probe at kprobe points Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 34/50] perf record: Load all eBPF object into kernel Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 35/50] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 36/50] perf tools: Attach eBPF program to perf event Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 37/50] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 38/50] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 39/50] bpf tools: Load a program with different instance using preprocessor Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 40/50] perf tools: Fix probe-event.h include Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 41/50] perf probe: Reset tev->args and tev->nargs when failure Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 42/50] perf tools: Move linux/filter.h to tools/include Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 43/50] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 44/50] perf tools: Introduce arch_get_reg_info() for x86 Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 45/50] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 46/50] perf tools: Generate prologue for BPF programs Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 47/50] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 48/50] perf record: Support custom vmlinux path Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 49/50] perf probe: Init symbol as kprobe if any event is kprobe Wang Nan
2015-07-01  2:14 ` [RFC PATCH v10 50/50] perf tools: Support attach BPF program on uprobe events Wang Nan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435716878-189507-24-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=ast@plumgrid.com \
    --cc=brendan.d.gregg@gmail.com \
    --cc=daniel@iogearbox.net \
    --cc=dsahern@gmail.com \
    --cc=hekuang@huawei.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    --cc=pi3orama@163.com \
    --cc=xiakaixu@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®