The bpf selftest build will fail on the stable 5.15 tree with:
CC test_stub.o BINARY test_verifier In file included from /home/ubuntu/linux/tools/testing/selftests/bpf/verifier/tests.h:21, from test_verifier.c:432: /home/ubuntu/linux/tools/testing/selftests/bpf/verifier/calls.c:124:10: error: 'struct bpf_test' has no member named 'fixup_kfunc_btf_id' 124 | .fixup_kfunc_btf_id = { | ^~~~~~~~~~~~~~~~~~ /home/ubuntu/linux/tools/testing/selftests/bpf/verifier/calls.c:124:9: warning: braces around scalar initializer 124 | .fixup_kfunc_btf_id = { | ^
This is because of the fixup_kfunc_btf_id member in struct bpf_test added in commit 13c6a37d40 ("selftests/bpf: Add test for reg2btf_ids out of bounds access") from upstream.
We will need commit 0201b80772 ("selftests/bpf: Add test_verifier support to fixup kfunc call insns") from upstream to solve this build issue. Some backport work is needed for the 5.15 tree to skip fixup_map_timer related changes, which came from commit e60e6962c5 ("selftests/bpf: Add tests for restricted helpers").
Kumar Kartikeya Dwivedi (1): selftests/bpf: Add test_verifier support to fixup kfunc call insns
tools/testing/selftests/bpf/test_verifier.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)