| Message ID | 20210303004010.653954-1-andrii@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 303dcc25b5c782547eb13b9f29426de843dd6f34 |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] tools/runqslower: allow substituting custom vmlinux.h for the build | expand |
| Context | Check | Description |
|---|---|---|
| netdev/apply | fail | Patch does not apply to bpf-next |
| netdev/tree_selection | success | Clearly marked for bpf-next |
On Tue, Mar 02, 2021 at 04:40:10PM -0800, Andrii Nakryiko wrote: > Just like was done for bpftool and selftests in ec23eb705620 ("tools/bpftool: > Allow substituting custom vmlinux.h for the build") and ca4db6389d61 > ("selftests/bpf: Allow substituting custom vmlinux.h for selftests build"), > allow to provide pre-generated vmlinux.h for runqslower build. Acked-by: Martin KaFai Lau <kafai@fb.com>
On 3/2/21 4:40 PM, Andrii Nakryiko wrote: > Just like was done for bpftool and selftests in ec23eb705620 ("tools/bpftool: > Allow substituting custom vmlinux.h for the build") and ca4db6389d61 > ("selftests/bpf: Allow substituting custom vmlinux.h for selftests build"), > allow to provide pre-generated vmlinux.h for runqslower build. > > Cc: Martin Lau <kafai@fb.com> > Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Acked-by: Yonghong Song <yhs@fb.com>
Hello: This patch was applied to bpf/bpf-next.git (refs/heads/master): On Tue, 2 Mar 2021 16:40:10 -0800 you wrote: > Just like was done for bpftool and selftests in ec23eb705620 ("tools/bpftool: > Allow substituting custom vmlinux.h for the build") and ca4db6389d61 > ("selftests/bpf: Allow substituting custom vmlinux.h for selftests build"), > allow to provide pre-generated vmlinux.h for runqslower build. > > Cc: Martin Lau <kafai@fb.com> > Signed-off-by: Andrii Nakryiko <andrii@kernel.org> > > [...] Here is the summary with links: - [bpf-next] tools/runqslower: allow substituting custom vmlinux.h for the build https://git.kernel.org/bpf/bpf-next/c/303dcc25b5c7 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile index c96ba90c6f01..3818ec511fd2 100644 --- a/tools/bpf/runqslower/Makefile +++ b/tools/bpf/runqslower/Makefile @@ -69,12 +69,16 @@ $(OUTPUT) $(BPFOBJ_OUTPUT) $(BPFTOOL_OUTPUT): $(QUIET_MKDIR)mkdir -p $@ $(OUTPUT)/vmlinux.h: $(VMLINUX_BTF_PATH) | $(OUTPUT) $(BPFTOOL) +ifeq ($(VMLINUX_H),) $(Q)if [ ! -e "$(VMLINUX_BTF_PATH)" ] ; then \ echo "Couldn't find kernel BTF; set VMLINUX_BTF to" \ "specify its location." >&2; \ exit 1;\ fi $(QUIET_GEN)$(BPFTOOL) btf dump file $(VMLINUX_BTF_PATH) format c > $@ +else + $(Q)cp "$(VMLINUX_H)" $@ +endif $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(BPFOBJ_OUTPUT) $(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) OUTPUT=$(BPFOBJ_OUTPUT) $@
Just like was done for bpftool and selftests in ec23eb705620 ("tools/bpftool: Allow substituting custom vmlinux.h for the build") and ca4db6389d61 ("selftests/bpf: Allow substituting custom vmlinux.h for selftests build"), allow to provide pre-generated vmlinux.h for runqslower build. Cc: Martin Lau <kafai@fb.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> --- tools/bpf/runqslower/Makefile | 4 ++++ 1 file changed, 4 insertions(+)