From: Jiri Olsa <jolsa@redhat.com>
To: Song Liu <songliubraving@fb.com>
Cc: linux-kernel@vger.kernel.org, kernel-team@fb.com,
peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
namhyung@kernel.org
Subject: Re: [RFC 1/2] perf: support build BPF skeletons with perf
Date: Mon, 23 Nov 2020 00:35:21 +0100 [thread overview]
Message-ID: <20201122233521.GD1902740@krava> (raw)
In-Reply-To: <20201119045046.1491106-2-songliubraving@fb.com>
On Wed, Nov 18, 2020 at 08:50:45PM -0800, Song Liu wrote:
> BPF programs are useful in perf to profile BPF programs. BPF skeleton is
> by far the easiest way to write BPF tools. Enable building BPF skeletons
> in util/bpf_skel. A dummy bpf skeleton is added. More bpf skeletons will
> be added for different use cases.
I was just in a place adding bpf program to perf as well,
so this will save me some time ;-) thanks!
jirka
>
> Signed-off-by: Song Liu <songliubraving@fb.com>
> ---
> tools/build/Makefile.feature | 3 +-
> tools/perf/Makefile.config | 7 +++
> tools/perf/Makefile.perf | 15 +++++-
> tools/perf/util/bpf_skel/.gitignore | 3 ++
> tools/perf/util/bpf_skel/Makefile | 71 ++++++++++++++++++++++++++++
> tools/perf/util/bpf_skel/dummy.bpf.c | 19 ++++++++
> 6 files changed, 115 insertions(+), 3 deletions(-)
> create mode 100644 tools/perf/util/bpf_skel/.gitignore
> create mode 100644 tools/perf/util/bpf_skel/Makefile
> create mode 100644 tools/perf/util/bpf_skel/dummy.bpf.c
>
> diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
> index 97cbfb31b7625..95a58b5564218 100644
> --- a/tools/build/Makefile.feature
> +++ b/tools/build/Makefile.feature
> @@ -70,7 +70,8 @@ FEATURE_TESTS_BASIC := \
> libaio \
> libzstd \
> disassembler-four-args \
> - file-handle
> + file-handle \
> + clang-bpf-co-re
>
> # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list
> # of all feature tests
> diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
> index ce8516e4de34f..1c2c0f4badd85 100644
> --- a/tools/perf/Makefile.config
> +++ b/tools/perf/Makefile.config
> @@ -619,6 +619,13 @@ ifndef NO_LIBBPF
> msg := $(warning BPF API too old. Please install recent kernel headers. BPF support in 'perf record' is disabled.)
> NO_LIBBPF := 1
> endif
> +
> + ifndef NO_BPF_SKEL
> + ifeq ($(feature-clang-bpf-co-re), 1)
> + BUILD_BPF_SKEL := 1
> + $(call detected,CONFIG_PERF_BPF_SKEL)
> + endif
> + endif
> endif
>
> dwarf-post-unwind := 1
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index 7ce3f2e8b9c74..9a9fc71e2ffa4 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -126,6 +126,8 @@ include ../scripts/utilities.mak
> #
> # Define NO_LIBDEBUGINFOD if you do not want support debuginfod
> #
> +# Define NO_BPF_SKEL if you do not want build BPF skeletons
> +#
>
> # As per kernel Makefile, avoid funny character set dependencies
> unexport LC_ALL
> @@ -735,7 +737,8 @@ prepare: $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h archheaders $(drm_ioc
> $(x86_arch_prctl_code_array) \
> $(rename_flags_array) \
> $(arch_errno_name_array) \
> - $(sync_file_range_arrays)
> + $(sync_file_range_arrays) \
> + bpf-skel
>
> $(OUTPUT)%.o: %.c prepare FORCE
> $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(build-dir) $@
> @@ -1008,7 +1011,15 @@ config-clean:
> python-clean:
> $(python-clean)
>
> +ifdef BUILD_BPF_SKEL
> +bpf-skel:
> + $(Q)$(MAKE) -C util/bpf_skel
> +else
> +bpf-skel:
> +endif
> +
> clean:: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBPERF)-clean config-clean fixdep-clean python-clean
> + $(call descend,util/bpf_skel,clean)
> $(call QUIET_CLEAN, core-objs) $(RM) $(LIBPERF_A) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
> $(Q)find $(if $(OUTPUT),$(OUTPUT),.) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
> $(Q)$(RM) $(OUTPUT).config-detected
> @@ -1071,7 +1082,7 @@ endif
>
> FORCE:
>
> -.PHONY: all install clean config-clean strip install-gtk
> +.PHONY: all install clean config-clean strip install-gtk bpf-skel
> .PHONY: shell_compatibility_test please_set_SHELL_PATH_to_a_more_modern_shell
> .PHONY: $(GIT-HEAD-PHONY) TAGS tags cscope FORCE prepare
> .PHONY: libtraceevent_plugins archheaders
> diff --git a/tools/perf/util/bpf_skel/.gitignore b/tools/perf/util/bpf_skel/.gitignore
> new file mode 100644
> index 0000000000000..5263e9e6c5d83
> --- /dev/null
> +++ b/tools/perf/util/bpf_skel/.gitignore
> @@ -0,0 +1,3 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +.tmp
> +*.skel.h
> \ No newline at end of file
> diff --git a/tools/perf/util/bpf_skel/Makefile b/tools/perf/util/bpf_skel/Makefile
> new file mode 100644
> index 0000000000000..853bece088f4b
> --- /dev/null
> +++ b/tools/perf/util/bpf_skel/Makefile
> @@ -0,0 +1,71 @@
> +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
> +SKEL_OUTPUT := $(abspath .)
> +TMP_OUTPUT := $(abspath .tmp)
> +CLANG ?= clang
> +LLC ?= llc
> +LLVM_STRIP ?= llvm-strip
> +DEFAULT_BPFTOOL := $(TMP_OUTPUT)/sbin/bpftool
> +BPFTOOL ?= $(DEFAULT_BPFTOOL)
> +LIBBPF_SRC := $(abspath ../../../lib/bpf)
> +BPFOBJ := $(TMP_OUTPUT)/libbpf.a
> +BPF_INCLUDE := $(TMP_OUTPUT)
> +INCLUDES := -I$(TMP_OUTPUT) -I$(BPF_INCLUDE) -I$(abspath ../../../lib) \
> + -I$(abspath ../../../include/uapi)
> +CFLAGS := -g -Wall
> +
> +# Try to detect best kernel BTF source
> +KERNEL_REL := $(shell uname -r)
> +VMLINUX_BTF_PATHS := /sys/kernel/btf/vmlinux /boot/vmlinux-$(KERNEL_REL)
> +VMLINUX_BTF_PATH := $(or $(VMLINUX_BTF),$(firstword \
> + $(wildcard $(VMLINUX_BTF_PATHS))))
> +ifeq ($(V),1)
> +Q =
> +msg =
> +else
> +Q = @
> +msg = @printf ' %-8s %s%s\n' "$(1)" "$(notdir $(2))" "$(if $(3), $(3))";
> +MAKEFLAGS += --no-print-directory
> +submake_extras := feature_display=0
> +endif
> +
> +SKELETONS := $(SKEL_OUTPUT)/dummy.skel.h
> +
> +.DELETE_ON_ERROR:
> +
> +.PHONY: all clean
> +all: $(SKELETONS)
> +
> +clean:
> + $(call msg,CLEAN,bpf_skel)
> + $(Q)rm -rf $(TMP_OUTPUT) $(SKELETONS)
> +
> +$(SKEL_OUTPUT)/%.skel.h: $(TMP_OUTPUT)/%.bpf.o | $(BPFTOOL)
> + $(call msg,GEN-SKEL,$@)
> + $(Q)$(BPFTOOL) gen skeleton $< > $@
> +
> +$(TMP_OUTPUT)/%.bpf.o: %.bpf.c $(TMP_OUTPUT)/vmlinux.h $(BPFOBJ) | $(TMP_OUTPUT)
> + $(call msg,BPF,$@)
> + $(Q)$(CLANG) -g -O2 -target bpf $(INCLUDES) \
> + -c $(filter %.c,$^) -o $@ && \
> + $(LLVM_STRIP) -g $@
> +
> +$(TMP_OUTPUT):
> + $(call msg,MKDIR,$@)
> + $(Q)mkdir -p $(TMP_OUTPUT)
> +
> +$(TMP_OUTPUT)/vmlinux.h: $(VMLINUX_BTF_PATH) | $(TMP_OUTPUT) $(BPFTOOL)
> + $(call msg,GEN,$@)
> + $(Q)if [ ! -e "$(VMLINUX_BTF_PATH)" ] ; then \
> + echo "Couldn't find kernel BTF; set VMLINUX_BTF to" \
> + "specify its location." >&2; \
> + exit 1;\
> + fi
> + $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@
> +
> +$(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(TMP_OUTPUT)
> + $(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) \
> + OUTPUT=$(abspath $(dir $@))/ $(abspath $@)
> +
> +$(DEFAULT_BPFTOOL): | $(TMP_OUTPUT)
> + $(Q)$(MAKE) $(submake_extras) -C ../../../bpf/bpftool \
> + prefix= OUTPUT=$(TMP_OUTPUT)/ DESTDIR=$(TMP_OUTPUT) install
> diff --git a/tools/perf/util/bpf_skel/dummy.bpf.c b/tools/perf/util/bpf_skel/dummy.bpf.c
> new file mode 100644
> index 0000000000000..085fcee1f52cf
> --- /dev/null
> +++ b/tools/perf/util/bpf_skel/dummy.bpf.c
> @@ -0,0 +1,19 @@
> +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +// Copyright (c) 2020 Facebook
> +#include "vmlinux.h"
> +#include <bpf/bpf_helpers.h>
> +#include <bpf/bpf_tracing.h>
> +
> +struct {
> + __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY);
> + __uint(key_size, sizeof(u32));
> + __uint(value_size, sizeof(u64));
> +} counts SEC(".maps");
> +
> +SEC("fentry/dummy")
> +int BPF_PROG(fentry_dummy)
> +{
> + return 0;
> +}
> +
> +char LICENSE[] SEC("license") = "Dual BSD/GPL";
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-11-22 23:35 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 4:50 [RFC 0/2] Introduce perf-stat -b for BPF programs Song Liu
2020-11-19 4:50 ` [RFC 1/2] perf: support build BPF skeletons with perf Song Liu
2020-11-22 23:27 ` Jiri Olsa
2020-11-24 23:47 ` Song Liu
2020-11-25 16:38 ` Jiri Olsa
2020-11-22 23:32 ` Jiri Olsa
2020-11-24 23:51 ` Song Liu
2020-11-22 23:35 ` Jiri Olsa [this message]
2020-11-24 23:52 ` Song Liu
2020-11-25 16:40 ` Jiri Olsa
2020-11-24 19:51 ` Jiri Olsa
2020-11-24 23:59 ` Song Liu
2020-11-24 19:51 ` Jiri Olsa
2020-11-24 23:53 ` Song Liu
2020-11-19 4:50 ` [RFC 2/2] perf-stat: enable counting events for BPF programs Song Liu
2020-11-23 23:47 ` Jiri Olsa
2020-11-24 23:31 ` Song Liu
2020-11-25 16:42 ` Jiri Olsa
2020-11-24 19:51 ` Jiri Olsa
2020-11-24 23:43 ` Song Liu
2020-11-25 0:02 ` Song Liu
2020-11-25 16:43 ` Jiri Olsa
2020-11-19 14:52 ` [RFC 0/2] Introduce perf-stat -b " Arnaldo Carvalho de Melo
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=20201122233521.GD1902740@krava \
--to=jolsa@redhat.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=songliubraving@fb.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;
as well as URLs for NNTP newsgroup(s).