From: Alexander Duyck <alexander.duyck@gmail.com>
To: bpf@vger.kernel.org
Cc: ast@kernel.org, daniel@iogearbox.net, kafai@fb.com,
john.fastabend@gmail.com, kernel-team@fb.com,
netdev@vger.kernel.org, edumazet@google.com, brakmo@fb.com,
andrii.nakryiko@gmail.com, alexanderduyck@fb.com
Subject: [bpf-next PATCH v3 4/5] selftests/bpf: Migrate tcpbpf_user.c to use BPF skeleton
Date: Tue, 03 Nov 2020 13:35:11 -0800 [thread overview]
Message-ID: <160443931155.1086697.17869006617113525162.stgit@localhost.localdomain> (raw)
In-Reply-To: <160443914296.1086697.4231574770375103169.stgit@localhost.localdomain>
From: Alexander Duyck <alexanderduyck@fb.com>
Update tcpbpf_user.c to make use of the BPF skeleton. Doing this we can
simplify test_tcpbpf_user and reduce the overhead involved in setting up
the test.
In addition we can clean up the remaining bits such as the one remaining
CHECK_FAIL at the end of test_tcpbpf_user so that the function only makes
use of CHECK as needed.
Acked-by: Martin KaFai Lau <kafai@fb.com>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
---
.../testing/selftests/bpf/prog_tests/tcpbpf_user.c | 41 +++++++-------------
1 file changed, 14 insertions(+), 27 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/tcpbpf_user.c b/tools/testing/selftests/bpf/prog_tests/tcpbpf_user.c
index 22c359871af6..bef81648797a 100644
--- a/tools/testing/selftests/bpf/prog_tests/tcpbpf_user.c
+++ b/tools/testing/selftests/bpf/prog_tests/tcpbpf_user.c
@@ -3,6 +3,7 @@
#include <network_helpers.h>
#include "test_tcpbpf.h"
+#include "test_tcpbpf_kern.skel.h"
#define LO_ADDR6 "::1"
#define CG_NAME "/tcpbpf-user-test"
@@ -130,44 +131,30 @@ static void run_test(int map_fd, int sock_map_fd)
void test_tcpbpf_user(void)
{
- const char *file = "test_tcpbpf_kern.o";
- int prog_fd, map_fd, sock_map_fd;
- int error = EXIT_FAILURE;
- struct bpf_object *obj;
+ struct test_tcpbpf_kern *skel;
+ int map_fd, sock_map_fd;
int cg_fd = -1;
- int rv;
- cg_fd = test__join_cgroup(CG_NAME);
- if (cg_fd < 0)
- goto err;
-
- if (bpf_prog_load(file, BPF_PROG_TYPE_SOCK_OPS, &obj, &prog_fd)) {
- printf("FAILED: load_bpf_file failed for: %s\n", file);
- goto err;
- }
+ skel = test_tcpbpf_kern__open_and_load();
+ if (CHECK(!skel, "open and load skel", "failed"))
+ return;
- rv = bpf_prog_attach(prog_fd, cg_fd, BPF_CGROUP_SOCK_OPS, 0);
- if (rv) {
- printf("FAILED: bpf_prog_attach: %d (%s)\n",
- error, strerror(errno));
+ cg_fd = test__join_cgroup(CG_NAME);
+ if (CHECK(cg_fd < 0, "test__join_cgroup(" CG_NAME ")",
+ "cg_fd:%d errno:%d", cg_fd, errno))
goto err;
- }
- map_fd = bpf_find_map(__func__, obj, "global_map");
- if (map_fd < 0)
- goto err;
+ map_fd = bpf_map__fd(skel->maps.global_map);
+ sock_map_fd = bpf_map__fd(skel->maps.sockopt_results);
- sock_map_fd = bpf_find_map(__func__, obj, "sockopt_results");
- if (sock_map_fd < 0)
+ skel->links.bpf_testcb = bpf_program__attach_cgroup(skel->progs.bpf_testcb, cg_fd);
+ if (!ASSERT_OK_PTR(skel->links.bpf_testcb, "attach_cgroup(bpf_testcb)"))
goto err;
run_test(map_fd, sock_map_fd);
- error = 0;
err:
- bpf_prog_detach(cg_fd, BPF_CGROUP_SOCK_OPS);
if (cg_fd != -1)
close(cg_fd);
-
- CHECK_FAIL(error);
+ test_tcpbpf_kern__destroy(skel);
}
next prev parent reply other threads:[~2020-11-03 21:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 21:34 [bpf-next PATCH v3 0/5] selftests/bpf: Migrate test_tcpbpf_user to be a part of test_progs framework Alexander Duyck
2020-11-03 21:34 ` [bpf-next PATCH v3 1/5] selftests/bpf: Move test_tcppbf_user into test_progs Alexander Duyck
2020-11-04 2:10 ` patchwork-bot+netdevbpf
2020-11-03 21:34 ` [bpf-next PATCH v3 2/5] selftests/bpf: Drop python client/server in favor of threads Alexander Duyck
2020-11-03 21:35 ` [bpf-next PATCH v3 3/5] selftests/bpf: Replace EXPECT_EQ with ASSERT_EQ and refactor verify_results Alexander Duyck
2020-11-03 21:35 ` Alexander Duyck [this message]
2020-11-03 21:35 ` [bpf-next PATCH v3 5/5] selftest/bpf: Use global variables instead of maps for test_tcpbpf_kern Alexander Duyck
2020-11-04 0:20 ` [bpf-next PATCH v3 0/5] selftests/bpf: Migrate test_tcpbpf_user to be a part of test_progs framework Martin KaFai Lau
2020-11-04 2:01 ` Alexei Starovoitov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160443931155.1086697.17869006617113525162.stgit@localhost.localdomain \
--to=alexander.duyck@gmail.com \
--cc=alexanderduyck@fb.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brakmo@fb.com \
--cc=daniel@iogearbox.net \
--cc=edumazet@google.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).