OSDN Git Service

selftests/bpf: Move netcnt test under test_progs
authorStanislav Fomichev <sdf@google.com>
Wed, 4 Aug 2021 20:55:24 +0000 (13:55 -0700)
committerAndrii Nakryiko <andrii@kernel.org>
Wed, 4 Aug 2021 23:18:48 +0000 (16:18 -0700)
Rewrite to skel and ASSERT macros as well while we are at it.

v3:
- replace -f with -A to make it work with busybox ping.
  -A is available on both busybox and iputils, from the man page:
  On networks with low RTT this mode is essentially equivalent to
  flood mode.

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)

Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210804205524.3748709-1-sdf@google.com
tools/testing/selftests/bpf/.gitignore
tools/testing/selftests/bpf/Makefile
tools/testing/selftests/bpf/network_helpers.c
tools/testing/selftests/bpf/network_helpers.h
tools/testing/selftests/bpf/prog_tests/netcnt.c [new file with mode: 0644]
tools/testing/selftests/bpf/prog_tests/tc_redirect.c
tools/testing/selftests/bpf/test_netcnt.c [deleted file]

index addcfd8..433f8be 100644 (file)
@@ -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
index f405b20..2a58b7b 100644 (file)
@@ -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
 
index 26468a8..d685768 100644 (file)
@@ -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";
+}
index d60bc28..c59a8f6 100644 (file)
@@ -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
diff --git a/tools/testing/selftests/bpf/prog_tests/netcnt.c b/tools/testing/selftests/bpf/prog_tests/netcnt.c
new file mode 100644 (file)
index 0000000..6ede48b
--- /dev/null
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <sys/sysinfo.h>
+#include <test_progs.h>
+#include "network_helpers.h"
+#include "netcnt_prog.skel.h"
+#include "netcnt_common.h"
+
+#define CG_NAME "/netcnt"
+
+void test_netcnt(void)
+{
+       union percpu_net_cnt *percpu_netcnt = NULL;
+       struct bpf_cgroup_storage_key key;
+       int map_fd, percpu_map_fd;
+       struct netcnt_prog *skel;
+       unsigned long packets;
+       union net_cnt netcnt;
+       unsigned long bytes;
+       int cpu, nproc;
+       int cg_fd = -1;
+       char cmd[128];
+
+       skel = netcnt_prog__open_and_load();
+       if (!ASSERT_OK_PTR(skel, "netcnt_prog__open_and_load"))
+               return;
+
+       nproc = get_nprocs_conf();
+       percpu_netcnt = malloc(sizeof(*percpu_netcnt) * nproc);
+       if (!ASSERT_OK_PTR(percpu_netcnt, "malloc(percpu_netcnt)"))
+               goto err;
+
+       cg_fd = test__join_cgroup(CG_NAME);
+       if (!ASSERT_GE(cg_fd, 0, "test__join_cgroup"))
+               goto err;
+
+       skel->links.bpf_nextcnt = bpf_program__attach_cgroup(skel->progs.bpf_nextcnt, cg_fd);
+       if (!ASSERT_OK_PTR(skel->links.bpf_nextcnt,
+                          "attach_cgroup(bpf_nextcnt)"))
+               goto err;
+
+       snprintf(cmd, sizeof(cmd), "%s ::1 -A -c 10000 -q > /dev/null", ping_command(AF_INET6));
+       ASSERT_OK(system(cmd), cmd);
+
+       map_fd = bpf_map__fd(skel->maps.netcnt);
+       if (!ASSERT_OK(bpf_map_get_next_key(map_fd, NULL, &key), "bpf_map_get_next_key"))
+               goto err;
+
+       if (!ASSERT_OK(bpf_map_lookup_elem(map_fd, &key, &netcnt), "bpf_map_lookup_elem(netcnt)"))
+               goto err;
+
+       percpu_map_fd = bpf_map__fd(skel->maps.percpu_netcnt);
+       if (!ASSERT_OK(bpf_map_lookup_elem(percpu_map_fd, &key, &percpu_netcnt[0]),
+                      "bpf_map_lookup_elem(percpu_netcnt)"))
+               goto err;
+
+       /* Some packets can be still in per-cpu cache, but not more than
+        * MAX_PERCPU_PACKETS.
+        */
+       packets = netcnt.packets;
+       bytes = netcnt.bytes;
+       for (cpu = 0; cpu < nproc; cpu++) {
+               ASSERT_LE(percpu_netcnt[cpu].packets, MAX_PERCPU_PACKETS, "MAX_PERCPU_PACKETS");
+
+               packets += percpu_netcnt[cpu].packets;
+               bytes += percpu_netcnt[cpu].bytes;
+       }
+
+       /* No packets should be lost */
+       ASSERT_EQ(packets, 10000, "packets");
+
+       /* Let's check that bytes counter matches the number of packets
+        * multiplied by the size of ipv6 ICMP packet.
+        */
+       ASSERT_EQ(bytes, packets * 104, "bytes");
+
+err:
+       if (cg_fd != -1)
+               close(cg_fd);
+       free(percpu_netcnt);
+       netcnt_prog__destroy(skel);
+}
index 932e4ee..e7201ba 100644 (file)
@@ -390,18 +390,6 @@ done:
                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);
