Skip to contentSkip to conversation

tools/runqslower: Fix cross-build

PATCH Applied Jean-Philippe Brucker 4 participants 7 messages Nov 12, 2021 – Nov 16, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/runqslower: Fix cross-build

Commit be79505caf3f ("tools/runqslower: Install libbpf headers when building") uses the target libbpf to build the host bpftool, which doesn't work when cross-building:

make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -C tools/bpf/runqslower O=/tmp/runqslower
...
LINK /tmp/runqslower/bpftool/bpftool
/usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a(libbpf-in.o): Relocations in generic ELF (EM: 183) /usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a: error adding symbols: file in wrong format
collect2: error: ld returned 1 exit status

When cross-building, the target architecture differs from the host. The bpftool used for building runqslower is executed on the host, and thus must use a different libbpf than that used for runqslower itself. Remove the LIBBPF_OUTPUT and LIBBPF_DESTDIR parameters, so the bpftool build makes its own library if necessary.

In the selftests, pass the host bpftool, already a prerequisite for the runqslower recipe, as BPFTOOL_OUTPUT. The runqslower Makefile will use the bpftool that's already built for selftests instead of making a new one.

Fixes be79505caf3f ("tools/runqslower: Install libbpf headers when building")
---
 tools/bpf/runqslower/Makefile        | 3 +--
 tools/testing/selftests/bpf/Makefile | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
