lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 361/530] selftests/bpf: Re-generate vmlinux.h and BPF skeletons if bpftool changed
    Date
    From: Andrii Nakryiko <andrii@kernel.org>

    [ Upstream commit cab62c37be057379a2a17b1b2eacd9dcba1e14dc ]

    Trigger vmlinux.h and BPF skeletons re-generation if detected that bpftool was
    re-compiled. Otherwise full `make clean` is required to get updated skeletons,
    if bpftool is modified.

    Fixes: acbd06206bbb ("selftests/bpf: Add vmlinux.h selftest exercising tracing of syscalls")
    Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Link: https://lore.kernel.org/bpf/20210318194036.3521577-11-andrii@kernel.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/bpf/Makefile | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
    index 9359377aeb35..b5322d60068c 100644
    --- a/tools/testing/selftests/bpf/Makefile
    +++ b/tools/testing/selftests/bpf/Makefile
    @@ -196,7 +196,7 @@ $(BUILD_DIR)/libbpf $(BUILD_DIR)/bpftool $(BUILD_DIR)/resolve_btfids $(INCLUDE_D
    $(call msg,MKDIR,,$@)
    $(Q)mkdir -p $@

    -$(INCLUDE_DIR)/vmlinux.h: $(VMLINUX_BTF) | $(BPFTOOL) $(INCLUDE_DIR)
    +$(INCLUDE_DIR)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL) | $(INCLUDE_DIR)
    ifeq ($(VMLINUX_H),)
    $(call msg,GEN,,$@)
    $(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF) format c > $@
    @@ -333,7 +333,8 @@ $(TRUNNER_BPF_OBJS): $(TRUNNER_OUTPUT)/%.o: \

    $(TRUNNER_BPF_SKELS): $(TRUNNER_OUTPUT)/%.skel.h: \
    $(TRUNNER_OUTPUT)/%.o \
    - | $(BPFTOOL) $(TRUNNER_OUTPUT)
    + $(BPFTOOL) \
    + | $(TRUNNER_OUTPUT)
    $$(call msg,GEN-SKEL,$(TRUNNER_BINARY),$$@)
    $(Q)$$(BPFTOOL) gen skeleton $$< > $$@
    endif
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-12 19:01    [W:8.663 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site