selftests/bpf: Fix sk_assign on s390x

Browse source

[ Upstream commit 7ce878ca81 ]

sk_assign is failing on an s390x machine running Debian "bookworm" for
2 reasons: legacy server_map definition and uninitialized addrlen in
recvfrom() call.

Fix by adding a new-style server_map definition and dropping addrlen
(recvfrom() allows NULL values for src_addr and addrlen).

Since the test should support tc built without libbpf, build the prog
twice: with the old-style definition and with the new-style definition,
then select the right one at runtime. This could be done at compile
time too, but this would not be cross-compilation friendly.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Link: https://lore.kernel.org/r/20230129190501.1624747-2-iii@linux.ibm.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Pu Lehui <pulehui@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Ilya Leoshkevich 2023-08-04 23:24:59 +08:00 • committed by Greg Kroah-Hartman

parent 1272772621

commit 697bc23463

3 changed files with 33 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

25

tools/testing/selftests/bpf/prog_tests/sk_assign.c

View file

11

tools/testing/selftests/bpf/progs/test_sk_assign.c

View file

3

tools/testing/selftests/bpf/progs/test_sk_assign_libbpf.c

View file