tools/bpf/runqslower/Makefile +1 -2
index bbd1150578f7..8791d0e2762b 100644
@@ -88,5 +88,4 @@ $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(BPFOBJ_OU
 
 $(DEFAULT_BPFTOOL): $(BPFOBJ) | $(BPFTOOL_OUTPUT)
 	$(Q)$(MAKE) $(submake_extras) -C ../bpftool OUTPUT=$(BPFTOOL_OUTPUT)   \
-		    LIBBPF_OUTPUT=$(BPFOBJ_OUTPUT)			       \
-		    LIBBPF_DESTDIR=$(BPF_DESTDIR) CC=$(HOSTCC) LD=$(HOSTLD)
+		    CC=$(HOSTCC) LD=$(HOSTLD)
tools/testing/selftests/bpf/Makefile +1 -1
index 54b0a41a3775..62fafbeb4672 100644
@@ -187,7 +187,7 @@ DEFAULT_BPFTOOL := $(HOST_SCRATCH_DIR)/sbin/bpftool
 $(OUTPUT)/runqslower: $(BPFOBJ) | $(DEFAULT_BPFTOOL) $(RUNQSLOWER_OUTPUT)
 	$(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/runqslower	       \
 		    OUTPUT=$(RUNQSLOWER_OUTPUT) VMLINUX_BTF=$(VMLINUX_BTF)     \
-		    BPFTOOL_OUTPUT=$(BUILD_DIR)/bpftool/		       \
+		    BPFTOOL_OUTPUT=$(HOST_BUILD_DIR)/bpftool/		       \
 		    BPFOBJ_OUTPUT=$(BUILD_DIR)/libbpf			       \
 		    BPFOBJ=$(BPFOBJ) BPF_INCLUDE=$(INCLUDE_DIR) &&	       \
 		    cp $(RUNQSLOWER_OUTPUT)runqslower $@
Signature · 1 line
2.33.1
Reviewed-by on v1 1/1
#1 lore raw

2021-11-12 15:51 UTC+0000 ~ Jean-Philippe Brucker <[email protected]>

Quoted 17 lines

Commit be79505caf3f ("tools/runqslower: Install libbpf headers when building") uses the target libbpf to build the host bpftool, which doesn't work when cross-building:

make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -C tools/bpf/runqslower O=/tmp/runqslower
...
LINK /tmp/runqslower/bpftool/bpftool
/usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a(libbpf-in.o): Relocations in generic ELF (EM: 183) /usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a: error adding symbols: file in wrong format
collect2: error: ld returned 1 exit status

When cross-building, the target architecture differs from the host. The bpftool used for building runqslower is executed on the host, and thus must use a different libbpf than that used for runqslower itself. Remove the LIBBPF_OUTPUT and LIBBPF_DESTDIR parameters, so the bpftool build makes its own library if necessary.

Quoted 7 lines

In the selftests, pass the host bpftool, already a prerequisite for the runqslower recipe, as BPFTOOL_OUTPUT. The runqslower Makefile will use the bpftool that's already built for selftests instead of making a new one.

Fixes be79505caf3f ("tools/runqslower: Install libbpf headers when building")

I realised too late I should have cc-ed you on those patches, apologies for not doing so. Thank you for the fix!

Quentin

#2 lore raw
Quoted 23 lines · Quentin Monnet

2021-11-12 15:51 UTC+0000 ~ Jean-Philippe Brucker <[email protected]>

Quoted 22 lines

Commit be79505caf3f ("tools/runqslower: Install libbpf headers when building") uses the target libbpf to build the host bpftool, which doesn't work when cross-building:

make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -C tools/bpf/runqslower O=/tmp/runqslower
...
LINK /tmp/runqslower/bpftool/bpftool
/usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a(libbpf-in.o): Relocations in generic ELF (EM: 183) /usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a: error adding symbols: file in wrong format
collect2: error: ld returned 1 exit status

When cross-building, the target architecture differs from the host. The bpftool used for building runqslower is executed on the host, and thus must use a different libbpf than that used for runqslower itself. Remove the LIBBPF_OUTPUT and LIBBPF_DESTDIR parameters, so the bpftool build makes its own library if necessary.

In the selftests, pass the host bpftool, already a prerequisite for the runqslower recipe, as BPFTOOL_OUTPUT. The runqslower Makefile will use the bpftool that's already built for selftests instead of making a new one.

Quoted 6 lines
Quoted 2 lines
Fixes be79505caf3f ("tools/runqslower: Install libbpf headers when building")

I realised too late I should have cc-ed you on those patches, apologies for not doing so. Thank you for the fix!

No worries, I usually try to catch build issues in bpf-next but missed it this time. I'm still slowly working towards getting automated testing on Arm targets, which will catch regressions quicker.

Thanks,
Jean

#3 lore raw
Quoted 27 lines · Jean-Philippe Brucker
Quoted 25 lines · Quentin Monnet

2021-11-12 15:51 UTC+0000 ~ Jean-Philippe Brucker <[email protected]>

Quoted 24 lines

Commit be79505caf3f ("tools/runqslower: Install libbpf headers when building") uses the target libbpf to build the host bpftool, which doesn't work when cross-building:

make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -C tools/bpf/runqslower O=/tmp/runqslower
...
LINK /tmp/runqslower/bpftool/bpftool
/usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a(libbpf-in.o): Relocations in generic ELF (EM: 183) /usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a: error adding symbols: file in wrong format
collect2: error: ld returned 1 exit status

When cross-building, the target architecture differs from the host. The bpftool used for building runqslower is executed on the host, and thus must use a different libbpf than that used for runqslower itself. Remove the LIBBPF_OUTPUT and LIBBPF_DESTDIR parameters, so the bpftool build makes its own library if necessary.

In the selftests, pass the host bpftool, already a prerequisite for the runqslower recipe, as BPFTOOL_OUTPUT. The runqslower Makefile will use the bpftool that's already built for selftests instead of making a new one.

Fixes be79505caf3f ("tools/runqslower: Install libbpf headers when building")
Quoted 8 lines
Quoted 4 lines

I realised too late I should have cc-ed you on those patches, apologies for not doing so. Thank you for the fix!

No worries, I usually try to catch build issues in bpf-next but missed it this time. I'm still slowly working towards getting automated testing on Arm targets, which will catch regressions quicker.

Are you planning to contribute it to BPF CI? Or you meant you have your own separate system?

Quoted 3 lines

Thanks,
Jean

#4 lore raw
Quoted 34 lines · Andrii Nakryiko
Quoted 32 lines · Jean-Philippe Brucker
Quoted 29 lines · Quentin Monnet

2021-11-12 15:51 UTC+0000 ~ Jean-Philippe Brucker <[email protected]>

Quoted 17 lines

Commit be79505caf3f ("tools/runqslower: Install libbpf headers when building") uses the target libbpf to build the host bpftool, which doesn't work when cross-building:

make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -C tools/bpf/runqslower O=/tmp/runqslower
...
LINK /tmp/runqslower/bpftool/bpftool
/usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a(libbpf-in.o): Relocations in generic ELF (EM: 183) /usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a: error adding symbols: file in wrong format
collect2: error: ld returned 1 exit status

When cross-building, the target architecture differs from the host. The bpftool used for building runqslower is executed on the host, and thus must use a different libbpf than that used for runqslower itself. Remove the LIBBPF_OUTPUT and LIBBPF_DESTDIR parameters, so the bpftool build makes its own library if necessary.

Quoted 7 lines

In the selftests, pass the host bpftool, already a prerequisite for the runqslower recipe, as BPFTOOL_OUTPUT. The runqslower Makefile will use the bpftool that's already built for selftests instead of making a new one.

Fixes be79505caf3f ("tools/runqslower: Install libbpf headers when building")

I realised too late I should have cc-ed you on those patches, apologies for not doing so. Thank you for the fix!

Quoted 6 lines
Quoted 3 lines

No worries, I usually try to catch build issues in bpf-next but missed it this time. I'm still slowly working towards getting automated testing on Arm targets, which will catch regressions quicker.

Are you planning to contribute it to BPF CI? Or you meant you have your own separate system?

At the moment I'm looking at adding it to LKFT, which does regression testing on various Arm boards (https://lkft.linaro.org/about/). The only bit missing for that is support for cross-building tools with clang, which I'll send shortly.

Thanks,
Jean

#5 lore raw
Quoted 40 lines · Jean-Philippe Brucker
Quoted 38 lines · Andrii Nakryiko
Quoted 35 lines · Jean-Philippe Brucker
Quoted 23 lines · Quentin Monnet

2021-11-12 15:51 UTC+0000 ~ Jean-Philippe Brucker <[email protected]>

Quoted 22 lines

Commit be79505caf3f ("tools/runqslower: Install libbpf headers when building") uses the target libbpf to build the host bpftool, which doesn't work when cross-building:

make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -C tools/bpf/runqslower O=/tmp/runqslower
...
LINK /tmp/runqslower/bpftool/bpftool
/usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a(libbpf-in.o): Relocations in generic ELF (EM: 183) /usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a: error adding symbols: file in wrong format
collect2: error: ld returned 1 exit status

When cross-building, the target architecture differs from the host. The bpftool used for building runqslower is executed on the host, and thus must use a different libbpf than that used for runqslower itself. Remove the LIBBPF_OUTPUT and LIBBPF_DESTDIR parameters, so the bpftool build makes its own library if necessary.

In the selftests, pass the host bpftool, already a prerequisite for the runqslower recipe, as BPFTOOL_OUTPUT. The runqslower Makefile will use the bpftool that's already built for selftests instead of making a new one.

Quoted 6 lines
Quoted 2 lines
Fixes be79505caf3f ("tools/runqslower: Install libbpf headers when building")

I realised too late I should have cc-ed you on those patches, apologies for not doing so. Thank you for the fix!

No worries, I usually try to catch build issues in bpf-next but missed it this time. I'm still slowly working towards getting automated testing on Arm targets, which will catch regressions quicker.

Quoted 7 lines
Quoted 2 lines

Are you planning to contribute it to BPF CI? Or you meant you have your own separate system?

At the moment I'm looking at adding it to LKFT, which does regression testing on various Arm boards (https://lkft.linaro.org/about/). The only bit missing for that is support for cross-building tools with clang, which I'll send shortly.

Detecting regressions is good, but preventing regressions is even better. That's what we are doing with BPF CI. We create a Github PR and run BPF selftests before patches are applied (see [0] for the current list of patch sets being reviewed and thus tested). It would be good to have more support for various architectures there. We currently have x86-64 and s390x was added just recently. Regressions still happen, obviously (we don't also control all the other parts of the kernel so after tree merges things quite often are a bit unstable and broken, but the system has caught many issues already), but it's been a tremendous help and time saver. So consider contributing, if you care about those architectures.

[0] https://github.com/kernel-patches/bpf/pulls

Quoted 3 lines

Thanks,
Jean

#6 lore raw
In reply to Jean-Philippe Brucker
This patch was applied to bpf/bpf.git (master) by Daniel Borkmann <[email protected]>:

Hello:

This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <[email protected]>:

Quoted 4 lines · On Fri, 12 Nov 2021 15:51:30 +0000 you wrote:

Commit be79505caf3f ("tools/runqslower: Install libbpf headers when building") uses the target libbpf to build the host bpftool, which doesn't work when cross-building:

Quoted 8 lines

make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- -C tools/bpf/runqslower O=/tmp/runqslower
...
LINK /tmp/runqslower/bpftool/bpftool
/usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a(libbpf-in.o): Relocations in generic ELF (EM: 183) /usr/bin/ld: /tmp/runqslower/libbpf/libbpf.a: error adding symbols: file in wrong format
collect2: error: ld returned 1 exit status

[...]

Here is the summary with links:
- [bpf] tools/runqslower: Fix cross-build

    https://git.kernel.org/bpf/bpf/c/c9213bcf2fe1

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html