selftests: bpf: correct perror strings

perror(str) is basically equivalent to
print("%s: %s\n", str, strerror(errno)).
New line or colon at the end of str is
a mistake/breaks formatting.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c
index 8b838e9..4a85151 100644 (file)
--- a/tools/testing/selftests/bpf/test_sockmap.c
+++ b/tools/testing/selftests/bpf/test_sockmap.c
@@ -240,14 +240,14 @@ static int sockmap_init_sockets(int verbose)
        addr.sin_port = htons(S1_PORT);
        err = bind(s1, (struct sockaddr *)&addr, sizeof(addr));
        if (err < 0) {
-               perror("bind s1 failed()\n");
+               perror("bind s1 failed()");
                return errno;
        }
 
        addr.sin_port = htons(S2_PORT);
        err = bind(s2, (struct sockaddr *)&addr, sizeof(addr));
        if (err < 0) {
-               perror("bind s2 failed()\n");
+               perror("bind s2 failed()");
                return errno;
        }
 
@@ -255,14 +255,14 @@ static int sockmap_init_sockets(int verbose)
        addr.sin_port = htons(S1_PORT);
        err = listen(s1, 32);
        if (err < 0) {
-               perror("listen s1 failed()\n");
+               perror("listen s1 failed()");
                return errno;
        }
 
        addr.sin_port = htons(S2_PORT);
        err = listen(s2, 32);
        if (err < 0) {
-               perror("listen s1 failed()\n");
+               perror("listen s1 failed()");
                return errno;
        }
 
@@ -270,14 +270,14 @@ static int sockmap_init_sockets(int verbose)
        addr.sin_port = htons(S1_PORT);
        err = connect(c1, (struct sockaddr *)&addr, sizeof(addr));
        if (err < 0 && errno != EINPROGRESS) {
-               perror("connect c1 failed()\n");
+               perror("connect c1 failed()");
                return errno;
        }
 
        addr.sin_port = htons(S2_PORT);
        err = connect(c2, (struct sockaddr *)&addr, sizeof(addr));
        if (err < 0 && errno != EINPROGRESS) {
-               perror("connect c2 failed()\n");
+               perror("connect c2 failed()");
                return errno;
        } else if (err < 0) {
                err = 0;
@@ -286,13 +286,13 @@ static int sockmap_init_sockets(int verbose)
        /* Accept Connecrtions */
        p1 = accept(s1, NULL, NULL);
        if (p1 < 0) {
-               perror("accept s1 failed()\n");
+               perror("accept s1 failed()");
                return errno;
        }
 
        p2 = accept(s2, NULL, NULL);
        if (p2 < 0) {
-               perror("accept s1 failed()\n");
+               perror("accept s1 failed()");
                return errno;
        }
 
@@ -353,7 +353,7 @@ static int msg_loop_sendpage(int fd, int iov_length, int cnt,
                int sent = sendfile(fd, fp, NULL, iov_length);
 
                if (!drop && sent < 0) {
-                       perror("send loop error:");
+                       perror("send loop error");
                        close(fp);
                        return sent;
                } else if (drop && sent >= 0) {
@@ -472,7 +472,7 @@ static int msg_loop(int fd, int iov_count, int iov_length, int cnt,
                        int sent = sendmsg(fd, &msg, flags);
 
                        if (!drop && sent < 0) {
-                               perror("send loop error:");
+                               perror("send loop error");
                                goto out_errno;
                        } else if (drop && sent >= 0) {
                                printf("send loop error expected: %i\n", sent);
@@ -508,7 +508,7 @@ static int msg_loop(int fd, int iov_count, int iov_length, int cnt,
                total_bytes -= txmsg_pop_total;
                err = clock_gettime(CLOCK_MONOTONIC, &s->start);
                if (err < 0)
-                       perror("recv start time: ");
+                       perror("recv start time");
                while (s->bytes_recvd < total_bytes) {
                        if (txmsg_cork) {
                                timeout.tv_sec = 0;
@@ -552,7 +552,7 @@ static int msg_loop(int fd, int iov_count, int iov_length, int cnt,
                        if (recv < 0) {
                                if (errno != EWOULDBLOCK) {
                                        clock_gettime(CLOCK_MONOTONIC, &s->end);
-                                       perror("recv failed()\n");
+                                       perror("recv failed()");
                                        goto out_errno;
                                }
                        }
@@ -566,7 +566,7 @@ static int msg_loop(int fd, int iov_count, int iov_length, int cnt,
 
                                errno = msg_verify_data(&msg, recv, chunk_sz);
                                if (errno) {
-                                       perror("data verify msg failed\n");
+                                       perror("data verify msg failed");
                                        goto out_errno;
                                }
                                if (recvp) {
@@ -574,7 +574,7 @@ static int msg_loop(int fd, int iov_count, int iov_length, int cnt,
                                                                recvp,
                                                                chunk_sz);
                                        if (errno) {
-                                               perror("data verify msg_peek failed\n");
+                                               perror("data verify msg_peek failed");
                                                goto out_errno;
                                        }
                                }
@@ -663,7 +663,7 @@ static int sendmsg_test(struct sockmap_options *opt)
                        err = 0;
                exit(err ? 1 : 0);
        } else if (rxpid == -1) {
-               perror("msg_loop_rx: ");
+               perror("msg_loop_rx");
                return errno;
        }
 
@@ -690,7 +690,7 @@ static int sendmsg_test(struct sockmap_options *opt)
                                s.bytes_recvd, recvd_Bps, recvd_Bps/giga);
                exit(err ? 1 : 0);
        } else if (txpid == -1) {
-               perror("msg_loop_tx: ");
+               perror("msg_loop_tx");
                return errno;
        }
 
@@ -724,7 +724,7 @@ static int forever_ping_pong(int rate, struct sockmap_options *opt)
        /* Ping/Pong data from client to server */
        sc = send(c1, buf, sizeof(buf), 0);
        if (sc < 0) {
-               perror("send failed()\n");
+               perror("send failed()");
                return sc;
        }
 
@@ -757,7 +757,7 @@ static int forever_ping_pong(int rate, struct sockmap_options *opt)
                        rc = recv(i, buf, sizeof(buf), 0);
                        if (rc < 0) {
                                if (errno != EWOULDBLOCK) {
-                                       perror("recv failed()\n");
+                                       perror("recv failed()");
                                        return rc;
                                }
                        }
@@ -769,7 +769,7 @@ static int forever_ping_pong(int rate, struct sockmap_options *opt)
 
                        sc = send(i, buf, rc, 0);
                        if (sc < 0) {
-                               perror("send failed()\n");
+                               perror("send failed()");
                                return sc;
                        }
                }

diff --git a/tools/testing/selftests/bpf/xdping.c b/tools/testing/selftests/bpf/xdping.c
index d60a343..842d915 100644 (file)
--- a/tools/testing/selftests/bpf/xdping.c
+++ b/tools/testing/selftests/bpf/xdping.c
@@ -45,7 +45,7 @@ static int get_stats(int fd, __u16 count, __u32 raddr)
        printf("\nXDP RTT data:\n");
 
        if (bpf_map_lookup_elem(fd, &raddr, &pinginfo)) {
-               perror("bpf_map_lookup elem: ");
+               perror("bpf_map_lookup elem");
                return 1;
        }