[PATCH net-next v5 5/5] vsock/test: Add test for an unexpectedly lingering close()

[Michal Luczaj]

There was an issue with SO_LINGER: instead of blocking until all queued
messages for the socket have been successfully sent (or the linger timeout
has been reached), close() would block until packets were handled by the
peer.

Add a test to alert on close() lingering when it should not.

Signed-off-by: Michal Luczaj <m...@rbox.co>
---
 tools/testing/vsock/vsock_test.c | 49 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
index 
f401c6a79495bc7fda97012e5bfeabec7dbfb60a..1040503333cf315e52592c876f2c1809b36fdfdb
 100644
--- a/tools/testing/vsock/vsock_test.c
+++ b/tools/testing/vsock/vsock_test.c
@@ -1839,6 +1839,50 @@ static void test_stream_linger_server(const struct 
test_opts *opts)
        close(fd);
 }
 
+static void test_stream_nolinger_client(const struct test_opts *opts)
+{
+       bool nowait;
+       time_t ns;
+       int fd;
+
+       fd = vsock_stream_connect(opts->peer_cid, opts->peer_port);
+       if (fd < 0) {
+               perror("connect");
+               exit(EXIT_FAILURE);
+       }
+
+       enable_so_linger(fd);
+       send_byte(fd, 1, 0); /* Left unread to expose incorrect behaviour. */
+       nowait = vsock_wait_sent(fd);
+
+       ns = current_nsec();
+       close(fd);
+       ns = current_nsec() - ns;
+
+       if (nowait) {
+               fprintf(stderr, "Test skipped, SIOCOUTQ not supported.\n");
+       } else if ((ns + NSEC_PER_SEC - 1) / NSEC_PER_SEC >= LINGER_TIMEOUT) {
+               fprintf(stderr, "Unexpected lingering\n");
+               exit(EXIT_FAILURE);
+       }
+
+       control_writeln("DONE");
+}
+
+static void test_stream_nolinger_server(const struct test_opts *opts)
+{
+       int fd;
+
+       fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL);
+       if (fd < 0) {
+               perror("accept");
+               exit(EXIT_FAILURE);
+       }
+
+       control_expectln("DONE");
+       close(fd);
+}
+
 static struct test_case test_cases[] = {
        {
                .name = "SOCK_STREAM connection reset",
@@ -1999,6 +2043,11 @@ static struct test_case test_cases[] = {
                .run_client = test_stream_linger_client,
                .run_server = test_stream_linger_server,
        },
+       {
+               .name = "SOCK_STREAM SO_LINGER close() on unread",
+               .run_client = test_stream_nolinger_client,
+               .run_server = test_stream_nolinger_server,
+       },
        {},
 };
 

-- 
2.49.0