From: Jiayuan Chen <mrpre@163.com>
To: bpf@vger.kernel.org, jakub@cloudflare.com, john.fastabend@gmail.com
Cc: netdev@vger.kernel.org, martin.lau@linux.dev, ast@kernel.org,
edumazet@google.com, davem@davemloft.net, dsahern@kernel.org,
kuba@kernel.org, pabeni@redhat.com, linux-kernel@vger.kernel.org,
song@kernel.org, andrii@kernel.org, mhal@rbox.co,
yonghong.song@linux.dev, daniel@iogearbox.net,
xiyou.wangcong@gmail.com, horms@kernel.org, corbet@lwn.net,
eddyz87@gmail.com, cong.wang@bytedance.com, shuah@kernel.org,
mykolal@fb.com, jolsa@kernel.org, haoluo@google.com,
sdf@fomichev.me, kpsingh@kernel.org, linux-doc@vger.kernel.org,
linux-kselftest@vger.kernel.org, Jiayuan Chen <mrpre@163.com>
Subject: [PATCH bpf v9 4/5] selftests/bpf: fix invalid flag of recv()
Date: Wed, 22 Jan 2025 18:09:16 +0800 [thread overview]
Message-ID: <20250122100917.49845-5-mrpre@163.com> (raw)
In-Reply-To: <20250122100917.49845-1-mrpre@163.com>
SOCK_NONBLOCK flag is only effective during socket creation, not during
recv. Use MSG_DONTWAIT instead.
Signed-off-by: Jiayuan Chen <mrpre@163.com>
---
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
index 884ad87783d5..0c51b7288978 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
@@ -522,8 +522,8 @@ static void test_sockmap_skb_verdict_shutdown(void)
if (!ASSERT_EQ(err, 1, "epoll_wait(fd)"))
goto out_close;
- n = recv(c1, &b, 1, SOCK_NONBLOCK);
- ASSERT_EQ(n, 0, "recv_timeout(fin)");
+ n = recv(c1, &b, 1, MSG_DONTWAIT);
+ ASSERT_EQ(n, 0, "recv(fin)");
out_close:
close(c1);
close(p1);
@@ -628,7 +628,7 @@ static void test_sockmap_skb_verdict_fionread(bool pass_prog)
ASSERT_EQ(avail, expected, "ioctl(FIONREAD)");
/* On DROP test there will be no data to read */
if (pass_prog) {
- recvd = recv_timeout(c1, &buf, sizeof(buf), SOCK_NONBLOCK, IO_TIMEOUT_SEC);
+ recvd = recv_timeout(c1, &buf, sizeof(buf), MSG_DONTWAIT, IO_TIMEOUT_SEC);
ASSERT_EQ(recvd, sizeof(buf), "recv_timeout(c0)");
}
--
2.43.5
next prev parent reply other threads:[~2025-01-22 10:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-22 10:09 [PATCH bpf v9 0/5] bpf: fix wrong copied_seq calculation and add tests Jiayuan Chen
2025-01-22 10:09 ` [PATCH bpf v9 1/5] strparser: add read_sock callback Jiayuan Chen
2025-01-26 14:03 ` Jakub Sitnicki
2025-01-22 10:09 ` [PATCH bpf v9 2/5] bpf: fix wrong copied_seq calculation Jiayuan Chen
2025-01-26 14:10 ` Jakub Sitnicki
2025-01-22 10:09 ` [PATCH bpf v9 3/5] bpf: disable non stream socket for strparser Jiayuan Chen
2025-01-26 14:11 ` Jakub Sitnicki
2025-01-22 10:09 ` Jiayuan Chen [this message]
2025-01-26 14:12 ` [PATCH bpf v9 4/5] selftests/bpf: fix invalid flag of recv() Jakub Sitnicki
2025-01-22 10:09 ` [PATCH bpf v9 5/5] selftests/bpf: add strparser test for bpf Jiayuan Chen
2025-01-26 14:15 ` Jakub Sitnicki
2025-01-26 14:16 ` [PATCH bpf v9 0/5] bpf: fix wrong copied_seq calculation and add tests Jakub Sitnicki
2025-01-27 16:04 ` John Fastabend
2025-01-29 22:00 ` patchwork-bot+netdevbpf
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=20250122100917.49845-5-mrpre@163.com \
--to=mrpre@163.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=cong.wang@bytedance.com \
--cc=corbet@lwn.net \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=eddyz87@gmail.com \
--cc=edumazet@google.com \
--cc=haoluo@google.com \
--cc=horms@kernel.org \
--cc=jakub@cloudflare.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mhal@rbox.co \
--cc=mykolal@fb.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@fomichev.me \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=xiyou.wangcong@gmail.com \
--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).