selftests/bpf: test_progs: convert test_sockopt_sk
authorStanislav Fomichev <sdf@google.com>
Wed, 4 Sep 2019 16:25:06 +0000 (09:25 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 6 Sep 2019 16:59:05 +0000 (09:59 -0700)
Move the files, adjust includes, remove entry from Makefile & .gitignore

Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
tools/testing/selftests/bpf/.gitignore
tools/testing/selftests/bpf/Makefile
tools/testing/selftests/bpf/prog_tests/sockopt_sk.c [new file with mode: 0644]
tools/testing/selftests/bpf/test_progs.h
tools/testing/selftests/bpf/test_sockopt_sk.c [deleted file]

index 0315120eac8fdc14517095124e38a6d397dad9d2..bc83c1a7ea1b9ed4986e335f9357cbf721065c1f 100644 (file)
@@ -39,7 +39,6 @@ libbpf.so.*
 test_hashmap
 test_btf_dump
 xdping
-test_sockopt_sk
 test_sockopt_multi
 test_sockopt_inherit
 test_tcp_rtt
index 7151cbc4676e6c3380a4cfc76396d3139d027b5f..32a54b71d30d1ec3a6c29894f1051772c332a2d8 100644 (file)
@@ -28,7 +28,7 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test
        test_sock test_btf test_sockmap get_cgroup_id_user test_socket_cookie \
        test_cgroup_storage test_select_reuseport test_section_names \
        test_netcnt test_tcpnotify_user test_sock_fields test_sysctl test_hashmap \
-       test_btf_dump test_cgroup_attach xdping test_sockopt_sk \
+       test_btf_dump test_cgroup_attach xdping \
        test_sockopt_multi test_sockopt_inherit test_tcp_rtt
 
 BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
@@ -113,7 +113,6 @@ $(OUTPUT)/test_netcnt: cgroup_helpers.c
 $(OUTPUT)/test_sock_fields: cgroup_helpers.c
 $(OUTPUT)/test_sysctl: cgroup_helpers.c
 $(OUTPUT)/test_cgroup_attach: cgroup_helpers.c
-$(OUTPUT)/test_sockopt_sk: cgroup_helpers.c
 $(OUTPUT)/test_sockopt_multi: cgroup_helpers.c
 $(OUTPUT)/test_sockopt_inherit: cgroup_helpers.c
 $(OUTPUT)/test_tcp_rtt: cgroup_helpers.c
diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt_sk.c b/tools/testing/selftests/bpf/prog_tests/sockopt_sk.c
new file mode 100644 (file)
index 0000000..2061a6b
--- /dev/null
@@ -0,0 +1,200 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+#include "cgroup_helpers.h"
+
+#define SOL_CUSTOM                     0xdeadbeef
+
+static int getsetsockopt(void)
+{
+       int fd, err;
+       union {
+               char u8[4];
+               __u32 u32;
+               char cc[16]; /* TCP_CA_NAME_MAX */
+       } buf = {};
+       socklen_t optlen;
+
+       fd = socket(AF_INET, SOCK_STREAM, 0);
+       if (fd < 0) {
+               log_err("Failed to create socket");
+               return -1;
+       }
+
+       /* IP_TOS - BPF bypass */
+
+       buf.u8[0] = 0x08;
+       err = setsockopt(fd, SOL_IP, IP_TOS, &buf, 1);
+       if (err) {
+               log_err("Failed to call setsockopt(IP_TOS)");
+               goto err;
+       }
+
+       buf.u8[0] = 0x00;
+       optlen = 1;
+       err = getsockopt(fd, SOL_IP, IP_TOS, &buf, &optlen);
+       if (err) {
+               log_err("Failed to call getsockopt(IP_TOS)");
+               goto err;
+       }
+
+       if (buf.u8[0] != 0x08) {
+               log_err("Unexpected getsockopt(IP_TOS) buf[0] 0x%02x != 0x08",
+                       buf.u8[0]);
+               goto err;
+       }
+
+       /* IP_TTL - EPERM */
+
+       buf.u8[0] = 1;
+       err = setsockopt(fd, SOL_IP, IP_TTL, &buf, 1);
+       if (!err || errno != EPERM) {
+               log_err("Unexpected success from setsockopt(IP_TTL)");
+               goto err;
+       }
+
+       /* SOL_CUSTOM - handled by BPF */
+
+       buf.u8[0] = 0x01;
+       err = setsockopt(fd, SOL_CUSTOM, 0, &buf, 1);
+       if (err) {
+               log_err("Failed to call setsockopt");
+               goto err;
+       }
+
+       buf.u32 = 0x00;
+       optlen = 4;
+       err = getsockopt(fd, SOL_CUSTOM, 0, &buf, &optlen);
+       if (err) {
+               log_err("Failed to call getsockopt");
+               goto err;
+       }
+
+       if (optlen != 1) {
+               log_err("Unexpected optlen %d != 1", optlen);
+               goto err;
+       }
+       if (buf.u8[0] != 0x01) {
+               log_err("Unexpected buf[0] 0x%02x != 0x01", buf.u8[0]);
+               goto err;
+       }
+
+       /* SO_SNDBUF is overwritten */
+
+       buf.u32 = 0x01010101;
+       err = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &buf, 4);
+       if (err) {
+               log_err("Failed to call setsockopt(SO_SNDBUF)");
+               goto err;
+       }
+
+       buf.u32 = 0x00;
+       optlen = 4;
+       err = getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &buf, &optlen);
+       if (err) {
+               log_err("Failed to call getsockopt(SO_SNDBUF)");
+               goto err;
+       }
+
+       if (buf.u32 != 0x55AA*2) {
+               log_err("Unexpected getsockopt(SO_SNDBUF) 0x%x != 0x55AA*2",
+                       buf.u32);
+               goto err;
+       }
+
+       /* TCP_CONGESTION can extend the string */
+
+       strcpy(buf.cc, "nv");
+       err = setsockopt(fd, SOL_TCP, TCP_CONGESTION, &buf, strlen("nv"));
+       if (err) {
+               log_err("Failed to call setsockopt(TCP_CONGESTION)");
+               goto err;
+       }
+
+
+       optlen = sizeof(buf.cc);
+       err = getsockopt(fd, SOL_TCP, TCP_CONGESTION, &buf, &optlen);
+       if (err) {
+               log_err("Failed to call getsockopt(TCP_CONGESTION)");
+               goto err;
+       }
+
+       if (strcmp(buf.cc, "cubic") != 0) {
+               log_err("Unexpected getsockopt(TCP_CONGESTION) %s != %s",
+                       buf.cc, "cubic");
+               goto err;
+       }
+
+       close(fd);
+       return 0;
+err:
+       close(fd);
+       return -1;
+}
+
+static int prog_attach(struct bpf_object *obj, int cgroup_fd, const char *title)
+{
+       enum bpf_attach_type attach_type;
+       enum bpf_prog_type prog_type;
+       struct bpf_program *prog;
+       int err;
+
+       err = libbpf_prog_type_by_name(title, &prog_type, &attach_type);
+       if (err) {
+               log_err("Failed to deduct types for %s BPF program", title);
+               return -1;
+       }
+
+       prog = bpf_object__find_program_by_title(obj, title);
+       if (!prog) {
+               log_err("Failed to find %s BPF program", title);
+               return -1;
+       }
+
+       err = bpf_prog_attach(bpf_program__fd(prog), cgroup_fd,
+                             attach_type, 0);
+       if (err) {
+               log_err("Failed to attach %s BPF program", title);
+               return -1;
+       }
+
+       return 0;
+}
+
+static void run_test(int cgroup_fd)
+{
+       struct bpf_prog_load_attr attr = {
+               .file = "./sockopt_sk.o",
+       };
+       struct bpf_object *obj;
+       int ignored;
+       int err;
+
+       err = bpf_prog_load_xattr(&attr, &obj, &ignored);
+       if (CHECK_FAIL(err))
+               return;
+
+       err = prog_attach(obj, cgroup_fd, "cgroup/getsockopt");
+       if (CHECK_FAIL(err))
+               goto close_bpf_object;
+
+       err = prog_attach(obj, cgroup_fd, "cgroup/setsockopt");
+       if (CHECK_FAIL(err))
+               goto close_bpf_object;
+
+       CHECK_FAIL(getsetsockopt());
+
+close_bpf_object:
+       bpf_object__close(obj);
+}
+
+void test_sockopt_sk(void)
+{
+       int cgroup_fd;
+
+       cgroup_fd = test__join_cgroup("/sockopt_sk");
+       if (CHECK_FAIL(cgroup_fd < 0))
+               return;
+
+       run_test(cgroup_fd);
+       close(cgroup_fd);
+}
index e518bd5da3e29bcd11fd3a1c1d020b805bac1303..0c48f64f732b2cd2934693807d3977cfeb913af5 100644 (file)
@@ -16,9 +16,10 @@ typedef __u16 __sum16;
 #include <linux/if_packet.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
