From: Kumar Kartikeya Dwivedi <[email protected]>
To: [email protected]
Cc: Alexander Viro <[email protected]>,
[email protected],
Alexei Starovoitov <[email protected]>,
Daniel Borkmann <[email protected]>,
Andrii Nakryiko <[email protected]>, Yonghong Song <[email protected]>,
Pavel Emelyanov <[email protected]>,
Alexander Mikhalitsyn <[email protected]>,
Andrei Vagin <[email protected]>,
[email protected], [email protected]
Subject: [PATCH bpf-next v3 07/10] selftests/bpf: Add test for epoll BPF iterator
Date: Wed, 1 Dec 2021 09:53:30 +0530 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
This tests the epoll iterator, including peeking into the epitem to
inspect the registered file and fd number, and verifying that in
userspace.
Cc: Alexander Viro <[email protected]>
Cc: [email protected]
Signed-off-by: Kumar Kartikeya Dwivedi <[email protected]>
---
.../selftests/bpf/prog_tests/bpf_iter.c | 121 ++++++++++++++++++
.../selftests/bpf/progs/bpf_iter_epoll.c | 33 +++++
2 files changed, 154 insertions(+)
create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_epoll.c
diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
index 13ea2eaed032..cc0555c5b373 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
@@ -2,6 +2,7 @@
/* Copyright (c) 2020 Facebook */
#include <sys/stat.h>
#include <sys/mman.h>
+#include <sys/epoll.h>
#include <test_progs.h>
#include <linux/io_uring.h>
@@ -31,6 +32,7 @@
#include "bpf_iter_test_kern5.skel.h"
#include "bpf_iter_test_kern6.skel.h"
#include "bpf_iter_io_uring.skel.h"
+#include "bpf_iter_epoll.skel.h"
static int duration;
@@ -1486,6 +1488,123 @@ void test_io_uring_file(void)
bpf_iter_io_uring__destroy(skel);
}
+void test_epoll(void)
+{
+ const char *fmt = "B\npipe:%d\nsocket:%d\npipe:%d\nsocket:%d\nE\n";
+ DECLARE_LIBBPF_OPTS(bpf_iter_attach_opts, opts);
+ char buf[4096] = {}, rbuf[4096] = {};
+ union bpf_iter_link_info linfo;
+ int fds[2], sk[2], epfd, ret;
+ struct bpf_iter_epoll *skel;
+ struct epoll_event ev = {};
+ int iter_fd, set[4];
+ char *s, *t;
+
+ opts.link_info = &linfo;
+ opts.link_info_len = sizeof(linfo);
+
+ skel = bpf_iter_epoll__open_and_load();
+ if (!ASSERT_OK_PTR(skel, "bpf_iter_epoll__open_and_load"))
+ return;
+
+ epfd = epoll_create1(EPOLL_CLOEXEC);
+ if (!ASSERT_GE(epfd, 0, "epoll_create1"))
+ goto end;
+
+ ret = pipe(fds);
+ if (!ASSERT_OK(ret, "pipe(fds)"))
+ goto end_epfd;
+
+ ret = socketpair(AF_UNIX, SOCK_STREAM, 0, sk);
+ if (!ASSERT_OK(ret, "socketpair"))
+ goto end_pipe;
+
+ ev.events = EPOLLIN;
+
+ ret = epoll_ctl(epfd, EPOLL_CTL_ADD, fds[0], &ev);
+ if (!ASSERT_OK(ret, "epoll_ctl"))
+ goto end_sk;
+
+ ret = epoll_ctl(epfd, EPOLL_CTL_ADD, sk[0], &ev);
+ if (!ASSERT_OK(ret, "epoll_ctl"))
+ goto end_sk;
+
+ ret = epoll_ctl(epfd, EPOLL_CTL_ADD, fds[1], &ev);
+ if (!ASSERT_OK(ret, "epoll_ctl"))
+ goto end_sk;
+
+ ret = epoll_ctl(epfd, EPOLL_CTL_ADD, sk[1], &ev);
+ if (!ASSERT_OK(ret, "epoll_ctl"))
+ goto end_sk;
+
+ linfo.epoll.epoll_fd = epfd;
+ skel->links.dump_epoll = bpf_program__attach_iter(skel->progs.dump_epoll, &opts);
+ if (!ASSERT_OK_PTR(skel->links.dump_epoll, "bpf_program__attach_iter"))
+ goto end_sk;
+
+ iter_fd = bpf_iter_create(bpf_link__fd(skel->links.dump_epoll));
+ if (!ASSERT_GE(iter_fd, 0, "bpf_iter_create"))
+ goto end_sk;
+
+ ret = epoll_ctl(epfd, EPOLL_CTL_ADD, iter_fd, &ev);
+ if (!ASSERT_EQ(ret, -1, "epoll_ctl add for iter_fd"))
+ goto end_iter_fd;
+
+ ret = snprintf(buf, sizeof(buf), fmt, fds[0], sk[0], fds[1], sk[1]);
+ if (!ASSERT_GE(ret, 0, "snprintf") || !ASSERT_LT(ret, sizeof(buf), "snprintf"))
+ goto end_iter_fd;
+
+ ret = read_fd_into_buffer(iter_fd, rbuf, sizeof(rbuf));
+ if (!ASSERT_GT(ret, 0, "read_fd_into_buffer"))
+ goto end_iter_fd;
+
+ puts("=== Expected Output ===");
+ printf("%s", buf);
+ puts("==== Actual Output ====");
+ printf("%s", rbuf);
+ puts("=======================");
+
+ s = rbuf;
+ while ((s = strtok_r(s, "\n", &t))) {
+ int fd = -1;
+
+ if (s[0] == 'B' || s[0] == 'E')
+ goto next;
+ ASSERT_EQ(sscanf(s, s[0] == 'p' ? "pipe:%d" : "socket:%d", &fd), 1, s);
+ if (fd == fds[0]) {
+ ASSERT_NEQ(set[0], 1, "pipe[0]");
+ set[0] = 1;
+ } else if (fd == fds[1]) {
+ ASSERT_NEQ(set[1], 1, "pipe[1]");
+ set[1] = 1;
+ } else if (fd == sk[0]) {
+ ASSERT_NEQ(set[2], 1, "sk[0]");
+ set[2] = 1;
+ } else if (fd == sk[1]) {
+ ASSERT_NEQ(set[3], 1, "sk[1]");
+ set[3] = 1;
+ } else {
+ ASSERT_TRUE(0, "Incorrect fd in iterator output");
+ }
+next:
+ s = NULL;
+ }
+ for (int i = 0; i < ARRAY_SIZE(set); i++)
+ ASSERT_EQ(set[i], 1, "fd found");
+end_iter_fd:
+ close(iter_fd);
+end_sk:
+ close(sk[1]);
+ close(sk[0]);
+end_pipe:
+ close(fds[1]);
+ close(fds[0]);
+end_epfd:
+ close(epfd);
+end:
+ bpf_iter_epoll__destroy(skel);
+}
+
void test_bpf_iter(void)
{
if (test__start_subtest("btf_id_or_null"))
@@ -1550,4 +1669,6 @@ void test_bpf_iter(void)
test_io_uring_buf();
if (test__start_subtest("io_uring_file"))
test_io_uring_file();
+ if (test__start_subtest("epoll"))
+ test_epoll();
}
diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_epoll.c b/tools/testing/selftests/bpf/progs/bpf_iter_epoll.c
new file mode 100644
index 000000000000..0afc74d154a1
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/bpf_iter_epoll.c
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "bpf_iter.h"
+#include <bpf/bpf_helpers.h>
+
+extern void pipefifo_fops __ksym;
+
+SEC("iter/epoll")
+int dump_epoll(struct bpf_iter__epoll *ctx)
+{
+ struct seq_file *seq = ctx->meta->seq;
+ struct epitem *epi = ctx->epi;
+ char sstr[] = "socket";
+ char pstr[] = "pipe";
+
+ if (!ctx->meta->seq_num) {
+ BPF_SEQ_PRINTF(seq, "B\n");
+ }
+ if (epi) {
+ struct file *f = epi->ffd.file;
+ char *str;
+
+ if (f->f_op == &pipefifo_fops)
+ str = pstr;
+ else
+ str = sstr;
+ BPF_SEQ_PRINTF(seq, "%s:%d\n", str, epi->ffd.fd);
+ } else {
+ BPF_SEQ_PRINTF(seq, "E\n");
+ }
+ return 0;
+}
+
+char _license[] SEC("license") = "GPL";
--
2.34.1
next prev parent reply other threads:[~2021-12-01 4:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 4:23 [PATCH bpf-next v3 00/10] Introduce BPF iterators for io_uring and epoll Kumar Kartikeya Dwivedi
2021-12-01 4:23 ` [PATCH bpf-next v3 01/10] io_uring: Implement eBPF iterator for registered buffers Kumar Kartikeya Dwivedi
2021-12-01 4:23 ` [PATCH bpf-next v3 02/10] bpf: Add bpf_page_to_pfn helper Kumar Kartikeya Dwivedi
2021-12-01 4:23 ` [PATCH bpf-next v3 03/10] io_uring: Implement eBPF iterator for registered files Kumar Kartikeya Dwivedi
2021-12-01 4:23 ` [PATCH bpf-next v3 04/10] epoll: Implement eBPF iterator for registered items Kumar Kartikeya Dwivedi
2021-12-01 4:23 ` [PATCH bpf-next v3 05/10] bpftool: Output io_uring iterator info Kumar Kartikeya Dwivedi
2021-12-01 4:23 ` [PATCH bpf-next v3 06/10] selftests/bpf: Add test for io_uring BPF iterators Kumar Kartikeya Dwivedi
2021-12-01 4:23 ` Kumar Kartikeya Dwivedi [this message]
2021-12-01 4:23 ` [PATCH bpf-next v3 08/10] selftests/bpf: Test partial reads for io_uring, epoll iterators Kumar Kartikeya Dwivedi
2021-12-01 4:23 ` [PATCH bpf-next v3 09/10] selftests/bpf: Fix btf_dump test for bpf_iter_link_info Kumar Kartikeya Dwivedi
2021-12-01 4:23 ` [PATCH RFC bpf-next v3 10/10] samples/bpf: Add example to checkpoint/restore io_uring Kumar Kartikeya Dwivedi
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 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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