Skip to contentSkip to conversation

tools/runqslower: Fix LDFLAGS and add LDLIBS support

PATCH Applied Tony Ambardar 4 participants 8 messages Jul 23, 2024 BPF

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tools/runqslower: Fix LDFLAGS and add LDLIBS support

Actually use previously defined LDFLAGS during build and add support for LDLIBS to link extra standalone libraries e.g. 'argp' which is not provided by musl libc.

Fixes 585bf4640ebe ("tools: runqslower: Add EXTRA_CFLAGS and EXTRA_LDFLAGS support")

---
v1-v2:
- add missing CC for Ilya

---
 tools/bpf/runqslower/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/bpf/runqslower/Makefile +2 -1
index d8288936c912..c4f1f1735af6 100644
@@ -15,6 +15,7 @@ INCLUDES := -I$(OUTPUT) -I$(BPF_INCLUDE) -I$(abspath ../../include/uapi)
 CFLAGS := -g -Wall $(CLANG_CROSS_FLAGS)
 CFLAGS += $(EXTRA_CFLAGS)
 LDFLAGS += $(EXTRA_LDFLAGS)
+LDLIBS += -lelf -lz
 
 # Try to detect best kernel BTF source
 KERNEL_REL := $(shell uname -r)
@@ -51,7 +52,7 @@ clean:
 libbpf_hdrs: $(BPFOBJ)
 
 $(OUTPUT)/runqslower: $(OUTPUT)/runqslower.o $(BPFOBJ)
-	$(QUIET_LINK)$(CC) $(CFLAGS) $^ -lelf -lz -o $@
+	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 $(OUTPUT)/runqslower.o: runqslower.h $(OUTPUT)/runqslower.skel.h	      \
 			$(OUTPUT)/runqslower.bpf.o | libbpf_hdrs
Signature · 1 line
2.34.1
#1 lore raw
CI has tested the following submission:

Dear patch submitter,

CI has tested the following submission:

Status:     SUCCESS
Name:       [bpf-next,v2] tools/runqslower: Fix LDFLAGS and add LDLIBS support
Patchwork:  https://patchwork.kernel.org/project/netdevbpf/list/?series=873093&state=*
Matrix:     https://github.com/kernel-patches/bpf/actions/runs/10047138493

No further action is necessary on your part.

Please note: this email is coming from an unmonitored mailbox. If you have questions or feedback, please reach out to the Meta Kernel CI team at [email protected].

#2 lore raw
In reply to Tony Ambardar
CI has tested the following submission:

Dear patch submitter,

CI has tested the following submission:

Status:     FAILURE
Name:       [bpf-next,v2] tools/runqslower: Fix LDFLAGS and add LDLIBS support
Patchwork:  https://patchwork.kernel.org/project/netdevbpf/list/?series=873093&state=*
Matrix:     https://github.com/kernel-patches/bpf/actions/runs/10050688717

Failed jobs:
test_progs_no_alu32-aarch64-gcc: https://github.com/kernel-patches/bpf/actions/runs/10050688717/job/27779227454
test_progs_no_alu32-s390x-gcc: https://github.com/kernel-patches/bpf/actions/runs/10050688717/job/27779289243
test_progs_no_alu32-x86_64-gcc: https://github.com/kernel-patches/bpf/actions/runs/10050688717/job/27779279451
test_progs_no_alu32-x86_64-llvm-17: https://github.com/kernel-patches/bpf/actions/runs/10050688717/job/27779281639
test_progs_no_alu32-x86_64-llvm-18: https://github.com/kernel-patches/bpf/actions/runs/10050688717/job/27779287211

