Re: [PATCH bpf-next 3/4] bpf: runqslower: prefer use local vmlinux

Yonghong Song <yhs@xxxxxx> · Mon, 11 Jan 2021 09:37:57 -0800

On 1/8/21 3:19 PM, Song Liu wrote:
Update the Makefile to prefer using ../../../vmlinux, which has latest
definitions for vmlinux.h

Signed-off-by: Song Liu <songliubraving@xxxxxx>
---
  tools/bpf/runqslower/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile
index 4d5ca54fcd4c8..306f1ce5a97b2 100644
--- a/tools/bpf/runqslower/Makefile
+++ b/tools/bpf/runqslower/Makefile
@@ -19,7 +19,8 @@ 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_PATHS := ../../../vmlinux /sys/kernel/btf/vmlinux \
+	/boot/vmlinux-$(KERNEL_REL)

selftests/bpf Makefile has:

VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux)                            \
                     $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux)    \
                     ../../../../vmlinux                                \
                     /sys/kernel/btf/vmlinux                            \
                     /boot/vmlinux-$(shell uname -r)

If you intend to add ../../../vmlinux, I think we should also
add $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux).

  VMLINUX_BTF_PATH := $(or $(VMLINUX_BTF),$(firstword			       \
  					  $(wildcard $(VMLINUX_BTF_PATHS))))
  








