[PATCH bpf v3 3/4] selftests/bpf: Adapt sockmap update error handling

[Michal Luczaj]

Update sockmap_listen to accommodate the recent change in sockmap that
rejects unbound UDP sockets.

TCP: Reject unbound and bound (unless established or listening).
UDP: Accept only bound sockets.

While at it, migrate to ASSERT_* and enforce reverse xmas tree.

Reviewed-by: Kuniyuki Iwashima <kun...@google.com>
Signed-off-by: Michal Luczaj <m...@rbox.co>
---
 .../selftests/bpf/prog_tests/sockmap_listen.c       | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c 
b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
index cc0c68bab907..b87118aab7c4 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
@@ -53,8 +53,8 @@ static void test_insert_opened(struct test_sockmap_listen 
*skel __always_unused,
                               int family, int sotype, int mapfd)
 {
        u32 key = 0;
-       u64 value;
        int err, s;
+       u64 value;
 
        s = xsocket(family, sotype, 0);
        if (s == -1)
@@ -63,11 +63,8 @@ static void test_insert_opened(struct test_sockmap_listen 
*skel __always_unused,
        errno = 0;
        value = s;
        err = bpf_map_update_elem(mapfd, &key, &value, BPF_NOEXIST);
-       if (sotype == SOCK_STREAM) {
-               if (!err || errno != EOPNOTSUPP)
-                       FAIL_ERRNO("map_update: expected EOPNOTSUPP");
-       } else if (err)
-               FAIL_ERRNO("map_update: expected success");
+       ASSERT_ERR(err, "map_update");
+       ASSERT_EQ(errno, EOPNOTSUPP, "errno");
        xclose(s);
 }
 
@@ -77,8 +74,8 @@ static void test_insert_bound(struct test_sockmap_listen 
*skel __always_unused,
        struct sockaddr_storage addr;
        socklen_t len = 0;
        u32 key = 0;
-       u64 value;
        int err, s;
+       u64 value;
 
        init_addr_loopback(family, &addr, &len);
 
@@ -93,8 +90,12 @@ static void test_insert_bound(struct test_sockmap_listen 
*skel __always_unused,
        errno = 0;
        value = s;
        err = bpf_map_update_elem(mapfd, &key, &value, BPF_NOEXIST);
-       if (!err || errno != EOPNOTSUPP)
-               FAIL_ERRNO("map_update: expected EOPNOTSUPP");
+       if (sotype == SOCK_STREAM) {
+               ASSERT_ERR(err, "map_update");
+               ASSERT_EQ(errno, EOPNOTSUPP, "errno");
+       } else if (err) {
+               ASSERT_OK(err, "map_update");
+       }
 close:
        xclose(s);
 }
@@ -1289,7 +1290,7 @@ static void test_ops(struct test_sockmap_listen *skel, 
struct bpf_map *map,
                /* insert */
                TEST(test_insert_invalid),
                TEST(test_insert_opened),
-               TEST(test_insert_bound, SOCK_STREAM),
+               TEST(test_insert_bound),
                TEST(test_insert),
                /* delete */
                TEST(test_delete_after_insert),

-- 
2.54.0