| Message ID | 20230605202712.1690876-2-irogers@google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | Bring back vmlinux.h generation | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Mon, Jun 05, 2023 at 01:27:09PM -0700, Ian Rogers wrote: > Commit a887466562b4 ("perf bpf skels: Stop using vmlinux.h generated > from BTF, use subset of used structs + CO-RE") made it so that > vmlinux.h was uncondtionally included from > tools/perf/util/vmlinux.h. This change reverts part of that change (so > that vmlinux.h is once again generated) and makes it so that the > vmlinux.h used at build time is selected from the VMLINUX_H > variable. By default the VMLINUX_H variable is set to the vmlinux.h > added in change a887466562b4, but if GEN_VMLINUX_H=1 is passed on the > build command line then the previous generation behavior kicks in. > > The build with GEN_VMLINUX_H=1 currently fails with: > ``` > util/bpf_skel/lock_contention.bpf.c:419:8: error: redefinition of 'rq' > struct rq {}; > ^ > /tmp/perf/util/bpf_skel/.tmp/../vmlinux.h:45630:8: note: previous definition is here > struct rq { > ^ > 1 error generated. > ``` > > Signed-off-by: Ian Rogers <irogers@google.com> > Acked-by: Andrii Nakryiko <andrii@kernel.org> > --- > tools/perf/Makefile.config | 4 ++++ > tools/perf/Makefile.perf | 16 +++++++++++++++- > tools/perf/util/bpf_skel/.gitignore | 1 + > tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h | 0 > 4 files changed, 20 insertions(+), 1 deletion(-) > rename tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h (100%) looks good, but I don't understand why you moved the vmlinux.h jirka > > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config > index a794d9eca93d..08d4e7eaa721 100644 > --- a/tools/perf/Makefile.config > +++ b/tools/perf/Makefile.config > @@ -680,6 +680,10 @@ ifdef BUILD_BPF_SKEL > CFLAGS += -DHAVE_BPF_SKEL > endif > > +ifndef GEN_VMLINUX_H > + VMLINUX_H=$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h > +endif > + > dwarf-post-unwind := 1 > dwarf-post-unwind-text := BUG > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > index f48794816d82..f1840af195c0 100644 > --- a/tools/perf/Makefile.perf > +++ b/tools/perf/Makefile.perf > @@ -1080,7 +1080,21 @@ $(BPFTOOL): | $(SKEL_TMP_OUT) > $(Q)CFLAGS= $(MAKE) -C ../bpf/bpftool \ > OUTPUT=$(SKEL_TMP_OUT)/ bootstrap > > -$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) | $(SKEL_TMP_OUT) > +VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux) \ > + $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ > + ../../vmlinux \ > + /sys/kernel/btf/vmlinux \ > + /boot/vmlinux-$(shell uname -r) > +VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS)))) > + > +$(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) > +ifeq ($(VMLINUX_H),) > + $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ > +else > + $(Q)cp "$(VMLINUX_H)" $@ > +endif > + > +$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) $(SKEL_OUT)/vmlinux.h | $(SKEL_TMP_OUT) > $(QUIET_CLANG)$(CLANG) -g -O2 -target bpf -Wall -Werror $(BPF_INCLUDE) $(TOOLS_UAPI_INCLUDE) \ > -c $(filter util/bpf_skel/%.bpf.c,$^) -o $@ > > diff --git a/tools/perf/util/bpf_skel/.gitignore b/tools/perf/util/bpf_skel/.gitignore > index 7a1c832825de..cd01455e1b53 100644 > --- a/tools/perf/util/bpf_skel/.gitignore > +++ b/tools/perf/util/bpf_skel/.gitignore > @@ -1,3 +1,4 @@ > # SPDX-License-Identifier: GPL-2.0-only > .tmp > *.skel.h > +vmlinux.h > diff --git a/tools/perf/util/bpf_skel/vmlinux.h b/tools/perf/util/bpf_skel/vmlinux/vmlinux.h > similarity index 100% > rename from tools/perf/util/bpf_skel/vmlinux.h > rename to tools/perf/util/bpf_skel/vmlinux/vmlinux.h > -- > 2.41.0.rc0.172.g3f132b7071-goog >
On Mon, Jun 5, 2023 at 7:57 PM Jiri Olsa <olsajiri@gmail.com> wrote: > > On Mon, Jun 05, 2023 at 01:27:09PM -0700, Ian Rogers wrote: > > Commit a887466562b4 ("perf bpf skels: Stop using vmlinux.h generated > > from BTF, use subset of used structs + CO-RE") made it so that > > vmlinux.h was uncondtionally included from > > tools/perf/util/vmlinux.h. This change reverts part of that change (so > > that vmlinux.h is once again generated) and makes it so that the > > vmlinux.h used at build time is selected from the VMLINUX_H > > variable. By default the VMLINUX_H variable is set to the vmlinux.h > > added in change a887466562b4, but if GEN_VMLINUX_H=1 is passed on the > > build command line then the previous generation behavior kicks in. > > > > The build with GEN_VMLINUX_H=1 currently fails with: > > ``` > > util/bpf_skel/lock_contention.bpf.c:419:8: error: redefinition of 'rq' > > struct rq {}; > > ^ > > /tmp/perf/util/bpf_skel/.tmp/../vmlinux.h:45630:8: note: previous definition is here > > struct rq { > > ^ > > 1 error generated. > > ``` > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > Acked-by: Andrii Nakryiko <andrii@kernel.org> > > --- > > tools/perf/Makefile.config | 4 ++++ > > tools/perf/Makefile.perf | 16 +++++++++++++++- > > tools/perf/util/bpf_skel/.gitignore | 1 + > > tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h | 0 > > 4 files changed, 20 insertions(+), 1 deletion(-) > > rename tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h (100%) > > looks good, but I don't understand why you moved the vmlinux.h > > jirka Dumb reason, as headers in the same directory take priority, I had to move the vmlinux.h out of the directory with the C code for skeletons so that it could be selected via a -I. Thanks, Ian > > > > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config > > index a794d9eca93d..08d4e7eaa721 100644 > > --- a/tools/perf/Makefile.config > > +++ b/tools/perf/Makefile.config > > @@ -680,6 +680,10 @@ ifdef BUILD_BPF_SKEL > > CFLAGS += -DHAVE_BPF_SKEL > > endif > > > > +ifndef GEN_VMLINUX_H > > + VMLINUX_H=$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h > > +endif > > + > > dwarf-post-unwind := 1 > > dwarf-post-unwind-text := BUG > > > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > > index f48794816d82..f1840af195c0 100644 > > --- a/tools/perf/Makefile.perf > > +++ b/tools/perf/Makefile.perf > > @@ -1080,7 +1080,21 @@ $(BPFTOOL): | $(SKEL_TMP_OUT) > > $(Q)CFLAGS= $(MAKE) -C ../bpf/bpftool \ > > OUTPUT=$(SKEL_TMP_OUT)/ bootstrap > > > > -$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) | $(SKEL_TMP_OUT) > > +VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux) \ > > + $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ > > + ../../vmlinux \ > > + /sys/kernel/btf/vmlinux \ > > + /boot/vmlinux-$(shell uname -r) > > +VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS)))) > > + > > +$(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) > > +ifeq ($(VMLINUX_H),) > > + $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ > > +else > > + $(Q)cp "$(VMLINUX_H)" $@ > > +endif > > + > > +$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) $(SKEL_OUT)/vmlinux.h | $(SKEL_TMP_OUT) > > $(QUIET_CLANG)$(CLANG) -g -O2 -target bpf -Wall -Werror $(BPF_INCLUDE) $(TOOLS_UAPI_INCLUDE) \ > > -c $(filter util/bpf_skel/%.bpf.c,$^) -o $@ > > > > diff --git a/tools/perf/util/bpf_skel/.gitignore b/tools/perf/util/bpf_skel/.gitignore > > index 7a1c832825de..cd01455e1b53 100644 > > --- a/tools/perf/util/bpf_skel/.gitignore > > +++ b/tools/perf/util/bpf_skel/.gitignore > > @@ -1,3 +1,4 @@ > > # SPDX-License-Identifier: GPL-2.0-only > > .tmp > > *.skel.h > > +vmlinux.h > > diff --git a/tools/perf/util/bpf_skel/vmlinux.h b/tools/perf/util/bpf_skel/vmlinux/vmlinux.h > > similarity index 100% > > rename from tools/perf/util/bpf_skel/vmlinux.h > > rename to tools/perf/util/bpf_skel/vmlinux/vmlinux.h > > -- > > 2.41.0.rc0.172.g3f132b7071-goog > >
Hi Ian,
kernel test robot noticed the following build warnings:
[auto build test WARNING on acme/perf/core]
[also build test WARNING on tip/master tip/auto-latest linus/master v6.4-rc5 next-20230606]
[cannot apply to tip/perf/core]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Ian-Rogers/perf-build-Add-ability-to-build-with-a-generated-vmlinux-h/20230606-043106
base: https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/core
patch link: https://lore.kernel.org/r/20230605202712.1690876-2-irogers%40google.com
patch subject: [PATCH v2 1/4] perf build: Add ability to build with a generated vmlinux.h
config: i386-randconfig-i052-20230605 (https://download.01.org/0day-ci/archive/20230606/202306062005.DdBIyoSS-lkp@intel.com/config)
compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)
reproduce (this is a W=1 build):
mkdir -p ~/bin
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
git remote add acme https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
git fetch acme perf/core
git checkout acme/perf/core
b4 shazam https://lore.kernel.org/r/20230605202712.1690876-2-irogers@google.com
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=i386 olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang ~/bin/make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202306062005.DdBIyoSS-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> tools/perf/util/bpf_skel/vmlinux/vmlinux.h: warning: ignored by one of the .gitignore files
tools/testing/selftests/arm64/tags/.gitignore: warning: ignored by one of the .gitignore files
tools/testing/selftests/arm64/tags/Makefile: warning: ignored by one of the .gitignore files
tools/testing/selftests/arm64/tags/run_tags_test.sh: warning: ignored by one of the .gitignore files
tools/testing/selftests/arm64/tags/tags_test.c: warning: ignored by one of the .gitignore files
tools/testing/selftests/kvm/.gitignore: warning: ignored by one of the .gitignore files
tools/testing/selftests/kvm/Makefile: warning: ignored by one of the .gitignore files
tools/testing/selftests/kvm/config: warning: ignored by one of the .gitignore files
tools/testing/selftests/kvm/settings: warning: ignored by one of the .gitignore files
Em Mon, Jun 05, 2023 at 09:25:54PM -0700, Ian Rogers escreveu: > On Mon, Jun 5, 2023 at 7:57 PM Jiri Olsa <olsajiri@gmail.com> wrote: > > > > On Mon, Jun 05, 2023 at 01:27:09PM -0700, Ian Rogers wrote: > > > Commit a887466562b4 ("perf bpf skels: Stop using vmlinux.h generated > > > from BTF, use subset of used structs + CO-RE") made it so that > > > vmlinux.h was uncondtionally included from > > > tools/perf/util/vmlinux.h. This change reverts part of that change (so > > > that vmlinux.h is once again generated) and makes it so that the > > > vmlinux.h used at build time is selected from the VMLINUX_H > > > variable. By default the VMLINUX_H variable is set to the vmlinux.h > > > added in change a887466562b4, but if GEN_VMLINUX_H=1 is passed on the > > > build command line then the previous generation behavior kicks in. > > > > > > The build with GEN_VMLINUX_H=1 currently fails with: > > > ``` > > > util/bpf_skel/lock_contention.bpf.c:419:8: error: redefinition of 'rq' > > > struct rq {}; > > > ^ > > > /tmp/perf/util/bpf_skel/.tmp/../vmlinux.h:45630:8: note: previous definition is here > > > struct rq { > > > ^ > > > 1 error generated. > > > ``` > > > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > > Acked-by: Andrii Nakryiko <andrii@kernel.org> > > > --- > > > tools/perf/Makefile.config | 4 ++++ > > > tools/perf/Makefile.perf | 16 +++++++++++++++- > > > tools/perf/util/bpf_skel/.gitignore | 1 + > > > tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h | 0 > > > 4 files changed, 20 insertions(+), 1 deletion(-) > > > rename tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h (100%) > > > > looks good, but I don't understand why you moved the vmlinux.h > > > > jirka > > Dumb reason, as headers in the same directory take priority, I had to > move the vmlinux.h out of the directory with the C code for skeletons > so that it could be selected via a -I. Can this be in a separate patch, i.e. moving vmlinux to a separate directory? I was going to cherry pick the 'struct rq' fix but then it touches the vmlinux/vmlinux.h file that is in this first patch that has review comments. - Arnaldo > Thanks, > Ian > > > > > > > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config > > > index a794d9eca93d..08d4e7eaa721 100644 > > > --- a/tools/perf/Makefile.config > > > +++ b/tools/perf/Makefile.config > > > @@ -680,6 +680,10 @@ ifdef BUILD_BPF_SKEL > > > CFLAGS += -DHAVE_BPF_SKEL > > > endif > > > > > > +ifndef GEN_VMLINUX_H > > > + VMLINUX_H=$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h > > > +endif > > > + > > > dwarf-post-unwind := 1 > > > dwarf-post-unwind-text := BUG > > > > > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > > > index f48794816d82..f1840af195c0 100644 > > > --- a/tools/perf/Makefile.perf > > > +++ b/tools/perf/Makefile.perf > > > @@ -1080,7 +1080,21 @@ $(BPFTOOL): | $(SKEL_TMP_OUT) > > > $(Q)CFLAGS= $(MAKE) -C ../bpf/bpftool \ > > > OUTPUT=$(SKEL_TMP_OUT)/ bootstrap > > > > > > -$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) | $(SKEL_TMP_OUT) > > > +VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux) \ > > > + $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ > > > + ../../vmlinux \ > > > + /sys/kernel/btf/vmlinux \ > > > + /boot/vmlinux-$(shell uname -r) > > > +VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS)))) > > > + > > > +$(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) > > > +ifeq ($(VMLINUX_H),) > > > + $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ > > > +else > > > + $(Q)cp "$(VMLINUX_H)" $@ > > > +endif > > > + > > > +$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) $(SKEL_OUT)/vmlinux.h | $(SKEL_TMP_OUT) > > > $(QUIET_CLANG)$(CLANG) -g -O2 -target bpf -Wall -Werror $(BPF_INCLUDE) $(TOOLS_UAPI_INCLUDE) \ > > > -c $(filter util/bpf_skel/%.bpf.c,$^) -o $@ > > > > > > diff --git a/tools/perf/util/bpf_skel/.gitignore b/tools/perf/util/bpf_skel/.gitignore > > > index 7a1c832825de..cd01455e1b53 100644 > > > --- a/tools/perf/util/bpf_skel/.gitignore > > > +++ b/tools/perf/util/bpf_skel/.gitignore > > > @@ -1,3 +1,4 @@ > > > # SPDX-License-Identifier: GPL-2.0-only > > > .tmp > > > *.skel.h > > > +vmlinux.h > > > diff --git a/tools/perf/util/bpf_skel/vmlinux.h b/tools/perf/util/bpf_skel/vmlinux/vmlinux.h > > > similarity index 100% > > > rename from tools/perf/util/bpf_skel/vmlinux.h > > > rename to tools/perf/util/bpf_skel/vmlinux/vmlinux.h > > > -- > > > 2.41.0.rc0.172.g3f132b7071-goog > > >
On Tue, Jun 6, 2023 at 11:06 AM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > Em Mon, Jun 05, 2023 at 09:25:54PM -0700, Ian Rogers escreveu: > > On Mon, Jun 5, 2023 at 7:57 PM Jiri Olsa <olsajiri@gmail.com> wrote: > > > > > > On Mon, Jun 05, 2023 at 01:27:09PM -0700, Ian Rogers wrote: > > > > Commit a887466562b4 ("perf bpf skels: Stop using vmlinux.h generated > > > > from BTF, use subset of used structs + CO-RE") made it so that > > > > vmlinux.h was uncondtionally included from > > > > tools/perf/util/vmlinux.h. This change reverts part of that change (so > > > > that vmlinux.h is once again generated) and makes it so that the > > > > vmlinux.h used at build time is selected from the VMLINUX_H > > > > variable. By default the VMLINUX_H variable is set to the vmlinux.h > > > > added in change a887466562b4, but if GEN_VMLINUX_H=1 is passed on the > > > > build command line then the previous generation behavior kicks in. > > > > > > > > The build with GEN_VMLINUX_H=1 currently fails with: > > > > ``` > > > > util/bpf_skel/lock_contention.bpf.c:419:8: error: redefinition of 'rq' > > > > struct rq {}; > > > > ^ > > > > /tmp/perf/util/bpf_skel/.tmp/../vmlinux.h:45630:8: note: previous definition is here > > > > struct rq { > > > > ^ > > > > 1 error generated. > > > > ``` > > > > > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > > > Acked-by: Andrii Nakryiko <andrii@kernel.org> > > > > --- > > > > tools/perf/Makefile.config | 4 ++++ > > > > tools/perf/Makefile.perf | 16 +++++++++++++++- > > > > tools/perf/util/bpf_skel/.gitignore | 1 + > > > > tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h | 0 > > > > 4 files changed, 20 insertions(+), 1 deletion(-) > > > > rename tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h (100%) > > > > > > looks good, but I don't understand why you moved the vmlinux.h > > > > > > jirka > > > > Dumb reason, as headers in the same directory take priority, I had to > > move the vmlinux.h out of the directory with the C code for skeletons > > so that it could be selected via a -I. > > Can this be in a separate patch, i.e. moving vmlinux to a separate > directory? I was going to cherry pick the 'struct rq' fix but then it > touches the vmlinux/vmlinux.h file that is in this first patch that has > review comments. I think the comments were more of a question of why the move? Hopefully I answered that, the move is necessary to defeat the include path order preferring files in the same directory. We need the move, we could vary the directory name. Thanks, Ian > - Arnaldo > > > Thanks, > > Ian > > > > > > > > > > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config > > > > index a794d9eca93d..08d4e7eaa721 100644 > > > > --- a/tools/perf/Makefile.config > > > > +++ b/tools/perf/Makefile.config > > > > @@ -680,6 +680,10 @@ ifdef BUILD_BPF_SKEL > > > > CFLAGS += -DHAVE_BPF_SKEL > > > > endif > > > > > > > > +ifndef GEN_VMLINUX_H > > > > + VMLINUX_H=$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h > > > > +endif > > > > + > > > > dwarf-post-unwind := 1 > > > > dwarf-post-unwind-text := BUG > > > > > > > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > > > > index f48794816d82..f1840af195c0 100644 > > > > --- a/tools/perf/Makefile.perf > > > > +++ b/tools/perf/Makefile.perf > > > > @@ -1080,7 +1080,21 @@ $(BPFTOOL): | $(SKEL_TMP_OUT) > > > > $(Q)CFLAGS= $(MAKE) -C ../bpf/bpftool \ > > > > OUTPUT=$(SKEL_TMP_OUT)/ bootstrap > > > > > > > > -$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) | $(SKEL_TMP_OUT) > > > > +VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux) \ > > > > + $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ > > > > + ../../vmlinux \ > > > > + /sys/kernel/btf/vmlinux \ > > > > + /boot/vmlinux-$(shell uname -r) > > > > +VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS)))) > > > > + > > > > +$(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) > > > > +ifeq ($(VMLINUX_H),) > > > > + $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ > > > > +else > > > > + $(Q)cp "$(VMLINUX_H)" $@ > > > > +endif > > > > + > > > > +$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) $(SKEL_OUT)/vmlinux.h | $(SKEL_TMP_OUT) > > > > $(QUIET_CLANG)$(CLANG) -g -O2 -target bpf -Wall -Werror $(BPF_INCLUDE) $(TOOLS_UAPI_INCLUDE) \ > > > > -c $(filter util/bpf_skel/%.bpf.c,$^) -o $@ > > > > > > > > diff --git a/tools/perf/util/bpf_skel/.gitignore b/tools/perf/util/bpf_skel/.gitignore > > > > index 7a1c832825de..cd01455e1b53 100644 > > > > --- a/tools/perf/util/bpf_skel/.gitignore > > > > +++ b/tools/perf/util/bpf_skel/.gitignore > > > > @@ -1,3 +1,4 @@ > > > > # SPDX-License-Identifier: GPL-2.0-only > > > > .tmp > > > > *.skel.h > > > > +vmlinux.h > > > > diff --git a/tools/perf/util/bpf_skel/vmlinux.h b/tools/perf/util/bpf_skel/vmlinux/vmlinux.h > > > > similarity index 100% > > > > rename from tools/perf/util/bpf_skel/vmlinux.h > > > > rename to tools/perf/util/bpf_skel/vmlinux/vmlinux.h > > > > -- > > > > 2.41.0.rc0.172.g3f132b7071-goog > > > > > > -- > > - Arnaldo
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index a794d9eca93d..08d4e7eaa721 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -680,6 +680,10 @@ ifdef BUILD_BPF_SKEL CFLAGS += -DHAVE_BPF_SKEL endif +ifndef GEN_VMLINUX_H + VMLINUX_H=$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h +endif + dwarf-post-unwind := 1 dwarf-post-unwind-text := BUG diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index f48794816d82..f1840af195c0 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -1080,7 +1080,21 @@ $(BPFTOOL): | $(SKEL_TMP_OUT) $(Q)CFLAGS= $(MAKE) -C ../bpf/bpftool \ OUTPUT=$(SKEL_TMP_OUT)/ bootstrap -$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) | $(SKEL_TMP_OUT) +VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux) \ + $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \ + ../../vmlinux \ + /sys/kernel/btf/vmlinux \ + /boot/vmlinux-$(shell uname -r) +VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS)))) + +$(SKEL_OUT)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) +ifeq ($(VMLINUX_H),) + $(QUIET_GEN)$(BPFTOOL) btf dump file $< format c > $@ +else + $(Q)cp "$(VMLINUX_H)" $@ +endif + +$(SKEL_TMP_OUT)/%.bpf.o: util/bpf_skel/%.bpf.c $(LIBBPF) $(SKEL_OUT)/vmlinux.h | $(SKEL_TMP_OUT) $(QUIET_CLANG)$(CLANG) -g -O2 -target bpf -Wall -Werror $(BPF_INCLUDE) $(TOOLS_UAPI_INCLUDE) \ -c $(filter util/bpf_skel/%.bpf.c,$^) -o $@ diff --git a/tools/perf/util/bpf_skel/.gitignore b/tools/perf/util/bpf_skel/.gitignore index 7a1c832825de..cd01455e1b53 100644 --- a/tools/perf/util/bpf_skel/.gitignore +++ b/tools/perf/util/bpf_skel/.gitignore @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only .tmp *.skel.h +vmlinux.h diff --git a/tools/perf/util/bpf_skel/vmlinux.h b/tools/perf/util/bpf_skel/vmlinux/vmlinux.h similarity index 100% rename from tools/perf/util/bpf_skel/vmlinux.h rename to tools/perf/util/bpf_skel/vmlinux/vmlinux.h
Commit a887466562b4 ("perf bpf skels: Stop using vmlinux.h generated from BTF, use subset of used structs + CO-RE") made it so that vmlinux.h was uncondtionally included from tools/perf/util/vmlinux.h. This change reverts part of that change (so that vmlinux.h is once again generated) and makes it so that the vmlinux.h used at build time is selected from the VMLINUX_H variable. By default the VMLINUX_H variable is set to the vmlinux.h added in change a887466562b4, but if GEN_VMLINUX_H=1 is passed on the build command line then the previous generation behavior kicks in. The build with GEN_VMLINUX_H=1 currently fails with: ``` util/bpf_skel/lock_contention.bpf.c:419:8: error: redefinition of 'rq' struct rq {}; ^ /tmp/perf/util/bpf_skel/.tmp/../vmlinux.h:45630:8: note: previous definition is here struct rq { ^ 1 error generated. ``` Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Andrii Nakryiko <andrii@kernel.org> --- tools/perf/Makefile.config | 4 ++++ tools/perf/Makefile.perf | 16 +++++++++++++++- tools/perf/util/bpf_skel/.gitignore | 1 + tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h | 0 4 files changed, 20 insertions(+), 1 deletion(-) rename tools/perf/util/bpf_skel/{ => vmlinux}/vmlinux.h (100%)