[PATCH bpf-next v3 1/4] selftests/bpf: Use log_err in network_helpers

[Geliang Tang]

From: Geliang Tang <tanggeli...@kylinos.cn>

The helpers ASSERT_OK/GE/OK_PTR should avoid using in public functions.
This patch uses log_err() to replace them in network_helpers.c.

And drop '#include "test_progs.h"' in it, include <pthread.h> and
<sys/param.h> instead.

Signed-off-by: Geliang Tang <tanggeli...@kylinos.cn>
---
 tools/testing/selftests/bpf/network_helpers.c | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/bpf/network_helpers.c 
b/tools/testing/selftests/bpf/network_helpers.c
index 04175e16195a..dbcbe2ac51ba 100644
--- a/tools/testing/selftests/bpf/network_helpers.c
+++ b/tools/testing/selftests/bpf/network_helpers.c
@@ -7,11 +7,13 @@
 #include <string.h>
 #include <unistd.h>
 #include <sched.h>
+#include <pthread.h>
 
 #include <arpa/inet.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/un.h>
+#include <sys/param.h>
 
 #include <linux/err.h>
 #include <linux/in.h>
@@ -20,7 +22,6 @@
 
 #include "bpf_util.h"
 #include "network_helpers.h"
-#include "test_progs.h"
 
 #ifndef IPPROTO_MPTCP
 #define IPPROTO_MPTCP 262
@@ -442,22 +443,30 @@ struct nstoken *open_netns(const char *name)
        struct nstoken *token;
 
        token = calloc(1, sizeof(struct nstoken));
-       if (!ASSERT_OK_PTR(token, "malloc token"))
+       if (!token) {
+               log_err("malloc token");
                return NULL;
+       }
 
        token->orig_netns_fd = open("/proc/self/ns/net", O_RDONLY);
-       if (!ASSERT_GE(token->orig_netns_fd, 0, "open /proc/self/ns/net"))
+       if (token->orig_netns_fd <= 0) {
+               log_err("open /proc/self/ns/net");
                goto fail;
+       }
 
        snprintf(nspath, sizeof(nspath), "%s/%s", "/var/run/netns", name);
        nsfd = open(nspath, O_RDONLY | O_CLOEXEC);
-       if (!ASSERT_GE(nsfd, 0, "open netns fd"))
+       if (nsfd <= 0) {
+               log_err("open netns fd");
                goto fail;
+       }
 
        err = setns(nsfd, CLONE_NEWNET);
        close(nsfd);
-       if (!ASSERT_OK(err, "setns"))
+       if (err) {
+               log_err("setns");
                goto fail;
+       }
 
        return token;
 fail:
@@ -470,7 +479,8 @@ void close_netns(struct nstoken *token)
        if (!token)
                return;
 
-       ASSERT_OK(setns(token->orig_netns_fd, CLONE_NEWNET), "setns");
+       if (setns(token->orig_netns_fd, CLONE_NEWNET))
+               log_err("setns");
        close(token->orig_netns_fd);
        free(token);
 }
-- 
2.40.1