| Message ID | 20240527-shutdown-v1-1-1feffca5e3df@suse.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | shutdown testing suite | expand |
Hi Andrea, ... > diff --git a/testcases/kernel/syscalls/shutdown/shutdown01.c b/testcases/kernel/syscalls/shutdown/shutdown01.c > new file mode 100644 > index 000000000..b68b14ae8 > --- /dev/null > +++ b/testcases/kernel/syscalls/shutdown/shutdown01.c > @@ -0,0 +1,136 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com> > + */ > + > +/*\ > + * [Description] > + * > + * This test verifies the following shutdown() functionalities: nit: here needs to be blank line to get list formatting. > + * * SHUT_RD should enable send() ops but disable recv() ops > + * * SHUT_WR should enable recv() ops but disable send() ops > + * * SHUT_RDWR should disable both recv() and send() ops > + */ ... > +static void test_shutdown_recv(void) > +{ > + int client_sock; > + char buff[MSGSIZE] = {0}; Wouldn't it be better to send some data? Or is it not important, we use guarded buffers? > + > + client_sock = start_test(); > + > + tst_res(TINFO, "Testing SHUT_RD flag"); > + > + TST_EXP_PASS(shutdown(client_sock, SHUT_RD)); > + TST_EXP_EQ_LI(recv(client_sock, buff, MSGSIZE, 0), 0); Interesting, I would expect failure ("If how is SHUT_RD, further receptions will be disallowed.") And maybe use SAFE_RECV()? > + TST_EXP_EQ_LI(send(client_sock, buff, MSGSIZE, 0), MSGSIZE); And SAFE_SEND() here? > + > + SAFE_CLOSE(client_sock); > + TST_CHECKPOINT_WAKE(0); > +} nit: I would also use struct tcase and .tcnt, because all 3 tests are nearly identical. Otherwise LGTM. Reviewed-by: Petr Vorel <pvorel@suse.cz> Kind regards, Petr
Hi! On 6/5/24 22:24, Petr Vorel wrote: > Hi Andrea, > > ... >> diff --git a/testcases/kernel/syscalls/shutdown/shutdown01.c b/testcases/kernel/syscalls/shutdown/shutdown01.c >> new file mode 100644 >> index 000000000..b68b14ae8 >> --- /dev/null >> +++ b/testcases/kernel/syscalls/shutdown/shutdown01.c >> @@ -0,0 +1,136 @@ >> +// SPDX-License-Identifier: GPL-2.0-or-later >> +/* >> + * Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com> >> + */ >> + >> +/*\ >> + * [Description] >> + * >> + * This test verifies the following shutdown() functionalities: > nit: here needs to be blank line to get list formatting. > >> + * * SHUT_RD should enable send() ops but disable recv() ops >> + * * SHUT_WR should enable recv() ops but disable send() ops >> + * * SHUT_RDWR should disable both recv() and send() ops >> + */ > ... >> +static void test_shutdown_recv(void) >> +{ >> + int client_sock; >> + char buff[MSGSIZE] = {0}; > Wouldn't it be better to send some data? > Or is it not important, we use guarded buffers? In this case, data is not really important because we need to test if send/recv are disabled after shutdown(). > >> + >> + client_sock = start_test(); >> + >> + tst_res(TINFO, "Testing SHUT_RD flag"); >> + >> + TST_EXP_PASS(shutdown(client_sock, SHUT_RD)); >> + TST_EXP_EQ_LI(recv(client_sock, buff, MSGSIZE, 0), 0); > Interesting, I would expect failure ("If how is SHUT_RD, further receptions will > be disallowed.") > > And maybe use SAFE_RECV()? > >> + TST_EXP_EQ_LI(send(client_sock, buff, MSGSIZE, 0), MSGSIZE); > And SAFE_SEND() here? >> + >> + SAFE_CLOSE(client_sock); >> + TST_CHECKPOINT_WAKE(0); >> +} > nit: I would also use struct tcase and .tcnt, because all 3 tests are nearly > identical. > > Otherwise LGTM. > > Reviewed-by: Petr Vorel <pvorel@suse.cz> > > Kind regards, > Petr I will fix the rest. Andrea
diff --git a/runtest/syscalls b/runtest/syscalls index cf06ee563..dc396415e 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -1465,6 +1465,8 @@ shmget04 shmget04 shmget05 shmget05 shmget06 shmget06 +shutdown01 shutdown01 + sigaction01 sigaction01 sigaction02 sigaction02 diff --git a/testcases/kernel/syscalls/shutdown/.gitignore b/testcases/kernel/syscalls/shutdown/.gitignore new file mode 100644 index 000000000..2df24d1ab --- /dev/null +++ b/testcases/kernel/syscalls/shutdown/.gitignore @@ -0,0 +1 @@ +shutdown01 diff --git a/testcases/kernel/syscalls/shutdown/Makefile b/testcases/kernel/syscalls/shutdown/Makefile new file mode 100644 index 000000000..8cf1b9024 --- /dev/null +++ b/testcases/kernel/syscalls/shutdown/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com> + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/shutdown/shutdown01.c b/testcases/kernel/syscalls/shutdown/shutdown01.c new file mode 100644 index 000000000..b68b14ae8 --- /dev/null +++ b/testcases/kernel/syscalls/shutdown/shutdown01.c @@ -0,0 +1,136 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com> + */ + +/*\ + * [Description] + * + * This test verifies the following shutdown() functionalities: + * * SHUT_RD should enable send() ops but disable recv() ops + * * SHUT_WR should enable recv() ops but disable send() ops + * * SHUT_RDWR should disable both recv() and send() ops + */ + +#include "tst_test.h" + +#define MSGSIZE 4 +#define SOCKETFILE "socket" + +static struct sockaddr_un *sock_addr; + +static void run_server(void) +{ + int server_sock; + + server_sock = SAFE_SOCKET(sock_addr->sun_family, SOCK_STREAM, 0); + + SAFE_BIND(server_sock, + (struct sockaddr *)sock_addr, + sizeof(struct sockaddr_un)); + SAFE_LISTEN(server_sock, 10); + + tst_res(TINFO, "Running server on socket file"); + + TST_CHECKPOINT_WAKE_AND_WAIT(0); + + SAFE_CLOSE(server_sock); + SAFE_UNLINK(SOCKETFILE); +} + +static int start_test(void) +{ + int client_sock; + + if (!SAFE_FORK()) { + run_server(); + _exit(0); + } + + TST_CHECKPOINT_WAIT(0); + + tst_res(TINFO, "Connecting to the server"); + + client_sock = SAFE_SOCKET(sock_addr->sun_family, SOCK_STREAM, 0); + SAFE_CONNECT(client_sock, + (struct sockaddr *)sock_addr, + sizeof(struct sockaddr_un)); + + return client_sock; +} + +static void test_shutdown_recv(void) +{ + int client_sock; + char buff[MSGSIZE] = {0}; + + client_sock = start_test(); + + tst_res(TINFO, "Testing SHUT_RD flag"); + + TST_EXP_PASS(shutdown(client_sock, SHUT_RD)); + TST_EXP_EQ_LI(recv(client_sock, buff, MSGSIZE, 0), 0); + TST_EXP_EQ_LI(send(client_sock, buff, MSGSIZE, 0), MSGSIZE); + + SAFE_CLOSE(client_sock); + TST_CHECKPOINT_WAKE(0); +} + +static void test_shutdown_send(void) +{ + int client_sock; + char buff[MSGSIZE] = {0}; + + client_sock = start_test(); + + tst_res(TINFO, "Testing SHUT_WR flag"); + + TST_EXP_PASS(shutdown(client_sock, SHUT_WR)); + TST_EXP_FAIL(recv(client_sock, buff, MSGSIZE, MSG_DONTWAIT), EWOULDBLOCK); + TST_EXP_FAIL(send(client_sock, buff, MSGSIZE, MSG_NOSIGNAL), EPIPE); + + SAFE_CLOSE(client_sock); + TST_CHECKPOINT_WAKE(0); +} + +static void test_shutdown_both(void) +{ + int client_sock; + char buff[MSGSIZE] = {0}; + + client_sock = start_test(); + + tst_res(TINFO, "Testing SHUT_RDWR flag"); + + TST_EXP_PASS(shutdown(client_sock, SHUT_RDWR)); + TST_EXP_EQ_LI(recv(client_sock, buff, MSGSIZE, 0), 0); + TST_EXP_FAIL(send(client_sock, buff, MSGSIZE, MSG_NOSIGNAL), EPIPE); + + SAFE_CLOSE(client_sock); + TST_CHECKPOINT_WAKE(0); +} + +static void run(void) +{ + test_shutdown_recv(); + test_shutdown_send(); + test_shutdown_both(); +} + +static void setup(void) +{ + sock_addr->sun_family = AF_UNIX; + memcpy(sock_addr->sun_path, SOCKETFILE, sizeof(SOCKETFILE)); +} + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .forks_child = 1, + .needs_checkpoints = 1, + .needs_tmpdir = 1, + .bufs = (struct tst_buffers []) { + {&sock_addr, .size = sizeof(struct sockaddr_un)}, + {} + } +};