Skip to content

Commit 0a0a7e0

Browse files
yonghong-songborkmann
authored andcommitted
tools/bpf: fix test_sock and test_sock_addr.sh failure
The bpf selftests test_sock and test_sock_addr.sh failed in my test machine. The failure looks like: $ ./test_sock Test case: bind4 load with invalid access: src_ip6 .. [PASS] Test case: bind4 load with invalid access: mark .. [PASS] Test case: bind6 load with invalid access: src_ip4 .. [PASS] Test case: sock_create load with invalid access: src_port .. [PASS] Test case: sock_create load w/o expected_attach_type (compat mode) .. [FAIL] Test case: sock_create load w/ expected_attach_type .. [FAIL] Test case: attach type mismatch bind4 vs bind6 .. [FAIL] ... Summary: 4 PASSED, 12 FAILED $ ./test_sock_addr.sh Wait for testing IPv4/IPv6 to become available ..... ERROR: Timeout waiting for test IP to become available. In test_sock, bpf program loads failed due to hitting memlock limits. In test_sock_addr.sh, my test machine is a ipv6 only test box and using "ping" without specifying address family for an ipv6 address does not work. This patch fixed the issue by including header bpf_rlimit.h in test_sock.c and test_sock_addr.c, and specifying address family for ping command. Cc: Andrey Ignatov <[email protected]> Signed-off-by: Yonghong Song <[email protected]> Acked-by: Andrey Ignatov <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]>
1 parent 3a38bb9 commit 0a0a7e0

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

tools/testing/selftests/bpf/test_sock.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <bpf/bpf.h>
1414

1515
#include "cgroup_helpers.h"
16+
#include "bpf_rlimit.h"
1617

1718
#ifndef ARRAY_SIZE
1819
# define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

tools/testing/selftests/bpf/test_sock_addr.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <bpf/libbpf.h>
1616

1717
#include "cgroup_helpers.h"
18+
#include "bpf_rlimit.h"
1819

1920
#define CG_PATH "/foo"
2021
#define CONNECT4_PROG_PATH "./connect4_prog.o"

tools/testing/selftests/bpf/test_sock_addr.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eu
44

55
ping_once()
66
{
7-
ping -q -c 1 -W 1 ${1%%/*} >/dev/null 2>&1
7+
ping -${1} -q -c 1 -W 1 ${2%%/*} >/dev/null 2>&1
88
}
99

1010
wait_for_ip()
@@ -13,7 +13,7 @@ wait_for_ip()
1313
echo -n "Wait for testing IPv4/IPv6 to become available "
1414
for _i in $(seq ${MAX_PING_TRIES}); do
1515
echo -n "."
16-
if ping_once ${TEST_IPv4} && ping_once ${TEST_IPv6}; then
16+
if ping_once 4 ${TEST_IPv4} && ping_once 6 ${TEST_IPv6}; then
1717
echo " OK"
1818
return
1919
fi

0 commit comments

Comments
 (0)