| Message ID | 6981b132-4121-62d8-7172-dca28ad1e498@sberdevices.ru (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On Fri, Mar 11, 2022 at 10:55:42AM +0000, Krasnov Arseniy Vladimirovich wrote: >Test for receive timeout check: connection is established, >receiver sets timeout, but sender does nothing. Receiver's >'read()' call must return EAGAIN. > >Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> >--- > 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 2a3638c0a008..aa2de27d0f77 100644 >--- a/tools/testing/vsock/vsock_test.c >+++ b/tools/testing/vsock/vsock_test.c >@@ -391,6 +391,50 @@ static void test_seqpacket_msg_trunc_server(const struct test_opts *opts) > close(fd); > } > >+static void test_seqpacket_timeout_client(const struct test_opts *opts) >+{ >+ int fd; >+ struct timeval tv; >+ char dummy; >+ >+ fd = vsock_seqpacket_connect(opts->peer_cid, 1234); >+ if (fd < 0) { >+ perror("connect"); >+ exit(EXIT_FAILURE); >+ } >+ >+ tv.tv_sec = 1; >+ tv.tv_usec = 0; >+ >+ if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (void *)&tv, sizeof(tv)) == -1) { >+ perror("setsockopt 'SO_RCVTIMEO'"); >+ exit(EXIT_FAILURE); >+ } >+ >+ if ((read(fd, &dummy, sizeof(dummy)) != -1) || >+ (errno != EAGAIN)) { >+ perror("EAGAIN expected"); >+ exit(EXIT_FAILURE); >+ } The patch LGTM, maybe the only thing I would add here is a check on the time spent in the read(), to see that it is approximately the timeout we have set. Thanks, Stefano
On 15.03.2022 11:15, Stefano Garzarella wrote: > On Fri, Mar 11, 2022 at 10:55:42AM +0000, Krasnov Arseniy Vladimirovich wrote: >> Test for receive timeout check: connection is established, >> receiver sets timeout, but sender does nothing. Receiver's >> 'read()' call must return EAGAIN. >> >> Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> >> --- >> 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 2a3638c0a008..aa2de27d0f77 100644 >> --- a/tools/testing/vsock/vsock_test.c >> +++ b/tools/testing/vsock/vsock_test.c >> @@ -391,6 +391,50 @@ static void test_seqpacket_msg_trunc_server(const struct test_opts *opts) >> close(fd); >> } >> >> +static void test_seqpacket_timeout_client(const struct test_opts *opts) >> +{ >> + int fd; >> + struct timeval tv; >> + char dummy; >> + >> + fd = vsock_seqpacket_connect(opts->peer_cid, 1234); >> + if (fd < 0) { >> + perror("connect"); >> + exit(EXIT_FAILURE); >> + } >> + >> + tv.tv_sec = 1; >> + tv.tv_usec = 0; >> + >> + if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (void *)&tv, sizeof(tv)) == -1) { >> + perror("setsockopt 'SO_RCVTIMEO'"); >> + exit(EXIT_FAILURE); >> + } >> + >> + if ((read(fd, &dummy, sizeof(dummy)) != -1) || >> + (errno != EAGAIN)) { >> + perror("EAGAIN expected"); >> + exit(EXIT_FAILURE); >> + } > > The patch LGTM, maybe the only thing I would add here is a check on the time spent in the read(), to see that it is approximately the timeout we have set. Ack, I'll add it on v2 > > Thanks, > Stefano >
diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c index 2a3638c0a008..aa2de27d0f77 100644 --- a/tools/testing/vsock/vsock_test.c +++ b/tools/testing/vsock/vsock_test.c @@ -391,6 +391,50 @@ static void test_seqpacket_msg_trunc_server(const struct test_opts *opts) close(fd); } +static void test_seqpacket_timeout_client(const struct test_opts *opts) +{ + int fd; + struct timeval tv; + char dummy; + + fd = vsock_seqpacket_connect(opts->peer_cid, 1234); + if (fd < 0) { + perror("connect"); + exit(EXIT_FAILURE); + } + + tv.tv_sec = 1; + tv.tv_usec = 0; + + if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (void *)&tv, sizeof(tv)) == -1) { + perror("setsockopt 'SO_RCVTIMEO'"); + exit(EXIT_FAILURE); + } + + if ((read(fd, &dummy, sizeof(dummy)) != -1) || + (errno != EAGAIN)) { + perror("EAGAIN expected"); + exit(EXIT_FAILURE); + } + + control_writeln("WAITDONE"); + close(fd); +} + +static void test_seqpacket_timeout_server(const struct test_opts *opts) +{ + int fd; + + fd = vsock_seqpacket_accept(VMADDR_CID_ANY, 1234, NULL); + if (fd < 0) { + perror("accept"); + exit(EXIT_FAILURE); + } + + control_expectln("WAITDONE"); + close(fd); +} + static struct test_case test_cases[] = { { .name = "SOCK_STREAM connection reset", @@ -431,6 +475,11 @@ static struct test_case test_cases[] = { .run_client = test_seqpacket_msg_trunc_client, .run_server = test_seqpacket_msg_trunc_server, }, + { + .name = "SOCK_SEQPACKET timeout", + .run_client = test_seqpacket_timeout_client, + .run_server = test_seqpacket_timeout_server, + }, {}, };
Test for receive timeout check: connection is established, receiver sets timeout, but sender does nothing. Receiver's 'read()' call must return EAGAIN. Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> --- tools/testing/vsock/vsock_test.c | 49 ++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+)