From: Stefano Garzarella <sgarzare@redhat.com>
To: davem@davemloft.net
Cc: Jorgen Hansen <jhansen@vmware.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Stefan Hajnoczi <stefanha@redhat.com>,
Dexuan Cui <decui@microsoft.com>,
netdev@vger.kernel.org,
virtualization@lists.linux-foundation.org,
Stefano Garzarella <sgarzare@redhat.com>
Subject: [PATCH net-next v3 06/11] VSOCK: add send_byte()/recv_byte() test utilities
Date: Wed, 18 Dec 2019 19:07:03 +0100 [thread overview]
Message-ID: <20191218180708.120337-7-sgarzare@redhat.com> (raw)
In-Reply-To: <20191218180708.120337-1-sgarzare@redhat.com>
From: Stefan Hajnoczi <stefanha@redhat.com>
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>
---
v3:
* check the byte received in the recv_byte()
* use send(2)/recv(2) instead of write(2)/read(2) to test also flags
(e.g. MSG_PEEK)
---
tools/testing/vsock/util.c | 103 +++++++++++++++++++++++++++++++++++++
tools/testing/vsock/util.h | 2 +
2 files changed, 105 insertions(+)
diff --git a/tools/testing/vsock/util.c b/tools/testing/vsock/util.c
index 4280a56ba677..6026ef3ce512 100644
--- 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 1786305cfddd..4df12e4b5ebe 100644
--- 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);
--
2.24.1
next prev parent reply other threads:[~2019-12-18 18:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 18:06 [PATCH net-next v3 00/11] VSOCK: add vsock_test test suite Stefano Garzarella
2019-12-18 18:06 ` [PATCH net-next v3 01/11] VSOCK: fix header include in vsock_diag_test Stefano Garzarella
2019-12-18 18:06 ` [PATCH net-next v3 02/11] VSOCK: add SPDX identifiers to vsock tests Stefano Garzarella
2019-12-18 18:07 ` [PATCH net-next v3 03/11] VSOCK: extract utility functions from vsock_diag_test.c Stefano Garzarella
2019-12-18 18:07 ` [PATCH net-next v3 04/11] VSOCK: extract connect/accept " Stefano Garzarella
2019-12-18 18:07 ` [PATCH net-next v3 05/11] VSOCK: add full barrier between test cases Stefano Garzarella
2019-12-18 18:07 ` Stefano Garzarella [this message]
2019-12-18 18:07 ` [PATCH net-next v3 07/11] VSOCK: add AF_VSOCK " Stefano Garzarella
2019-12-18 18:07 ` [PATCH net-next v3 08/11] vsock_test: wait for the remote to close the connection Stefano Garzarella
2019-12-18 18:07 ` [PATCH net-next v3 09/11] testing/vsock: add parameters to list and skip tests Stefano Garzarella
2019-12-18 18:07 ` [PATCH net-next v3 10/11] testing/vsock: print list of options and description Stefano Garzarella
2019-12-18 18:07 ` [PATCH net-next v3 11/11] vsock_test: add SOCK_STREAM MSG_PEEK test Stefano Garzarella
2019-12-19 11:11 ` [PATCH net-next v3 00/11] VSOCK: add vsock_test test suite Stefan Hajnoczi
2019-12-21 5:10 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191218180708.120337-7-sgarzare@redhat.com \
--to=sgarzare@redhat.com \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=jhansen@vmware.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).