diff --git a/tools/testing/selftests/bpf/test_netcnt.c b/tools/testing/selftests/bpf/test_netcnt.c
deleted file mode 100644 (file)
index 4990a99..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <sys/sysinfo.h>
-#include <sys/time.h>
-
-#include <linux/bpf.h>
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
-
-#include "cgroup_helpers.h"
-#include "bpf_rlimit.h"
-#include "netcnt_common.h"
-
-#define BPF_PROG "./netcnt_prog.o"
-#define TEST_CGROUP "/test-network-counters/"
-
-static int bpf_find_map(const char *test, struct bpf_object *obj,
-                       const char *name)
-{
-       struct bpf_map *map;
-
-       map = bpf_object__find_map_by_name(obj, name);
-       if (!map) {
-               printf("%s:FAIL:map '%s' not found\n", test, name);
-               return -1;
-       }
-       return bpf_map__fd(map);
-}
-
-int main(int argc, char **argv)
-{
-       union percpu_net_cnt *percpu_netcnt;
-       struct bpf_cgroup_storage_key key;
-       int map_fd, percpu_map_fd;
-       int error = EXIT_FAILURE;
-       struct bpf_object *obj;
-       int prog_fd, cgroup_fd;
-       unsigned long packets;
-       union net_cnt netcnt;
-       unsigned long bytes;
-       int cpu, nproc;
-       __u32 prog_cnt;
-
-       nproc = get_nprocs_conf();
-       percpu_netcnt = malloc(sizeof(*percpu_netcnt) * nproc);
-       if (!percpu_netcnt) {
-               printf("Not enough memory for per-cpu area (%d cpus)\n", nproc);
-               goto err;
-       }
-
-       if (bpf_prog_load(BPF_PROG, BPF_PROG_TYPE_CGROUP_SKB,
-                         &obj, &prog_fd)) {
-               printf("Failed to load bpf program\n");
-               goto out;
-       }
-
-       cgroup_fd = cgroup_setup_and_join(TEST_CGROUP);
-       if (cgroup_fd < 0)
-               goto err;
-
-       /* Attach bpf program */
-       if (bpf_prog_attach(prog_fd, cgroup_fd, BPF_CGROUP_INET_EGRESS, 0)) {
-               printf("Failed to attach bpf program");
-               goto err;
-       }
-
-       if (system("which ping6 &>/dev/null") == 0)
-               assert(!system("ping6 ::1 -c 10000 -f -q > /dev/null"));
-       else
-               assert(!system("ping -6 ::1 -c 10000 -f -q > /dev/null"));
-
-       if (bpf_prog_query(cgroup_fd, BPF_CGROUP_INET_EGRESS, 0, NULL, NULL,
-                          &prog_cnt)) {
-               printf("Failed to query attached programs");
-               goto err;
-       }
-
-       map_fd = bpf_find_map(__func__, obj, "netcnt");
-       if (map_fd < 0) {
-               printf("Failed to find bpf map with net counters");
-               goto err;
-       }
-
-       percpu_map_fd = bpf_find_map(__func__, obj, "percpu_netcnt");
-       if (percpu_map_fd < 0) {
-               printf("Failed to find bpf map with percpu net counters");
-               goto err;
-       }
-
-       if (bpf_map_get_next_key(map_fd, NULL, &key)) {
-               printf("Failed to get key in cgroup storage\n");
-               goto err;
-       }
-
-       if (bpf_map_lookup_elem(map_fd, &key, &netcnt)) {
-               printf("Failed to lookup cgroup storage\n");
-               goto err;
-       }
-
-       if (bpf_map_lookup_elem(percpu_map_fd, &key, &percpu_netcnt[0])) {
-               printf("Failed to lookup percpu cgroup storage\n");
-               goto err;
-       }
-
-       /* Some packets can be still in per-cpu cache, but not more than
-        * MAX_PERCPU_PACKETS.
-        */
-       packets = netcnt.packets;
-       bytes = netcnt.bytes;
-       for (cpu = 0; cpu < nproc; cpu++) {
-               if (percpu_netcnt[cpu].packets > MAX_PERCPU_PACKETS) {
-                       printf("Unexpected percpu value: %llu\n",
-                              percpu_netcnt[cpu].packets);
-                       goto err;
-               }
-
-               packets += percpu_netcnt[cpu].packets;
-               bytes += percpu_netcnt[cpu].bytes;
-       }
-
-       /* No packets should be lost */
-       if (packets != 10000) {
-               printf("Unexpected packet count: %lu\n", packets);
-               goto err;
-       }
-
-       /* Let's check that bytes counter matches the number of packets
-        * multiplied by the size of ipv6 ICMP packet.
-        */
-       if (bytes != packets * 104) {
-               printf("Unexpected bytes count: %lu\n", bytes);
-               goto err;
-       }
-
-       error = 0;
-       printf("test_netcnt:PASS\n");
-
-err:
-       cleanup_cgroup_environment();
-       free(percpu_netcnt);
-
-out:
-       return error;
-}