-#include <linux/tcp.h>
+#include <netinet/tcp.h>
 #include <linux/filter.h>
 #include <linux/perf_event.h>
+#include <linux/socket.h>
 #include <linux/unistd.h>
 
 #include <sys/ioctl.h>
diff --git a/tools/testing/selftests/bpf/test_sockopt_sk.c b/tools/testing/selftests/bpf/test_sockopt_sk.c
deleted file mode 100644 (file)
index e4f6055..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-#include <linux/filter.h>
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
-
-#include "bpf_rlimit.h"
-#include "bpf_util.h"
-#include "cgroup_helpers.h"
-
-#define CG_PATH                                "/sockopt"
-
-#define SOL_CUSTOM                     0xdeadbeef
-
-static int getsetsockopt(void)
-{
-       int fd, err;
-       union {
-               char u8[4];
-               __u32 u32;
-               char cc[16]; /* TCP_CA_NAME_MAX */
-       } buf = {};
-       socklen_t optlen;
-
-       fd = socket(AF_INET, SOCK_STREAM, 0);
-       if (fd < 0) {
-               log_err("Failed to create socket");
-               return -1;
-       }
-
-       /* IP_TOS - BPF bypass */
-
-       buf.u8[0] = 0x08;
-       err = setsockopt(fd, SOL_IP, IP_TOS, &buf, 1);
-       if (err) {
-               log_err("Failed to call setsockopt(IP_TOS)");
-               goto err;
-       }
-
-       buf.u8[0] = 0x00;
-       optlen = 1;
-       err = getsockopt(fd, SOL_IP, IP_TOS, &buf, &optlen);
-       if (err) {
-               log_err("Failed to call getsockopt(IP_TOS)");
-               goto err;
-       }
-
-       if (buf.u8[0] != 0x08) {
-               log_err("Unexpected getsockopt(IP_TOS) buf[0] 0x%02x != 0x08",
-                       buf.u8[0]);
-               goto err;
-       }
-
-       /* IP_TTL - EPERM */
-
-       buf.u8[0] = 1;
-       err = setsockopt(fd, SOL_IP, IP_TTL, &buf, 1);
-       if (!err || errno != EPERM) {
-               log_err("Unexpected success from setsockopt(IP_TTL)");
-               goto err;
-       }
-
-       /* SOL_CUSTOM - handled by BPF */
-
-       buf.u8[0] = 0x01;
-       err = setsockopt(fd, SOL_CUSTOM, 0, &buf, 1);
-       if (err) {
-               log_err("Failed to call setsockopt");
-               goto err;
-       }
-
-       buf.u32 = 0x00;
-       optlen = 4;
-       err = getsockopt(fd, SOL_CUSTOM, 0, &buf, &optlen);
-       if (err) {
-               log_err("Failed to call getsockopt");
-               goto err;
-       }
-
-       if (optlen != 1) {
-               log_err("Unexpected optlen %d != 1", optlen);
-               goto err;
-       }
-       if (buf.u8[0] != 0x01) {
-               log_err("Unexpected buf[0] 0x%02x != 0x01", buf.u8[0]);
-               goto err;
-       }
-
-       /* SO_SNDBUF is overwritten */
-
-       buf.u32 = 0x01010101;
-       err = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &buf, 4);
-       if (err) {
-               log_err("Failed to call setsockopt(SO_SNDBUF)");
-               goto err;
-       }
-
-       buf.u32 = 0x00;
-       optlen = 4;
-       err = getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &buf, &optlen);
-       if (err) {
-               log_err("Failed to call getsockopt(SO_SNDBUF)");
-               goto err;
-       }
-
-       if (buf.u32 != 0x55AA*2) {
-               log_err("Unexpected getsockopt(SO_SNDBUF) 0x%x != 0x55AA*2",
-                       buf.u32);
-               goto err;
-       }
-
-       /* TCP_CONGESTION can extend the string */
-
-       strcpy(buf.cc, "nv");
-       err = setsockopt(fd, SOL_TCP, TCP_CONGESTION, &buf, strlen("nv"));
-       if (err) {
-               log_err("Failed to call setsockopt(TCP_CONGESTION)");
-               goto err;
-       }
-
-
-       optlen = sizeof(buf.cc);
-       err = getsockopt(fd, SOL_TCP, TCP_CONGESTION, &buf, &optlen);
-       if (err) {
-               log_err("Failed to call getsockopt(TCP_CONGESTION)");
-               goto err;
-       }
-
-       if (strcmp(buf.cc, "cubic") != 0) {
-               log_err("Unexpected getsockopt(TCP_CONGESTION) %s != %s",
-                       buf.cc, "cubic");
-               goto err;
-       }
-
-       close(fd);
-       return 0;
-err:
-       close(fd);
-       return -1;
-}
-
-static int prog_attach(struct bpf_object *obj, int cgroup_fd, const char *title)
-{
-       enum bpf_attach_type attach_type;
-       enum bpf_prog_type prog_type;
-       struct bpf_program *prog;
-       int err;
-
-       err = libbpf_prog_type_by_name(title, &prog_type, &attach_type);
-       if (err) {
-               log_err("Failed to deduct types for %s BPF program", title);
-               return -1;
-       }
-
-       prog = bpf_object__find_program_by_title(obj, title);
-       if (!prog) {
-               log_err("Failed to find %s BPF program", title);
-               return -1;
-       }
-
-       err = bpf_prog_attach(bpf_program__fd(prog), cgroup_fd,
-                             attach_type, 0);
-       if (err) {
-               log_err("Failed to attach %s BPF program", title);
-               return -1;
-       }
-
-       return 0;
-}
-
-static int run_test(int cgroup_fd)
-{
-       struct bpf_prog_load_attr attr = {
-               .file = "./sockopt_sk.o",
-       };
-       struct bpf_object *obj;
-       int ignored;
-       int err;
-
-       err = bpf_prog_load_xattr(&attr, &obj, &ignored);
-       if (err) {
-               log_err("Failed to load BPF object");
-               return -1;
-       }
-
-       err = prog_attach(obj, cgroup_fd, "cgroup/getsockopt");
-       if (err)
-               goto close_bpf_object;
-
-       err = prog_attach(obj, cgroup_fd, "cgroup/setsockopt");
-       if (err)
-               goto close_bpf_object;
-
-       err = getsetsockopt();
-
-close_bpf_object:
-       bpf_object__close(obj);
-       return err;
-}
-
-int main(int args, char **argv)
-{
-       int cgroup_fd;
-       int err = EXIT_SUCCESS;
-
-       if (setup_cgroup_environment())
-               goto cleanup_obj;
-
-       cgroup_fd = create_and_get_cgroup(CG_PATH);
-       if (cgroup_fd < 0)
-               goto cleanup_cgroup_env;
-
-       if (join_cgroup(CG_PATH))
-               goto cleanup_cgroup;
-
-       if (run_test(cgroup_fd))
-               err = EXIT_FAILURE;
-
-       printf("test_sockopt_sk: %s\n",
-              err == EXIT_SUCCESS ? "PASSED" : "FAILED");
-
-cleanup_cgroup:
-       close(cgroup_fd);
-cleanup_cgroup_env:
-       cleanup_cgroup_environment();
-cleanup_obj:
-       return err;
-}