]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests/bpf: Fix invalid flag of recv()
authorJiayuan Chen <mrpre@163.com>
Wed, 22 Jan 2025 10:09:16 +0000 (18:09 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Mar 2025 19:54:18 +0000 (12:54 -0700)
[ Upstream commit a0c11149509aa905aeec10cf9998091443472b0b ]

SOCK_NONBLOCK flag is only effective during socket creation, not during
recv. Use MSG_DONTWAIT instead.

Signed-off-by: Jiayuan Chen <mrpre@163.com>
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://patch.msgid.link/20250122100917.49845-5-mrpre@163.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/bpf/prog_tests/sockmap_basic.c

index 82bfb266741cfaceafa2a407cd2ccc937708c613..fb08c565d6aadac6a6673c304ceb4c4f58586e8b 100644 (file)
@@ -492,8 +492,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);
@@ -546,7 +546,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)");
        }