From: Liu Jian <liujian56@huawei.com>
To: <john.fastabend@gmail.com>, <jakub@cloudflare.com>,
<ast@kernel.org>, <daniel@iogearbox.net>, <andrii@kernel.org>,
<martin.lau@linux.dev>, <song@kernel.org>,
<yonghong.song@linux.dev>, <kpsingh@kernel.org>, <sdf@google.com>,
<haoluo@google.com>, <jolsa@kernel.org>, <davem@davemloft.net>,
<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
<dsahern@kernel.org>
Cc: <netdev@vger.kernel.org>, <bpf@vger.kernel.org>, <liujian56@huawei.com>
Subject: [PATCH bpf-next v4 7/7] selftests/bpf: add tests for verdict skmsg to closed socket
Date: Sat, 2 Sep 2023 18:07:44 +0800 [thread overview]
Message-ID: <20230902100744.2687785-8-liujian56@huawei.com> (raw)
In-Reply-To: <20230902100744.2687785-1-liujian56@huawei.com>
Add four tests for verdict skmsg to closed socket in sockmap_basic.c.
Signed-off-by: Liu Jian <liujian56@huawei.com>
---
.../selftests/bpf/prog_tests/sockmap_basic.c | 42 +++++++++++++++----
1 file changed, 34 insertions(+), 8 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
index 1fcfa30720c6..dabea0997982 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
@@ -476,9 +476,10 @@ static void test_sockmap_skb_verdict_fionread(bool pass_prog)
test_sockmap_drop_prog__destroy(drop);
}
-static void test_sockmap_msg_verdict(bool is_ingress, bool is_permanent, bool is_self)
+static void test_sockmap_msg_verdict(bool is_ingress, bool is_permanent, bool is_self,
+ bool target_shutdown)
{
- int key, sent, recvd, recv_fd;
+ int key, sent, recvd, recv_fd, target_fd;
int err, map, verdict, s, c0, c1, p0, p1;
struct test_sockmap_msg_verdict *skel;
char buf[256] = "0123456789";
@@ -522,18 +523,22 @@ static void test_sockmap_msg_verdict(bool is_ingress, bool is_permanent, bool is
skel->bss->skmsg_redir_flags = BPF_F_INGRESS;
if (is_self) {
skel->bss->skmsg_redir_key = 0;
+ target_fd = p1;
recv_fd = p1;
} else {
skel->bss->skmsg_redir_key = 1;
+ target_fd = c1;
recv_fd = c1;
}
} else {
skel->bss->skmsg_redir_flags = 0;
if (is_self) {
skel->bss->skmsg_redir_key = 0;
+ target_fd = p1;
recv_fd = c1;
} else {
skel->bss->skmsg_redir_key = 2;
+ target_fd = p0;
recv_fd = c0;
}
}
@@ -546,6 +551,19 @@ static void test_sockmap_msg_verdict(bool is_ingress, bool is_permanent, bool is
recvd = recv_timeout(recv_fd, &buf, sizeof(buf), SOCK_NONBLOCK, IO_TIMEOUT_SEC);
ASSERT_EQ(recvd, sizeof(buf), "recv_timeout(recv_fd)");
+ if (target_shutdown) {
+ signal(SIGPIPE, SIG_IGN);
+ close(target_fd);
+ sent = send(p1, &buf, sizeof(buf), 0);
+ if (is_permanent) {
+ ASSERT_EQ(sent, -1, "xsend(p1)");
+ ASSERT_EQ(errno, EPIPE, "xsend(p1)");
+ } else {
+ ASSERT_EQ(sent, sizeof(buf), "xsend(p1)");
+ }
+ goto out_close;
+ }
+
sent = xsend(p1, &buf, sizeof(buf), 0);
ASSERT_EQ(sent, sizeof(buf), "xsend(p1)");
recvd = recv_timeout(recv_fd, &buf, sizeof(buf), SOCK_NONBLOCK, IO_TIMEOUT_SEC);
@@ -600,15 +618,23 @@ void test_sockmap_basic(void)
if (test__start_subtest("sockmap skb_verdict fionread on drop"))
test_sockmap_skb_verdict_fionread(false);
if (test__start_subtest("sockmap msg_verdict"))
- test_sockmap_msg_verdict(false, false, false);
+ test_sockmap_msg_verdict(false, false, false, false);
if (test__start_subtest("sockmap msg_verdict ingress"))
- test_sockmap_msg_verdict(true, false, false);
+ test_sockmap_msg_verdict(true, false, false, false);
if (test__start_subtest("sockmap msg_verdict permanent"))
- test_sockmap_msg_verdict(false, true, false);
+ test_sockmap_msg_verdict(false, true, false, false);
if (test__start_subtest("sockmap msg_verdict ingress permanent"))
- test_sockmap_msg_verdict(true, true, false);
+ test_sockmap_msg_verdict(true, true, false, false);
if (test__start_subtest("sockmap msg_verdict permanent self"))
- test_sockmap_msg_verdict(false, true, true);
+ test_sockmap_msg_verdict(false, true, true, false);
if (test__start_subtest("sockmap msg_verdict ingress permanent self"))
- test_sockmap_msg_verdict(true, true, true);
+ test_sockmap_msg_verdict(true, true, true, false);
+ if (test__start_subtest("sockmap msg_verdict permanent shutdown"))
+ test_sockmap_msg_verdict(false, true, false, true);
+ if (test__start_subtest("sockmap msg_verdict ingress permanent shutdown"))
+ test_sockmap_msg_verdict(true, true, false, true);
+ if (test__start_subtest("sockmap msg_verdict shutdown"))
+ test_sockmap_msg_verdict(false, false, false, true);
+ if (test__start_subtest("sockmap msg_verdict ingress shutdown"))
+ test_sockmap_msg_verdict(true, false, false, true);
}
--
2.34.1
next prev parent reply other threads:[~2023-09-02 10:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-02 10:07 [PATCH bpf-next v4 0/7] add BPF_F_PERMANENT flag for sockmap skmsg redirect Liu Jian
2023-09-02 10:07 ` [PATCH bpf-next v4 1/7] bpf, sockmap: add BPF_F_PERMANENT flag for " Liu Jian
2023-09-02 10:07 ` [PATCH bpf-next v4 2/7] selftests/bpf: Add txmsg permanently test for sockmap Liu Jian
2023-09-02 10:07 ` [PATCH bpf-next v4 3/7] selftests/bpf: Add txmsg redir " Liu Jian
2023-09-02 10:07 ` [PATCH bpf-next v4 4/7] selftests/bpf: add skmsg verdict tests Liu Jian
2023-09-02 10:07 ` [PATCH bpf-next v4 5/7] selftests/bpf: add two skmsg verdict tests for BPF_F_PERMANENT flag Liu Jian
2023-09-02 10:07 ` [PATCH bpf-next v4 6/7] selftests/bpf: add tests for verdict skmsg to itself Liu Jian
2023-09-02 10:07 ` Liu Jian [this message]
2023-09-08 12:29 ` [PATCH bpf-next v4 0/7] add BPF_F_PERMANENT flag for sockmap skmsg redirect Jakub Sitnicki
2023-09-08 13:45 ` Daniel Borkmann
2023-09-12 17:21 ` Jakub Sitnicki
2023-09-15 1:05 ` liujian (CE)
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=20230902100744.2687785-8-liujian56@huawei.com \
--to=liujian56@huawei.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=haoluo@google.com \
--cc=jakub@cloudflare.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=martin.lau@linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@google.com \
--cc=song@kernel.org \
--cc=yonghong.song@linux.dev \
/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).