[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <i7a2alvtk5v2s3zgui3alv5dta34erwpwj44rdz5moulmc7iud@i4w7l3cinltl>
Date: Wed, 22 Jan 2025 16:39:51 +0100
From: Luigi Leonardi <leonardi@...hat.com>
To: Michal Luczaj <mhal@...x.co>
Cc: Stefano Garzarella <sgarzare@...hat.com>,
"David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Simon Horman <horms@...nel.org>,
George Zhang <georgezhang@...are.com>, Dmitry Torokhov <dtor@...are.com>, Andy King <acking@...are.com>,
netdev@...r.kernel.org
Subject: Re: [PATCH net v2 6/6] vsock/test: Add test for connect() retries
On Tue, Jan 21, 2025 at 03:44:07PM +0100, Michal Luczaj wrote:
>Deliberately fail a connect() attempt; expect error. Then verify that
>subsequent attempt (using the same socket) can still succeed, rather than
>fail outright.
>
>Signed-off-by: Michal Luczaj <mhal@...x.co>
>---
> tools/testing/vsock/vsock_test.c | 47 ++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 47 insertions(+)
>
>diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
>index 572e0fd3e5a841f846fb304a24192f63d57ec052..5cac08d909fe495aec5ddc9f3779432f9e0dc2b8 100644
>--- a/tools/testing/vsock/vsock_test.c
>+++ b/tools/testing/vsock/vsock_test.c
>@@ -1511,6 +1511,48 @@ static void test_stream_transport_uaf_server(const struct test_opts *opts)
> control_expectln("DONE");
> }
>
>+static void test_stream_connect_retry_client(const struct test_opts *opts)
>+{
>+ int fd;
>+
>+ fd = socket(AF_VSOCK, SOCK_STREAM, 0);
>+ if (fd < 0) {
>+ perror("socket");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ if (!vsock_connect_fd(fd, opts->peer_cid, opts->peer_port)) {
>+ fprintf(stderr, "Unexpected connect() #1 success\n");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ control_writeln("LISTEN");
>+ control_expectln("LISTENING");
>+
>+ if (vsock_connect_fd(fd, opts->peer_cid, opts->peer_port)) {
>+ perror("connect() #2");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ close(fd);
>+}
>+
>+static void test_stream_connect_retry_server(const struct test_opts *opts)
>+{
>+ int fd;
>+
>+ control_expectln("LISTEN");
>+
>+ fd = vsock_stream_accept(VMADDR_CID_ANY, opts->peer_port, NULL);
>+ if (fd < 0) {
>+ perror("accept");
>+ exit(EXIT_FAILURE);
>+ }
>+
>+ vsock_wait_remote_close(fd);
>+ close(fd);
>+}
>+
> static struct test_case test_cases[] = {
> {
> .name = "SOCK_STREAM connection reset",
>@@ -1646,6 +1688,11 @@ static struct test_case test_cases[] = {
> .run_client = test_stream_transport_uaf_client,
> .run_server = test_stream_transport_uaf_server,
> },
>+ {
>+ .name = "SOCK_STREAM retry failed connect()",
>+ .run_client = test_stream_connect_retry_client,
>+ .run_server = test_stream_connect_retry_server,
>+ },
> {},
> };
>
>
>--
>2.48.1
>
LGTM!
Reviewed-by: Luigi Leonardi <leonardi@...hat.com>
Powered by blists - more mailing lists