VSOCK: add send_byte()/recv_byte() test utilities

Test cases will want to transfer data.  This patch adds utility
functions to do this.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/vsock/util.c b/tools/testing/vsock/util.c
index 4280a56..6026ef3 100644 (file)
--- a/tools/testing/vsock/util.c
+++ b/tools/testing/vsock/util.c
@@ -9,6 +9,7 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <unistd.h>
@@ -149,6 +150,108 @@ int vsock_stream_accept(unsigned int cid, unsigned int port,
        return client_fd;
 }
 
+/* Transmit one byte and check the return value.
+ *
+ * expected_ret:
+ *  <0 Negative errno (for testing errors)
+ *   0 End-of-file
+ *   1 Success
+ */
+void send_byte(int fd, int expected_ret, int flags)
+{
+       const uint8_t byte = 'A';
+       ssize_t nwritten;
+
+       timeout_begin(TIMEOUT);
+       do {
+               nwritten = send(fd, &byte, sizeof(byte), flags);
+               timeout_check("write");
+       } while (nwritten < 0 && errno == EINTR);
+       timeout_end();
+
+       if (expected_ret < 0) {
+               if (nwritten != -1) {
+                       fprintf(stderr, "bogus send(2) return value %zd\n",
+                               nwritten);
+                       exit(EXIT_FAILURE);
+               }
+               if (errno != -expected_ret) {
+                       perror("write");
+                       exit(EXIT_FAILURE);
+               }
+               return;
+       }
+
+       if (nwritten < 0) {
+               perror("write");
+               exit(EXIT_FAILURE);
+       }
+       if (nwritten == 0) {
+               if (expected_ret == 0)
+                       return;
+
+               fprintf(stderr, "unexpected EOF while sending byte\n");
+               exit(EXIT_FAILURE);
+       }
+       if (nwritten != sizeof(byte)) {
+               fprintf(stderr, "bogus send(2) return value %zd\n", nwritten);
+               exit(EXIT_FAILURE);
+       }
+}
+
+/* Receive one byte and check the return value.
+ *
+ * expected_ret:
+ *  <0 Negative errno (for testing errors)
+ *   0 End-of-file
+ *   1 Success
+ */
+void recv_byte(int fd, int expected_ret, int flags)
+{
+       uint8_t byte;
+       ssize_t nread;
+
+       timeout_begin(TIMEOUT);
+       do {
+               nread = recv(fd, &byte, sizeof(byte), flags);
+               timeout_check("read");
+       } while (nread < 0 && errno == EINTR);
+       timeout_end();
+
+       if (expected_ret < 0) {
+               if (nread != -1) {
+                       fprintf(stderr, "bogus recv(2) return value %zd\n",
+                               nread);
+                       exit(EXIT_FAILURE);
+               }
+               if (errno != -expected_ret) {
+                       perror("read");
+                       exit(EXIT_FAILURE);
+               }
+               return;
+       }
+
+       if (nread < 0) {
+               perror("read");
+               exit(EXIT_FAILURE);
+       }
+       if (nread == 0) {
+               if (expected_ret == 0)
+                       return;
+
+               fprintf(stderr, "unexpected EOF while receiving byte\n");
+               exit(EXIT_FAILURE);
+       }
+       if (nread != sizeof(byte)) {
+               fprintf(stderr, "bogus recv(2) return value %zd\n", nread);
+               exit(EXIT_FAILURE);
+       }
+       if (byte != 'A') {
+               fprintf(stderr, "unexpected byte read %c\n", byte);
+               exit(EXIT_FAILURE);
+       }
+}
+
 /* Run test cases.  The program terminates if a failure occurs. */
 void run_tests(const struct test_case *test_cases,
               const struct test_opts *opts)

diff --git a/tools/testing/vsock/util.h b/tools/testing/vsock/util.h
index 1786305..4df12e4 100644 (file)
--- a/tools/testing/vsock/util.h
+++ b/tools/testing/vsock/util.h
@@ -36,6 +36,8 @@ unsigned int parse_cid(const char *str);
 int vsock_stream_connect(unsigned int cid, unsigned int port);
 int vsock_stream_accept(unsigned int cid, unsigned int port,
                        struct sockaddr_vm *clientaddrp);
+void send_byte(int fd, int expected_ret, int flags);
+void recv_byte(int fd, int expected_ret, int flags);
 void run_tests(const struct test_case *test_cases,
               const struct test_opts *opts);