Add CONFIG_IKCONFIG and CONFIG_IKCONFIG_PROC as Mat suggested. Signed-off-by: Geliang Tang <geliang.tang@suse.com> --- tools/testing/selftests/bpf/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config index XXXXXXX..XXXXXXX 100644 --- a/tools/testing/selftests/bpf/config +++ b/tools/testing/selftests/bpf/config @@ -XXX,XX +XXX,XX @@ CONFIG_NF_DEFRAG_IPV6=y CONFIG_NF_CONNTRACK=y CONFIG_USERFAULTFD=y CONFIG_MPTCP=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y -- 2.34.1 Address to Andrii's comments: - add copyright 2022 - use ASSERT_* instead of CHECK_FAIL - drop SEC("version") Signed-off-by: Geliang Tang <geliang.tang@suse.com> --- .../testing/selftests/bpf/prog_tests/mptcp.c | 24 +++++++++---------- .../testing/selftests/bpf/progs/mptcp_sock.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c index XXXXXXX..XXXXXXX 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -XXX,XX +XXX,XX @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2020, Tessares SA. */ +/* Copyright (c) 2022, SUSE. */ #include <test_progs.h> #include "cgroup_helpers.h" @@ -XXX,XX +XXX,XX @@ struct mptcp_storage { static int verify_sk(int map_fd, int client_fd, const char *msg, __u32 is_mptcp) { - int err = 0, cfd = client_fd; + int err, cfd = client_fd; struct mptcp_storage val; if (is_mptcp == 1) return 0; - if (CHECK_FAIL(bpf_map_lookup_elem(map_fd, &cfd, &val) < 0)) { - perror("Failed to read socket storage"); - return -1; - } + err = bpf_map_lookup_elem(map_fd, &cfd, &val); + if (!ASSERT_OK(err, "bpf_map_lookup_elem")) + return err; if (val.invoked != 1) { log_err("%s: unexpected invoked count %d != 1", @@ -XXX,XX +XXX,XX @@ static int run_test(int cgroup_fd, int server_fd, bool is_mptcp) return -EIO; err = bpf_object__load(obj); - if (CHECK_FAIL(err)) + if (!ASSERT_OK(err, "bpf_object__load")) goto out; prog = bpf_object__find_program_by_name(obj, "_sockops"); - if (CHECK_FAIL(!prog)) { + if (!ASSERT_OK_PTR(prog, "bpf_object__find_program_by_name")) { err = -EIO; goto out; } prog_fd = bpf_program__fd(prog); - if (CHECK_FAIL(prog_fd < 0)) { + if (!ASSERT_GT(prog_fd, 0, "bpf_program__fd")) { err = -EIO; goto out; } map = bpf_object__find_map_by_name(obj, "socket_storage_map"); - if (CHECK_FAIL(!map)) { + if (!ASSERT_OK_PTR(map, "bpf_object__find_map_by_name")) { err = -EIO; goto out; } map_fd = bpf_map__fd(map); - if (CHECK_FAIL(map_fd < 0)) { + if (!ASSERT_GT(map_fd, 0, "bpf_map__fd")) { err = -EIO; goto out; } err = bpf_prog_attach(prog_fd, cgroup_fd, BPF_CGROUP_SOCK_OPS, 0); - if (CHECK_FAIL(err)) + if (!ASSERT_OK(err, "bpf_prog_attach")) goto out; client_fd = is_mptcp ? connect_to_mptcp_fd(server_fd, 0) : connect_to_fd(server_fd, 0); - if (client_fd < 0) { + if (!ASSERT_GT(client_fd, 0, "connect to fd")) { err = -EIO; goto out; } diff --git a/tools/testing/selftests/bpf/progs/mptcp_sock.c b/tools/testing/selftests/bpf/progs/mptcp_sock.c index XXXXXXX..XXXXXXX 100644 --- a/tools/testing/selftests/bpf/progs/mptcp_sock.c +++ b/tools/testing/selftests/bpf/progs/mptcp_sock.c @@ -XXX,XX +XXX,XX @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2020, Tessares SA. */ +/* Copyright (c) 2022, SUSE. */ #include <linux/bpf.h> #include <bpf/bpf_helpers.h> char _license[] SEC("license") = "GPL"; -__u32 _version SEC("version") = 1; struct mptcp_storage { __u32 invoked; -- 2.34.1