]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bpf, selftests: Fix test_maps now that sockmap supports UDP
authorJohn Fastabend <john.fastabend@gmail.com>
Tue, 20 Jul 2021 18:48:32 +0000 (11:48 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Sep 2021 08:00:38 +0000 (10:00 +0200)
[ Upstream commit c39aa21599748f3845a47645f482d94099b11460 ]

UDP socket support was added recently so testing UDP insert failure is no
longer correct and causes test_maps failure. The fix is easy though, we
simply need to test that UDP is correctly added instead of blocked.

Fixes: 122e6c79efe1c ("sock_map: Update sock type checks for UDP")
Reported-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210720184832.452430-1-john.fastabend@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/bpf/test_maps.c

index 51adc42b2b40e0b9516f2b573aa99e652de377a9..aa38dc4a5e85f0081bc463ffa013e27837d72b51 100644 (file)
@@ -747,8 +747,8 @@ static void test_sockmap(unsigned int tasks, void *data)
        udp = socket(AF_INET, SOCK_DGRAM, 0);
        i = 0;
        err = bpf_map_update_elem(fd, &i, &udp, BPF_ANY);
-       if (!err) {
-               printf("Failed socket SOCK_DGRAM allowed '%i:%i'\n",
+       if (err) {
+               printf("Failed socket update SOCK_DGRAM '%i:%i'\n",
                       i, udp);
                goto out_sockmap;
        }