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 08/11] vsock_test: wait for the remote to close the connection
Date: Wed, 18 Dec 2019 19:07:05 +0100 [thread overview]
Message-ID: <20191218180708.120337-9-sgarzare@redhat.com> (raw)
In-Reply-To: <20191218180708.120337-1-sgarzare@redhat.com>
Before check if a send returns -EPIPE, we need to make sure the
connection is closed.
To do that, we use epoll API to wait EPOLLRDHUP or EPOLLHUP events
on the socket.
Reported-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
v3:
- removed unnecessary control_expectln("CLOSED") [Stefan]
---
tools/testing/vsock/util.c | 39 ++++++++++++++++++++++++++++++++
tools/testing/vsock/util.h | 1 +
tools/testing/vsock/vsock_test.c | 12 ++++++----
3 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/tools/testing/vsock/util.c b/tools/testing/vsock/util.c
index 6026ef3ce512..b132c96c87fc 100644
--- a/tools/testing/vsock/util.c
+++ b/tools/testing/vsock/util.c
@@ -13,6 +13,8 @@
#include <stdlib.h>
#include <signal.h>
#include <unistd.h>
+#include <assert.h>
+#include <sys/epoll.h>
#include "timeout.h"
#include "control.h"
@@ -44,6 +46,43 @@ unsigned int parse_cid(const char *str)
return n;
}
+/* Wait for the remote to close the connection */
+void vsock_wait_remote_close(int fd)
+{
+ struct epoll_event ev;
+ int epollfd, nfds;
+
+ epollfd = epoll_create1(0);
+ if (epollfd == -1) {
+ perror("epoll_create1");
+ exit(EXIT_FAILURE);
+ }
+
+ ev.events = EPOLLRDHUP | EPOLLHUP;
+ ev.data.fd = fd;
+ if (epoll_ctl(epollfd, EPOLL_CTL_ADD, fd, &ev) == -1) {
+ perror("epoll_ctl");
+ exit(EXIT_FAILURE);
+ }
+
+ nfds = epoll_wait(epollfd, &ev, 1, TIMEOUT * 1000);
+ if (nfds == -1) {
+ perror("epoll_wait");
+ exit(EXIT_FAILURE);
+ }
+
+ if (nfds == 0) {
+ fprintf(stderr, "epoll_wait timed out\n");
+ exit(EXIT_FAILURE);
+ }
+
+ assert(nfds == 1);
+ assert(ev.events & (EPOLLRDHUP | EPOLLHUP));
+ assert(ev.data.fd == fd);
+
+ close(epollfd);
+}
+
/* Connect to <cid, port> and return the file descriptor. */
int vsock_stream_connect(unsigned int cid, unsigned int port)
{
diff --git a/tools/testing/vsock/util.h b/tools/testing/vsock/util.h
index 4df12e4b5ebe..331e945f3ae6 100644
--- a/tools/testing/vsock/util.h
+++ b/tools/testing/vsock/util.h
@@ -36,6 +36,7 @@ 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 vsock_wait_remote_close(int fd);
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,
diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
index fae8ddc3ef72..629d7ce58202 100644
--- a/tools/testing/vsock/vsock_test.c
+++ b/tools/testing/vsock/vsock_test.c
@@ -66,7 +66,6 @@ static void test_stream_client_close_client(const struct test_opts *opts)
send_byte(fd, 1, 0);
close(fd);
- control_writeln("CLOSED");
}
static void test_stream_client_close_server(const struct test_opts *opts)
@@ -79,7 +78,10 @@ static void test_stream_client_close_server(const struct test_opts *opts)
exit(EXIT_FAILURE);
}
- control_expectln("CLOSED");
+ /* Wait for the remote to close the connection, before check
+ * -EPIPE error on send.
+ */
+ vsock_wait_remote_close(fd);
send_byte(fd, -EPIPE, 0);
recv_byte(fd, 1, 0);
@@ -97,7 +99,10 @@ static void test_stream_server_close_client(const struct test_opts *opts)
exit(EXIT_FAILURE);
}
- control_expectln("CLOSED");
+ /* Wait for the remote to close the connection, before check
+ * -EPIPE error on send.
+ */
+ vsock_wait_remote_close(fd);
send_byte(fd, -EPIPE, 0);
recv_byte(fd, 1, 0);
@@ -117,7 +122,6 @@ static void test_stream_server_close_server(const struct test_opts *opts)
send_byte(fd, 1, 0);
close(fd);
- control_writeln("CLOSED");
}
/* With the standard socket sizes, VMCI is able to support about 100
--
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 ` [PATCH net-next v3 06/11] VSOCK: add send_byte()/recv_byte() test utilities Stefano Garzarella
2019-12-18 18:07 ` [PATCH net-next v3 07/11] VSOCK: add AF_VSOCK test cases Stefano Garzarella
2019-12-18 18:07 ` Stefano Garzarella [this message]
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-9-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).