Skip to contentSkip to conversation

selftests/bpf: move netcnt test under test_progs

PATCH Superseded Stanislav Fomichev 2 participants 2 messages Aug 2, 2021 – Aug 3, 2021

Subsystems (5)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 selftests/bpf: move netcnt test under test_progs

Rewrite to skel and ASSERT macros as well while we are at it.

v2:
- don't check result of bpf_map__fd (Yonghong Song)
- remove from .gitignore (Andrii Nakryiko)
- move ping_command into network_helpers (Andrii Nakryiko)
- remove assert() (Andrii Nakryiko)

---
 tools/testing/selftests/bpf/.gitignore        |   1 -
 tools/testing/selftests/bpf/Makefile          |   3 +-
 tools/testing/selftests/bpf/network_helpers.c |  12 ++
 tools/testing/selftests/bpf/network_helpers.h |   1 +
 .../testing/selftests/bpf/prog_tests/netcnt.c |  82 ++++++++++
 .../selftests/bpf/prog_tests/tc_redirect.c    |  12 --
 tools/testing/selftests/bpf/test_netcnt.c     | 148 ------------------
 7 files changed, 96 insertions(+), 163 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/netcnt.c
 delete mode 100644 tools/testing/selftests/bpf/test_netcnt.c
tools/testing/selftests/bpf/.gitignore +0 -1
index addcfd8b615e..433f8bef261e 100644
@@ -23,7 +23,6 @@ test_skb_cgroup_id_user
 test_cgroup_storage
 test_flow_dissector
 flow_dissector_load
-test_netcnt
 test_tcpnotify_user
 test_libbpf
 test_tcp_check_syncookie_user
tools/testing/selftests/bpf/Makefile +1 -2
index f405b20c1e6c..2a58b7b5aea4 100644
@@ -38,7 +38,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test
 	test_verifier_log test_dev_cgroup \
 	test_sock test_sockmap get_cgroup_id_user \
 	test_cgroup_storage \
-	test_netcnt test_tcpnotify_user test_sysctl \
+	test_tcpnotify_user test_sysctl \
 	test_progs-no_alu32
 
 # Also test bpf-gcc, if present
@@ -197,7 +197,6 @@ $(OUTPUT)/test_sockmap: cgroup_helpers.c
 $(OUTPUT)/test_tcpnotify_user: cgroup_helpers.c trace_helpers.c
 $(OUTPUT)/get_cgroup_id_user: cgroup_helpers.c
 $(OUTPUT)/test_cgroup_storage: cgroup_helpers.c
-$(OUTPUT)/test_netcnt: cgroup_helpers.c
 $(OUTPUT)/test_sock_fields: cgroup_helpers.c
 $(OUTPUT)/test_sysctl: cgroup_helpers.c
 
tools/testing/selftests/bpf/network_helpers.c +12 -0
index 26468a8f44f3..d6857683397f 100644
@@ -310,3 +310,15 @@ int make_sockaddr(int family, const char *addr_str, __u16 port,
 	}
 	return -1;
 }
+
+char *ping_command(int family)
+{
+	if (family == AF_INET6) {
+		/* On some systems 'ping' doesn't support IPv6, so use ping6 if it is present. */
+		if (!system("which ping6 >/dev/null 2>&1"))
+			return "ping6";
+		else
+			return "ping -6";
+	}
+	return "ping";
+}
tools/testing/selftests/bpf/network_helpers.h +1 -0
index d60bc2897770..c59a8f6d770b 100644
@@ -46,5 +46,6 @@ int fastopen_connect(int server_fd, const char *data, unsigned int data_len,
 		     int timeout_ms);
 int make_sockaddr(int family, const char *addr_str, __u16 port,
 		  struct sockaddr_storage *addr, socklen_t *len);
+char *ping_command(int family);
 
 #endif
tools/testing/selftests/bpf/prog_tests/netcnt.c new file +82 -0

82 lines not on this page · raw message

tools/testing/selftests/bpf/prog_tests/tc_redirect.c +0 -12
index 932e4ee3f97c..e7201ba29ccd 100644
@@ -390,18 +390,6 @@ static void test_tcp(int family, const char *addr, __u16 port)
 		close(client_fd);
 }
 
-static char *ping_command(int family)
-{
-	if (family == AF_INET6) {
-		/* On some systems 'ping' doesn't support IPv6, so use ping6 if it is present. */
-		if (!system("which ping6 >/dev/null 2>&1"))
-			return "ping6";
-		else
-			return "ping -6";
-	}
-	return "ping";
-}
-
 static int test_ping(int family, const char *addr)
 {
 	SYS("ip netns exec " NS_SRC " %s " PING_ARGS " %s > /dev/null", ping_command(family), addr);
tools/testing/selftests/bpf/test_netcnt.c deleted +0 -148

148 lines not on this page · raw message

Signature · 1 line
2.32.0.554.ge1b32706d8-goog
#1 lore raw
Quoted 9 lines · Stanislav Fomichev

Rewrite to skel and ASSERT macros as well while we are at it.

v2:
- don't check result of bpf_map__fd (Yonghong Song)
- remove from .gitignore (Andrii Nakryiko)
- move ping_command into network_helpers (Andrii Nakryiko)
- remove assert() (Andrii Nakryiko)

Quoted 3 lines

---

netcnt selftest is failing in our CI ([0]), PTAL. xdp_context_test_run failure is unrelated, ignore that one.

[0] https://github.com/kernel-patches/bpf/runs/3225481504?check_suite_focus=true

Quoted 11 lines
 tools/testing/selftests/bpf/.gitignore        |   1 -
 tools/testing/selftests/bpf/Makefile          |   3 +-
 tools/testing/selftests/bpf/network_helpers.c |  12 ++
 tools/testing/selftests/bpf/network_helpers.h |   1 +
 .../testing/selftests/bpf/prog_tests/netcnt.c |  82 ++++++++++
 .../selftests/bpf/prog_tests/tc_redirect.c    |  12 --
 tools/testing/selftests/bpf/test_netcnt.c     | 148 ------------------
 7 files changed, 96 insertions(+), 163 deletions(-)
 create mode 100644 tools/testing/selftests/bpf/prog_tests/netcnt.c
 delete mode 100644 tools/testing/selftests/bpf/test_netcnt.c

[...]