First test_progs failure (test_progs_no_alu32-aarch64-gcc):
#134 libbpf_get_fd_by_id_opts
libbpf: prog 'check_access': BPF program load failed: Invalid argument
libbpf: prog 'check_access': -- BEGIN PROG LOAD LOG --
0: R1=ctx() R10=fp0
; int BPF_PROG(check_access, struct bpf_map *map, fmode_t fmode) @ test_libbpf_get_fd_by_id_opts.c:27
0: (b7) r0 = 0 ; R0_w=0
1: (79) r2 = *(u64 *)(r1 +0)
func 'bpf_lsm_bpf_map' arg0 has btf_id 2072 type STRUCT 'bpf_map'
2: R1=ctx() R2_w=trusted_ptr_bpf_map()
; if (map != (struct bpf_map *)&data_input) @ test_libbpf_get_fd_by_id_opts.c:29
2: (18) r3 = 0xffff0000c4be4600 ; R3_w=map_ptr(map=data_input,ks=4,vs=4)
4: (5d) if r2 != r3 goto pc+4 ; R2_w=trusted_ptr_bpf_map() R3_w=map_ptr(map=data_input,ks=4,vs=4)
; int BPF_PROG(check_access, struct bpf_map *map, fmode_t fmode) @ test_libbpf_get_fd_by_id_opts.c:27
5: (79) r0 = *(u64 *)(r1 +8) ; R0_w=scalar() R1=ctx()
; if (fmode & FMODE_WRITE) @ test_libbpf_get_fd_by_id_opts.c:32
6: (67) r0 <<= 62 ; R0_w=scalar(smax=0x4000000000000000,umax=0xc000000000000000,smin32=0,smax32=umax32=0,var_off=(0x0; 0xc000000000000000))
7: (c7) r0 s>>= 63 ; R0_w=scalar(smin=smin32=-1,smax=smax32=0)
; @ test_libbpf_get_fd_by_id_opts.c:0
8: (57) r0 &= -13 ; R0_w=scalar(smax=0x7ffffffffffffff3,umax=0xfffffffffffffff3,smax32=0x7ffffff3,umax32=0xfffffff3,var_off=(0x0; 0xfffffffffffffff3))
; int BPF_PROG(check_access, struct bpf_map *map, fmode_t fmode) @ test_libbpf_get_fd_by_id_opts.c:27 9: (95) exit
At program exit the register R0 has smax=9223372036854775795 should have been in [-4095, 0] processed 9 insns (limit 1000000) max_states_per_insn 0 total_states 0 peak_states 0 mark_read 0 -- END PROG LOAD LOG --
libbpf: prog 'check_access': failed to load: -22
libbpf: failed to load object 'test_libbpf_get_fd_by_id_opts'
libbpf: failed to load BPF skeleton 'test_libbpf_get_fd_by_id_opts': -22 test_libbpf_get_fd_by_id_opts:FAIL:test_libbpf_get_fd_by_id_opts__open_and_load unexpected error: -22

Please note: this email is coming from an unmonitored mailbox. If you have questions or feedback, please reach out to the Meta Kernel CI team at [email protected].

#3 lore raw
In reply to Tony Ambardar
CI has tested the following submission:

Dear patch submitter,

CI has tested the following submission:

Status:     SUCCESS
Name:       [bpf-next,v2] tools/runqslower: Fix LDFLAGS and add LDLIBS support
Patchwork:  https://patchwork.kernel.org/project/netdevbpf/list/?series=873093&state=*
Matrix:     https://github.com/kernel-patches/bpf/actions/runs/10051523767

No further action is necessary on your part.

Please note: this email is coming from an unmonitored mailbox. If you have questions or feedback, please reach out to the Meta Kernel CI team at [email protected].

Acked-by on v2 1/1
#4 lore raw
In reply to Tony Ambardar
Quoted 37 lines · Tony Ambardar

Actually use previously defined LDFLAGS during build and add support for
LDLIBS to link extra standalone libraries e.g. 'argp' which is not provided
by musl libc.

Fixes 585bf4640ebe ("tools: runqslower: Add EXTRA_CFLAGS and

EXTRA_LDFLAGS support")

---
v1-v2:
 - add missing CC for Ilya

---
 tools/bpf/runqslower/Makefile | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)
tools/bpf/runqslower/Makefile +1 -0
index d8288936c912..c4f1f1735af6 100644
@@ -15,6 +15,7 @@ INCLUDES := -I$(OUTPUT) -I$(BPF_INCLUDE) -
 I$(abspath ../../include/uapi)
  CFLAGS := -g -Wall $(CLANG_CROSS_FLAGS)
  CFLAGS += $(EXTRA_CFLAGS)
  LDFLAGS += $(EXTRA_LDFLAGS)
+LDLIBS += -lelf -lz


 # Try to detect best kernel BTF source
 KERNEL_REL := $(shell uname -r)

tools/bpf/runqslower/Makefile +0 -0
@@ -51,7 +52,7 @@ clean:
  libbpf_hdrs: $(BPFOBJ)


 $(OUTPUT)/runqslower: $(OUTPUT)/runqslower.o $(BPFOBJ)

tools/bpf/runqslower/Makefile +1 -1
-	$(QUIET_LINK)$(CC) $(CFLAGS) $^ -lelf -lz -o $@
+	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
Quoted 4 lines


 $(OUTPUT)/runqslower.o: runqslower.h
$(OUTPUT)/runqslower.skel.h       \
  $(OUTPUT)/runqslower.bpf.o | libbpf_hdrs

Looks reasonable to me, but I don't quite get what exactly did 585bf4640ebe break? In any case:

#5 lore raw
Quoted 46 lines · Ilya Leoshkevich
Quoted 37 lines · Tony Ambardar

Actually use previously defined LDFLAGS during build and add support for
LDLIBS to link extra standalone libraries e.g. 'argp' which is not provided
by musl libc.

