| Message ID | 20230801141727.481156-3-AVKrasnov@sberdevices.ru (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
| Series | vsock: handle writes to shutdowned socket | expand |
| Context | Check | Description |
|---|---|---|
| netdev/series_format | success | Posting correctly formatted |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 9 this patch: 9 |
| netdev/cc_maintainers | success | CCed 3 of 3 maintainers |
| netdev/build_clang | success | Errors and warnings before: 9 this patch: 9 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/deprecated_api | success | None detected |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 9 this patch: 9 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 156 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
On Tue, Aug 01, 2023 at 05:17:27PM +0300, Arseniy Krasnov wrote: >This adds two tests for 'shutdown()' call. It checks that SIGPIPE is >sent when MSG_NOSIGNAL is not set and vice versa. Both flags SHUT_WR >and SHUT_RD are tested. > >Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> >--- > tools/testing/vsock/vsock_test.c | 138 +++++++++++++++++++++++++++++++ > 1 file changed, 138 insertions(+) > >diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c >index 90718c2fd4ea..21d40a8d881c 100644 >--- a/tools/testing/vsock/vsock_test.c >+++ b/tools/testing/vsock/vsock_test.c >@@ -19,6 +19,7 @@ > #include <time.h> > #include <sys/mman.h> > #include <poll.h> >+#include <signal.h> > > #include "timeout.h" > #include "control.h" >@@ -1170,6 +1171,133 @@ static void test_seqpacket_msg_peek_server(const struct test_opts *opts) > return test_msg_peek_server(opts, true); > } > >+static bool have_sigpipe; ^ We should define it as `volatile sig_atomic_t`: the behavior is undefined if the signal handler refers to any object [CX] [Option Start] other than errno [Option End] with static storage duration other than by assigning a value to an object declared as volatile sig_atomic_t https://pubs.opengroup.org/onlinepubs/9699919799/functions/signal.html The rest LGTM! Thanks, Stefano >+ >+static void sigpipe(int signo) >+{ >+ have_sigpipe = true; >+} >+ >+static void test_stream_check_sigpipe(int fd) >+{ >+ ssize_t res; >+ >+ have_sigpipe = false; >+ >+ res = send(fd, "A", 1, 0); >+ if (res != -1) { >+ fprintf(stderr, "expected send(2) failure, got %zi\n", res); >+ exit(EXIT_FAILURE); >+ } >+ >+ if (!have_sigpipe) { >+ fprintf(stderr, "SIGPIPE expected\n"); >+ exit(EXIT_FAILURE); >+ } >+ >+ have_sigpipe = false; >+ >+ res = send(fd, "A", 1, MSG_NOSIGNAL); >+ if (res != -1) { >+ fprintf(stderr, "expected send(2) failure, got %zi\n", res); >+ exit(EXIT_FAILURE); >+ } >+ >+ if (have_sigpipe) { >+ fprintf(stderr, "SIGPIPE not expected\n"); >+ exit(EXIT_FAILURE); >+ } >+} >+ >+static void test_stream_shutwr_client(const struct test_opts *opts) >+{ >+ int fd; >+ >+ struct sigaction act = { >+ .sa_handler = sigpipe, >+ }; >+ >+ sigaction(SIGPIPE, &act, NULL); >+ >+ fd = vsock_stream_connect(opts->peer_cid, 1234); >+ if (fd < 0) { >+ perror("connect"); >+ exit(EXIT_FAILURE); >+ } >+ >+ if (shutdown(fd, SHUT_WR)) { >+ perror("shutdown"); >+ exit(EXIT_FAILURE); >+ } >+ >+ test_stream_check_sigpipe(fd); >+ >+ control_writeln("CLIENTDONE"); >+ >+ close(fd); >+} >+ >+static void test_stream_shutwr_server(const struct test_opts *opts) >+{ >+ int fd; >+ >+ fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ if (fd < 0) { >+ perror("accept"); >+ exit(EXIT_FAILURE); >+ } >+ >+ control_expectln("CLIENTDONE"); >+ >+ close(fd); >+} >+ >+static void test_stream_shutrd_client(const struct test_opts *opts) >+{ >+ int fd; >+ >+ struct sigaction act = { >+ .sa_handler = sigpipe, >+ }; >+ >+ sigaction(SIGPIPE, &act, NULL); >+ >+ fd = vsock_stream_connect(opts->peer_cid, 1234); >+ if (fd < 0) { >+ perror("connect"); >+ exit(EXIT_FAILURE); >+ } >+ >+ control_expectln("SHUTRDDONE"); >+ >+ test_stream_check_sigpipe(fd); >+ >+ control_writeln("CLIENTDONE"); >+ >+ close(fd); >+} >+ >+static void test_stream_shutrd_server(const struct test_opts *opts) >+{ >+ int fd; >+ >+ fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >+ if (fd < 0) { >+ perror("accept"); >+ exit(EXIT_FAILURE); >+ } >+ >+ if (shutdown(fd, SHUT_RD)) { >+ perror("shutdown"); >+ exit(EXIT_FAILURE); >+ } >+ >+ control_writeln("SHUTRDDONE"); >+ control_expectln("CLIENTDONE"); >+ >+ close(fd); >+} >+ > static struct test_case test_cases[] = { > { > .name = "SOCK_STREAM connection reset", >@@ -1250,6 +1378,16 @@ static struct test_case test_cases[] = { > .run_client = test_seqpacket_msg_peek_client, > .run_server = test_seqpacket_msg_peek_server, > }, >+ { >+ .name = "SOCK_STREAM SHUT_WR", >+ .run_client = test_stream_shutwr_client, >+ .run_server = test_stream_shutwr_server, >+ }, >+ { >+ .name = "SOCK_STREAM SHUT_RD", >+ .run_client = test_stream_shutrd_client, >+ .run_server = test_stream_shutrd_server, >+ }, > {}, > }; > >-- >2.25.1 >
On 02.08.2023 11:00, Stefano Garzarella wrote: > On Tue, Aug 01, 2023 at 05:17:27PM +0300, Arseniy Krasnov wrote: >> This adds two tests for 'shutdown()' call. It checks that SIGPIPE is >> sent when MSG_NOSIGNAL is not set and vice versa. Both flags SHUT_WR >> and SHUT_RD are tested. >> >> Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> >> --- >> tools/testing/vsock/vsock_test.c | 138 +++++++++++++++++++++++++++++++ >> 1 file changed, 138 insertions(+) >> >> diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c >> index 90718c2fd4ea..21d40a8d881c 100644 >> --- a/tools/testing/vsock/vsock_test.c >> +++ b/tools/testing/vsock/vsock_test.c >> @@ -19,6 +19,7 @@ >> #include <time.h> >> #include <sys/mman.h> >> #include <poll.h> >> +#include <signal.h> >> >> #include "timeout.h" >> #include "control.h" >> @@ -1170,6 +1171,133 @@ static void test_seqpacket_msg_peek_server(const struct test_opts *opts) >> return test_msg_peek_server(opts, true); >> } >> >> +static bool have_sigpipe; > ^ > We should define it as `volatile sig_atomic_t`: > > the behavior is undefined if the signal handler refers to any object > [CX] [Option Start] other than errno [Option End] with static storage > duration other than by assigning a value to an object declared as > volatile sig_atomic_t Yes, exactly, I forgot about sig_atomic_t. I'll fix it. Thanks, Arseniy > > https://pubs.opengroup.org/onlinepubs/9699919799/functions/signal.html > > The rest LGTM! > > Thanks, > Stefano > >> + >> +static void sigpipe(int signo) >> +{ >> + have_sigpipe = true; >> +} >> + >> +static void test_stream_check_sigpipe(int fd) >> +{ >> + ssize_t res; >> + >> + have_sigpipe = false; >> + >> + res = send(fd, "A", 1, 0); >> + if (res != -1) { >> + fprintf(stderr, "expected send(2) failure, got %zi\n", res); >> + exit(EXIT_FAILURE); >> + } >> + >> + if (!have_sigpipe) { >> + fprintf(stderr, "SIGPIPE expected\n"); >> + exit(EXIT_FAILURE); >> + } >> + >> + have_sigpipe = false; >> + >> + res = send(fd, "A", 1, MSG_NOSIGNAL); >> + if (res != -1) { >> + fprintf(stderr, "expected send(2) failure, got %zi\n", res); >> + exit(EXIT_FAILURE); >> + } >> + >> + if (have_sigpipe) { >> + fprintf(stderr, "SIGPIPE not expected\n"); >> + exit(EXIT_FAILURE); >> + } >> +} >> + >> +static void test_stream_shutwr_client(const struct test_opts *opts) >> +{ >> + int fd; >> + >> + struct sigaction act = { >> + .sa_handler = sigpipe, >> + }; >> + >> + sigaction(SIGPIPE, &act, NULL); >> + >> + fd = vsock_stream_connect(opts->peer_cid, 1234); >> + if (fd < 0) { >> + perror("connect"); >> + exit(EXIT_FAILURE); >> + } >> + >> + if (shutdown(fd, SHUT_WR)) { >> + perror("shutdown"); >> + exit(EXIT_FAILURE); >> + } >> + >> + test_stream_check_sigpipe(fd); >> + >> + control_writeln("CLIENTDONE"); >> + >> + close(fd); >> +} >> + >> +static void test_stream_shutwr_server(const struct test_opts *opts) >> +{ >> + int fd; >> + >> + fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >> + if (fd < 0) { >> + perror("accept"); >> + exit(EXIT_FAILURE); >> + } >> + >> + control_expectln("CLIENTDONE"); >> + >> + close(fd); >> +} >> + >> +static void test_stream_shutrd_client(const struct test_opts *opts) >> +{ >> + int fd; >> + >> + struct sigaction act = { >> + .sa_handler = sigpipe, >> + }; >> + >> + sigaction(SIGPIPE, &act, NULL); >> + >> + fd = vsock_stream_connect(opts->peer_cid, 1234); >> + if (fd < 0) { >> + perror("connect"); >> + exit(EXIT_FAILURE); >> + } >> + >> + control_expectln("SHUTRDDONE"); >> + >> + test_stream_check_sigpipe(fd); >> + >> + control_writeln("CLIENTDONE"); >> + >> + close(fd); >> +} >> + >> +static void test_stream_shutrd_server(const struct test_opts *opts) >> +{ >> + int fd; >> + >> + fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); >> + if (fd < 0) { >> + perror("accept"); >> + exit(EXIT_FAILURE); >> + } >> + >> + if (shutdown(fd, SHUT_RD)) { >> + perror("shutdown"); >> + exit(EXIT_FAILURE); >> + } >> + >> + control_writeln("SHUTRDDONE"); >> + control_expectln("CLIENTDONE"); >> + >> + close(fd); >> +} >> + >> static struct test_case test_cases[] = { >> { >> .name = "SOCK_STREAM connection reset", >> @@ -1250,6 +1378,16 @@ static struct test_case test_cases[] = { >> .run_client = test_seqpacket_msg_peek_client, >> .run_server = test_seqpacket_msg_peek_server, >> }, >> + { >> + .name = "SOCK_STREAM SHUT_WR", >> + .run_client = test_stream_shutwr_client, >> + .run_server = test_stream_shutwr_server, >> + }, >> + { >> + .name = "SOCK_STREAM SHUT_RD", >> + .run_client = test_stream_shutrd_client, >> + .run_server = test_stream_shutrd_server, >> + }, >> {}, >> }; >> >> -- >> 2.25.1 >> >
diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c index 90718c2fd4ea..21d40a8d881c 100644 --- a/tools/testing/vsock/vsock_test.c +++ b/tools/testing/vsock/vsock_test.c @@ -19,6 +19,7 @@ #include <time.h> #include <sys/mman.h> #include <poll.h> +#include <signal.h> #include "timeout.h" #include "control.h" @@ -1170,6 +1171,133 @@ static void test_seqpacket_msg_peek_server(const struct test_opts *opts) return test_msg_peek_server(opts, true); } +static bool have_sigpipe; + +static void sigpipe(int signo) +{ + have_sigpipe = true; +} + +static void test_stream_check_sigpipe(int fd) +{ + ssize_t res; + + have_sigpipe = false; + + res = send(fd, "A", 1, 0); + if (res != -1) { + fprintf(stderr, "expected send(2) failure, got %zi\n", res); + exit(EXIT_FAILURE); + } + + if (!have_sigpipe) { + fprintf(stderr, "SIGPIPE expected\n"); + exit(EXIT_FAILURE); + } + + have_sigpipe = false; + + res = send(fd, "A", 1, MSG_NOSIGNAL); + if (res != -1) { + fprintf(stderr, "expected send(2) failure, got %zi\n", res); + exit(EXIT_FAILURE); + } + + if (have_sigpipe) { + fprintf(stderr, "SIGPIPE not expected\n"); + exit(EXIT_FAILURE); + } +} + +static void test_stream_shutwr_client(const struct test_opts *opts) +{ + int fd; + + struct sigaction act = { + .sa_handler = sigpipe, + }; + + sigaction(SIGPIPE, &act, NULL); + + fd = vsock_stream_connect(opts->peer_cid, 1234); + if (fd < 0) { + perror("connect"); + exit(EXIT_FAILURE); + } + + if (shutdown(fd, SHUT_WR)) { + perror("shutdown"); + exit(EXIT_FAILURE); + } + + test_stream_check_sigpipe(fd); + + control_writeln("CLIENTDONE"); + + close(fd); +} + +static void test_stream_shutwr_server(const struct test_opts *opts) +{ + int fd; + + fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); + if (fd < 0) { + perror("accept"); + exit(EXIT_FAILURE); + } + + control_expectln("CLIENTDONE"); + + close(fd); +} + +static void test_stream_shutrd_client(const struct test_opts *opts) +{ + int fd; + + struct sigaction act = { + .sa_handler = sigpipe, + }; + + sigaction(SIGPIPE, &act, NULL); + + fd = vsock_stream_connect(opts->peer_cid, 1234); + if (fd < 0) { + perror("connect"); + exit(EXIT_FAILURE); + } + + control_expectln("SHUTRDDONE"); + + test_stream_check_sigpipe(fd); + + control_writeln("CLIENTDONE"); + + close(fd); +} + +static void test_stream_shutrd_server(const struct test_opts *opts) +{ + int fd; + + fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL); + if (fd < 0) { + perror("accept"); + exit(EXIT_FAILURE); + } + + if (shutdown(fd, SHUT_RD)) { + perror("shutdown"); + exit(EXIT_FAILURE); + } + + control_writeln("SHUTRDDONE"); + control_expectln("CLIENTDONE"); + + close(fd); +} + static struct test_case test_cases[] = { { .name = "SOCK_STREAM connection reset", @@ -1250,6 +1378,16 @@ static struct test_case test_cases[] = { .run_client = test_seqpacket_msg_peek_client, .run_server = test_seqpacket_msg_peek_server, }, + { + .name = "SOCK_STREAM SHUT_WR", + .run_client = test_stream_shutwr_client, + .run_server = test_stream_shutwr_server, + }, + { + .name = "SOCK_STREAM SHUT_RD", + .run_client = test_stream_shutrd_client, + .run_server = test_stream_shutrd_server, + }, {}, };
This adds two tests for 'shutdown()' call. It checks that SIGPIPE is sent when MSG_NOSIGNAL is not set and vice versa. Both flags SHUT_WR and SHUT_RD are tested. Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru> --- tools/testing/vsock/vsock_test.c | 138 +++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+)