From: Stanislav Fomichev <sdf@google.com>
Date: Wed, 4 Sep 2019 09:25:07 -0700
Subject: selftests/bpf: test_progs: convert test_sockopt_multi
Patch-mainline: v5.4-rc1
Git-commit: 3886bd7c9b01317a5721161f8314f6c25f4f6229
References: bsc#1177028
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>
Acked-by: Gary Lin <glin@suse.com>
---
tools/testing/selftests/bpf/.gitignore | 1
tools/testing/selftests/bpf/Makefile | 3
tools/testing/selftests/bpf/prog_tests/sockopt_multi.c | 332 +++++++++++++++
tools/testing/selftests/bpf/test_sockopt_multi.c | 374 -----------------
4 files changed, 333 insertions(+), 377 deletions(-)
rename tools/testing/selftests/bpf/{test_sockopt_multi.c => prog_tests/sockopt_multi.c} (83%)
--- a/tools/testing/selftests/bpf/.gitignore
+++ b/tools/testing/selftests/bpf/.gitignore
@@ -39,6 +39,5 @@ libbpf.so.*
test_hashmap
test_btf_dump
xdping
-test_sockopt_multi
test_sockopt_inherit
test_tcp_rtt
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -29,7 +29,7 @@ TEST_GEN_PROGS = test_verifier test_tag
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_multi test_sockopt_inherit test_tcp_rtt
+ test_sockopt_inherit test_tcp_rtt
BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c)))
TEST_GEN_FILES = $(BPF_OBJ_FILES)
@@ -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_multi: cgroup_helpers.c
$(OUTPUT)/test_sockopt_inherit: cgroup_helpers.c
$(OUTPUT)/test_tcp_rtt: cgroup_helpers.c
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/sockopt_multi.c
@@ -0,0 +1,332 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <test_progs.h>
+#include "cgroup_helpers.h"
+
+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, BPF_F_ALLOW_MULTI);
+ if (err) {
+ log_err("Failed to attach %s BPF program", title);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int prog_detach(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)
+ return -1;
+
+ prog = bpf_object__find_program_by_title(obj, title);
+ if (!prog)
+ return -1;
+
+ err = bpf_prog_detach2(bpf_program__fd(prog), cgroup_fd,
+ attach_type);
+ if (err)
+ return -1;
+
+ return 0;
+}
+
+static int run_getsockopt_test(struct bpf_object *obj, int cg_parent,
+ int cg_child, int sock_fd)
+{
+ socklen_t optlen;
+ __u8 buf;
+ int err;
+
+ /* Set IP_TOS to the expected value (0x80). */
+
+ buf = 0x80;
+ err = setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1);
+ if (err < 0) {
+ log_err("Failed to call setsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ buf = 0x00;
+ optlen = 1;
+ err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
+ if (err) {
+ log_err("Failed to call getsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ if (buf != 0x80) {
+ log_err("Unexpected getsockopt 0x%x != 0x80 without BPF", buf);
+ err = -1;
+ goto detach;
+ }
+
+ /* Attach child program and make sure it returns new value:
+ * - kernel: -> 0x80
+ * - child: 0x80 -> 0x90
+ */
+
+ err = prog_attach(obj, cg_child, "cgroup/getsockopt/child");
+ if (err)
+ goto detach;
+
+ buf = 0x00;
+ optlen = 1;
+ err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
+ if (err) {
+ log_err("Failed to call getsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ if (buf != 0x90) {
+ log_err("Unexpected getsockopt 0x%x != 0x90", buf);
+ err = -1;
+ goto detach;
+ }
+
+ /* Attach parent program and make sure it returns new value:
+ * - kernel: -> 0x80
+ * - child: 0x80 -> 0x90
+ * - parent: 0x90 -> 0xA0
+ */
+
+ err = prog_attach(obj, cg_parent, "cgroup/getsockopt/parent");
+ if (err)
+ goto detach;
+
+ buf = 0x00;
+ optlen = 1;
+ err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
+ if (err) {
+ log_err("Failed to call getsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ if (buf != 0xA0) {
+ log_err("Unexpected getsockopt 0x%x != 0xA0", buf);
+ err = -1;
+ goto detach;
+ }
+
+ /* Setting unexpected initial sockopt should return EPERM:
+ * - kernel: -> 0x40
+ * - child: unexpected 0x40, EPERM
+ * - parent: unexpected 0x40, EPERM
+ */
+
+ buf = 0x40;
+ if (setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1) < 0) {
+ log_err("Failed to call setsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ buf = 0x00;
+ optlen = 1;
+ err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
+ if (!err) {
+ log_err("Unexpected success from getsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ /* Detach child program and make sure we still get EPERM:
+ * - kernel: -> 0x40
+ * - parent: unexpected 0x40, EPERM
+ */
+
+ err = prog_detach(obj, cg_child, "cgroup/getsockopt/child");
+ if (err) {
+ log_err("Failed to detach child program");
+ goto detach;
+ }
+
+ buf = 0x00;
+ optlen = 1;
+ err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
+ if (!err) {
+ log_err("Unexpected success from getsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ /* Set initial value to the one the parent program expects:
+ * - kernel: -> 0x90
+ * - parent: 0x90 -> 0xA0
+ */
+
+ buf = 0x90;
+ err = setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1);
+ if (err < 0) {
+ log_err("Failed to call setsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ buf = 0x00;
+ optlen = 1;
+ err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
+ if (err) {
+ log_err("Failed to call getsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ if (buf != 0xA0) {
+ log_err("Unexpected getsockopt 0x%x != 0xA0", buf);
+ err = -1;
+ goto detach;
+ }
+
+detach:
+ prog_detach(obj, cg_child, "cgroup/getsockopt/child");
+ prog_detach(obj, cg_parent, "cgroup/getsockopt/parent");
+
+ return err;
+}
+
+static int run_setsockopt_test(struct bpf_object *obj, int cg_parent,
+ int cg_child, int sock_fd)
+{
+ socklen_t optlen;
+ __u8 buf;
+ int err;
+
+ /* Set IP_TOS to the expected value (0x80). */
+
+ buf = 0x80;
+ err = setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1);
+ if (err < 0) {
+ log_err("Failed to call setsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ buf = 0x00;
+ optlen = 1;
+ err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
+ if (err) {
+ log_err("Failed to call getsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ if (buf != 0x80) {
+ log_err("Unexpected getsockopt 0x%x != 0x80 without BPF", buf);
+ err = -1;
+ goto detach;
+ }
+
+ /* Attach child program and make sure it adds 0x10. */
+
+ err = prog_attach(obj, cg_child, "cgroup/setsockopt");
+ if (err)
+ goto detach;
+
+ buf = 0x80;
+ err = setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1);
+ if (err < 0) {
+ log_err("Failed to call setsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ buf = 0x00;
+ optlen = 1;
+ err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
+ if (err) {
+ log_err("Failed to call getsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ if (buf != 0x80 + 0x10) {
+ log_err("Unexpected getsockopt 0x%x != 0x80 + 0x10", buf);
+ err = -1;
+ goto detach;
+ }
+
+ /* Attach parent program and make sure it adds another 0x10. */
+
+ err = prog_attach(obj, cg_parent, "cgroup/setsockopt");
+ if (err)
+ goto detach;
+
+ buf = 0x80;
+ err = setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1);
+ if (err < 0) {
+ log_err("Failed to call setsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ buf = 0x00;
+ optlen = 1;
+ err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
+ if (err) {
+ log_err("Failed to call getsockopt(IP_TOS)");
+ goto detach;
+ }
+
+ if (buf != 0x80 + 2 * 0x10) {
+ log_err("Unexpected getsockopt 0x%x != 0x80 + 2 * 0x10", buf);
+ err = -1;
+ goto detach;
+ }
+
+detach:
+ prog_detach(obj, cg_child, "cgroup/setsockopt");
+ prog_detach(obj, cg_parent, "cgroup/setsockopt");
+
+ return err;
+}
+
+void test_sockopt_multi(void)
+{
+ struct bpf_prog_load_attr attr = {
+ .file = "./sockopt_multi.o",
+ };
+ int cg_parent = -1, cg_child = -1;
+ struct bpf_object *obj = NULL;
+ int sock_fd = -1;
+ int err = -1;
+ int ignored;
+
+ cg_parent = test__join_cgroup("/parent");
+ if (CHECK_FAIL(cg_parent < 0))
+ goto out;
+
+ cg_child = test__join_cgroup("/parent/child");
+ if (CHECK_FAIL(cg_child < 0))
+ goto out;
+
+ err = bpf_prog_load_xattr(&attr, &obj, &ignored);
+ if (CHECK_FAIL(err))
+ goto out;
+
+ sock_fd = socket(AF_INET, SOCK_STREAM, 0);
+ if (CHECK_FAIL(sock_fd < 0))
+ goto out;
+
+ CHECK_FAIL(run_getsockopt_test(obj, cg_parent, cg_child, sock_fd));
+ CHECK_FAIL(run_setsockopt_test(obj, cg_parent, cg_child, sock_fd));
+
+out:
+ close(sock_fd);
+ bpf_object__close(obj);
+ close(cg_child);
+ close(cg_parent);
+}
--- a/tools/testing/selftests/bpf/test_sockopt_multi.c
+++ /dev/null
@@ -1,374 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <error.h>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.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"
-
-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, BPF_F_ALLOW_MULTI);
- if (err) {
- log_err("Failed to attach %s BPF program", title);
- return -1;
- }
-
- return 0;
-}
-
-static int prog_detach(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)
- return -1;
-
- prog = bpf_object__find_program_by_title(obj, title);
- if (!prog)
- return -1;
-
- err = bpf_prog_detach2(bpf_program__fd(prog), cgroup_fd,
- attach_type);
- if (err)
- return -1;
-
- return 0;
-}
-
-static int run_getsockopt_test(struct bpf_object *obj, int cg_parent,
- int cg_child, int sock_fd)
-{
- socklen_t optlen;
- __u8 buf;
- int err;
-
- /* Set IP_TOS to the expected value (0x80). */
-
- buf = 0x80;
- err = setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1);
- if (err < 0) {
- log_err("Failed to call setsockopt(IP_TOS)");
- goto detach;
- }
-
- buf = 0x00;
- optlen = 1;
- err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
- if (err) {
- log_err("Failed to call getsockopt(IP_TOS)");
- goto detach;
- }
-
- if (buf != 0x80) {
- log_err("Unexpected getsockopt 0x%x != 0x80 without BPF", buf);
- err = -1;
- goto detach;
- }
-
- /* Attach child program and make sure it returns new value:
- * - kernel: -> 0x80
- * - child: 0x80 -> 0x90
- */
-
- err = prog_attach(obj, cg_child, "cgroup/getsockopt/child");
- if (err)
- goto detach;
-
- buf = 0x00;
- optlen = 1;
- err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
- if (err) {
- log_err("Failed to call getsockopt(IP_TOS)");
- goto detach;
- }
-
- if (buf != 0x90) {
- log_err("Unexpected getsockopt 0x%x != 0x90", buf);
- err = -1;
- goto detach;
- }
-
- /* Attach parent program and make sure it returns new value:
- * - kernel: -> 0x80
- * - child: 0x80 -> 0x90
- * - parent: 0x90 -> 0xA0
- */
-
- err = prog_attach(obj, cg_parent, "cgroup/getsockopt/parent");
- if (err)
- goto detach;
-
- buf = 0x00;
- optlen = 1;
- err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
- if (err) {
- log_err("Failed to call getsockopt(IP_TOS)");
- goto detach;
- }
-
- if (buf != 0xA0) {
- log_err("Unexpected getsockopt 0x%x != 0xA0", buf);
- err = -1;
- goto detach;
- }
-
- /* Setting unexpected initial sockopt should return EPERM:
- * - kernel: -> 0x40
- * - child: unexpected 0x40, EPERM
- * - parent: unexpected 0x40, EPERM
- */
-
- buf = 0x40;
- if (setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1) < 0) {
- log_err("Failed to call setsockopt(IP_TOS)");
- goto detach;
- }
-
- buf = 0x00;
- optlen = 1;
- err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
- if (!err) {
- log_err("Unexpected success from getsockopt(IP_TOS)");
- goto detach;
- }
-
- /* Detach child program and make sure we still get EPERM:
- * - kernel: -> 0x40
- * - parent: unexpected 0x40, EPERM
- */
-
- err = prog_detach(obj, cg_child, "cgroup/getsockopt/child");
- if (err) {
- log_err("Failed to detach child program");
- goto detach;
- }
-
- buf = 0x00;
- optlen = 1;
- err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
- if (!err) {
- log_err("Unexpected success from getsockopt(IP_TOS)");
- goto detach;
- }
-
- /* Set initial value to the one the parent program expects:
- * - kernel: -> 0x90
- * - parent: 0x90 -> 0xA0
- */
-
- buf = 0x90;
- err = setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1);
- if (err < 0) {
- log_err("Failed to call setsockopt(IP_TOS)");
- goto detach;
- }
-
- buf = 0x00;
- optlen = 1;
- err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
- if (err) {
- log_err("Failed to call getsockopt(IP_TOS)");
- goto detach;
- }
-
- if (buf != 0xA0) {
- log_err("Unexpected getsockopt 0x%x != 0xA0", buf);
- err = -1;
- goto detach;
- }
-
-detach:
- prog_detach(obj, cg_child, "cgroup/getsockopt/child");
- prog_detach(obj, cg_parent, "cgroup/getsockopt/parent");
-
- return err;
-}
-
-static int run_setsockopt_test(struct bpf_object *obj, int cg_parent,
- int cg_child, int sock_fd)
-{
- socklen_t optlen;
- __u8 buf;
- int err;
-
- /* Set IP_TOS to the expected value (0x80). */
-
- buf = 0x80;
- err = setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1);
- if (err < 0) {
- log_err("Failed to call setsockopt(IP_TOS)");
- goto detach;
- }
-
- buf = 0x00;
- optlen = 1;
- err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
- if (err) {
- log_err("Failed to call getsockopt(IP_TOS)");
- goto detach;
- }
-
- if (buf != 0x80) {
- log_err("Unexpected getsockopt 0x%x != 0x80 without BPF", buf);
- err = -1;
- goto detach;
- }
-
- /* Attach child program and make sure it adds 0x10. */
-
- err = prog_attach(obj, cg_child, "cgroup/setsockopt");
- if (err)
- goto detach;
-
- buf = 0x80;
- err = setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1);
- if (err < 0) {
- log_err("Failed to call setsockopt(IP_TOS)");
- goto detach;
- }
-
- buf = 0x00;
- optlen = 1;
- err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
- if (err) {
- log_err("Failed to call getsockopt(IP_TOS)");
- goto detach;
- }
-
- if (buf != 0x80 + 0x10) {
- log_err("Unexpected getsockopt 0x%x != 0x80 + 0x10", buf);
- err = -1;
- goto detach;
- }
-
- /* Attach parent program and make sure it adds another 0x10. */
-
- err = prog_attach(obj, cg_parent, "cgroup/setsockopt");
- if (err)
- goto detach;
-
- buf = 0x80;
- err = setsockopt(sock_fd, SOL_IP, IP_TOS, &buf, 1);
- if (err < 0) {
- log_err("Failed to call setsockopt(IP_TOS)");
- goto detach;
- }
-
- buf = 0x00;
- optlen = 1;
- err = getsockopt(sock_fd, SOL_IP, IP_TOS, &buf, &optlen);
- if (err) {
- log_err("Failed to call getsockopt(IP_TOS)");
- goto detach;
- }
-
- if (buf != 0x80 + 2 * 0x10) {
- log_err("Unexpected getsockopt 0x%x != 0x80 + 2 * 0x10", buf);
- err = -1;
- goto detach;
- }
-
-detach:
- prog_detach(obj, cg_child, "cgroup/setsockopt");
- prog_detach(obj, cg_parent, "cgroup/setsockopt");
-
- return err;
-}
-
-int main(int argc, char **argv)
-{
- struct bpf_prog_load_attr attr = {
- .file = "./sockopt_multi.o",
- };
- int cg_parent = -1, cg_child = -1;
- struct bpf_object *obj = NULL;
- int sock_fd = -1;
- int err = -1;
- int ignored;
-
- if (setup_cgroup_environment()) {
- log_err("Failed to setup cgroup environment\n");
- goto out;
- }
-
- cg_parent = create_and_get_cgroup("/parent");
- if (cg_parent < 0) {
- log_err("Failed to create cgroup /parent\n");
- goto out;
- }
-
- cg_child = create_and_get_cgroup("/parent/child");
- if (cg_child < 0) {
- log_err("Failed to create cgroup /parent/child\n");
- goto out;
- }
-
- if (join_cgroup("/parent/child")) {
- log_err("Failed to join cgroup /parent/child\n");
- goto out;
- }
-
- err = bpf_prog_load_xattr(&attr, &obj, &ignored);
- if (err) {
- log_err("Failed to load BPF object");
- goto out;
- }
-
- sock_fd = socket(AF_INET, SOCK_STREAM, 0);
- if (sock_fd < 0) {
- log_err("Failed to create socket");
- goto out;
- }
-
- if (run_getsockopt_test(obj, cg_parent, cg_child, sock_fd))
- err = -1;
- printf("test_sockopt_multi: getsockopt %s\n",
- err ? "FAILED" : "PASSED");
-
- if (run_setsockopt_test(obj, cg_parent, cg_child, sock_fd))
- err = -1;
- printf("test_sockopt_multi: setsockopt %s\n",
- err ? "FAILED" : "PASSED");
-
-out:
- close(sock_fd);
- bpf_object__close(obj);
- close(cg_child);
- close(cg_parent);
-
- printf("test_sockopt_multi: %s\n", err ? "FAILED" : "PASSED");
- return err ? EXIT_FAILURE : EXIT_SUCCESS;
-}