bpf: Check CONFIG_BPF option for resolve_btfids
Subsystems (4)
Jiri Olsa
reviewerPATCH v3 1/2 bpf: Check CONFIG_BPF option for resolve_btfids
Currently all the resolve_btfids 'users' are under CONFIG_BPF code, so if we have CONFIG_BPF disabled, resolve_btfids will fail, because there's no data to resolve.
Disabling resolve_btfids if there's CONFIG_BPF disabled, so we won't fail such builds.
---
v3 changes:
- updated subject, added ack
Makefile | 4 +++- scripts/link-vmlinux.sh | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-)
Makefile +3 -1
@@ -1084,13 +1084,15 @@ ifdef CONFIG_STACK_VALIDATION endif endif +ifdef CONFIG_BPF ifdef CONFIG_DEBUG_INFO_BTF ifeq ($(has_libelf),1) resolve_btfids_target := tools/bpf/resolve_btfids FORCE else ERROR_RESOLVE_BTFIDS := 1 endif -endif +endif # CONFIG_DEBUG_INFO_BTF +endif # CONFIG_BPF PHONY += prepare0
scripts/link-vmlinux.sh +3 -3
@@ -341,9 +341,9 @@ fi vmlinux_link vmlinux "${kallsymso}" ${btf_vmlinux_bin_o} # fill in BTF IDs -if [ -n "${CONFIG_DEBUG_INFO_BTF}" ]; then -info BTFIDS vmlinux -${RESOLVE_BTFIDS} vmlinux +if [ -n "${CONFIG_DEBUG_INFO_BTF}" -a -n "${CONFIG_BPF}" ]; then + info BTFIDS vmlinux + ${RESOLVE_BTFIDS} vmlinux fi if [ -n "${CONFIG_BUILDTIME_TABLE_SORT}" ]; then
Signature · 1 line
2.26.2
Jiri Olsa
reviewerPATCH v3 2/2 tools resolve_btfids: Always force HOSTARCH
Seth reported problem with cross builds, that fail on resolve_btfids build, because we are trying to build it on cross build arch.
Fixing this by always forcing the host arch.
--- tools/bpf/resolve_btfids/Makefile | 2 ++ 1 file changed, 2 insertions(+)
tools/bpf/resolve_btfids/Makefile +2 -0
@@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only include ../../scripts/Makefile.include +include ../../scripts/Makefile.arch ifeq ($(srctree),) srctree := $(patsubst %/,%,$(dir $(CURDIR)))
@@ -29,6 +30,7 @@ endif AR = $(HOSTAR) CC = $(HOSTCC) LD = $(HOSTLD) +ARCH = $(HOSTARCH) OUTPUT ?= $(srctree)/tools/bpf/resolve_btfids/
Signature · 1 line
2.26.2
Alexei Starovoitov
AppliedQuoted 7 lines · Jiri Olsa
Currently all the
resolve_btfids'users' are underCONFIG_BPFcode, so if we haveCONFIG_BPFdisabled,resolve_btfidswill fail, because there's no data to resolve.Disabling
resolve_btfidsif there'sCONFIG_BPFdisabled, so we won't fail such builds.
Quoted 6 lines
Suggested-by Andrii Nakryiko <[email protected]>Acked-by Andrii Nakryiko <[email protected]>Signed-off-by Jiri Olsa <[email protected]>---
v3 changes:
- updated subject, added ack
Applied. Thanks