Fixes 585bf4640ebe ("tools: runqslower: Add EXTRA_CFLAGS and

EXTRA_LDFLAGS support")

---
v1-v2:
 - add missing CC for Ilya

---
 tools/bpf/runqslower/Makefile | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)
tools/bpf/runqslower/Makefile +1 -0
index d8288936c912..c4f1f1735af6 100644
@@ -15,6 +15,7 @@ INCLUDES := -I$(OUTPUT) -I$(BPF_INCLUDE) -
 I$(abspath ../../include/uapi)
  CFLAGS := -g -Wall $(CLANG_CROSS_FLAGS)
  CFLAGS += $(EXTRA_CFLAGS)
  LDFLAGS += $(EXTRA_LDFLAGS)
+LDLIBS += -lelf -lz


 # Try to detect best kernel BTF source
 KERNEL_REL := $(shell uname -r)

tools/bpf/runqslower/Makefile +0 -0
@@ -51,7 +52,7 @@ clean:
  libbpf_hdrs: $(BPFOBJ)


 $(OUTPUT)/runqslower: $(OUTPUT)/runqslower.o $(BPFOBJ)

tools/bpf/runqslower/Makefile +1 -1
-	$(QUIET_LINK)$(CC) $(CFLAGS) $^ -lelf -lz -o $@
+	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
Quoted 4 lines


 $(OUTPUT)/runqslower.o: runqslower.h
$(OUTPUT)/runqslower.skel.h       \
  $(OUTPUT)/runqslower.bpf.o | libbpf_hdrs

Looks reasonable to me, but I don't quite get what exactly did 585bf4640ebe break? In any case:

Quoted 1 line

I believe 585bf4640ebe added the LDFLAGS definition above but then didn't include it in the runqslower target's compile command. I only happened to notice while adding LDLIBS.

Thanks for looking at this.

#6 lore raw
Quoted 52 lines · Tony Ambardar
Quoted 49 lines · Ilya Leoshkevich
Quoted 39 lines · Tony Ambardar

Actually use previously defined LDFLAGS during build and add support
for
LDLIBS to link extra standalone libraries e.g. 'argp' which is not
provided
by musl libc.

Fixes 585bf4640ebe ("tools: runqslower: Add EXTRA_CFLAGS and

EXTRA_LDFLAGS support")

---
v1-v2:
 - add missing CC for Ilya

---
 tools/bpf/runqslower/Makefile | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)
tools/bpf/runqslower/Makefile +1 -0
index d8288936c912..c4f1f1735af6 100644
@@ -15,6 +15,7 @@ INCLUDES := -I$(OUTPUT) -I$(BPF_INCLUDE) -
 I$(abspath ../../include/uapi)
  CFLAGS := -g -Wall $(CLANG_CROSS_FLAGS)
  CFLAGS += $(EXTRA_CFLAGS)
  LDFLAGS += $(EXTRA_LDFLAGS)
+LDLIBS += -lelf -lz


 # Try to detect best kernel BTF source
 KERNEL_REL := $(shell uname -r)

tools/bpf/runqslower/Makefile +0 -0
@@ -51,7 +52,7 @@ clean:
  libbpf_hdrs: $(BPFOBJ)


 $(OUTPUT)/runqslower: $(OUTPUT)/runqslower.o $(BPFOBJ)

tools/bpf/runqslower/Makefile +1 -1
-	$(QUIET_LINK)$(CC) $(CFLAGS) $^ -lelf -lz -o $@
+	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o
Quoted 5 lines

$@

 $(OUTPUT)/runqslower.o: runqslower.h
$(OUTPUT)/runqslower.skel.h       \
  $(OUTPUT)/runqslower.bpf.o | libbpf_hdrs

Looks reasonable to me, but I don't quite get what exactly did 585bf4640ebe break? In any case:

Quoted 1 line
Quoted 7 lines

I believe 585bf4640ebe added the LDFLAGS definition above but then didn't
include it in the runqslower target's compile command. I only happened to
notice while adding LDLIBS.

Thanks for looking at this.

Ah, I see. Perhaps what I was passing in CFLAGS was already enough for my use case, so I didn't notice back then. Thanks for the explanation.

#7 lore raw
In reply to Tony Ambardar
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Quoted 8 lines · On Mon, 22 Jul 2024 17:30:45 -0700 you wrote:

Actually use previously defined LDFLAGS during build and add support for LDLIBS to link extra standalone libraries e.g. 'argp' which is not provided by musl libc.

Fixes 585bf4640ebe ("tools: runqslower: Add EXTRA_CFLAGS and EXTRA_LDFLAGS support")

[...]

Here is the summary with links:
- [bpf-next,v2] tools/runqslower: Fix LDFLAGS and add LDLIBS support

    https://git.kernel.org/bpf/bpf-next/c/3929c8dca3b1

You are awesome, thank you!

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