Date: Sat, 16 Sep 2023 09:27:15 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 38426b32e106 - main - socket tests: Add a regression test for MSG_WAITALL Message-ID: <202309160927.38G9RF8N016671@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=38426b32e106cf251520259b29779372eda7a5f8 commit 38426b32e106cf251520259b29779372eda7a5f8 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2023-08-31 17:29:29 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2023-09-15 16:59:46 +0000 socket tests: Add a regression test for MSG_WAITALL PR: 212716 MFC after: 1 week Sponsored by: The FreeBSD Foundation --- tests/sys/kern/Makefile | 2 + tests/sys/kern/socket_msg_waitall.c | 181 ++++++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index d46223d8ff09..f2fe9e7008d9 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -30,6 +30,7 @@ ATF_TESTS_C+= sigaltstack ATF_TESTS_C+= sigwait ATF_TESTS_C+= socket_accf ATF_TESTS_C+= socket_msg_trunc +ATF_TESTS_C+= socket_msg_waitall TEST_METADATA.sigwait+= is_exclusive="true" .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH:Mpowerpc*} == "" ATF_TESTS_C+= subr_physmem_test @@ -71,6 +72,7 @@ LIBADD.unix_seqpacket_test+= pthread LIBADD.kcov+= pthread CFLAGS.ktls_test+= -DOPENSSL_API_COMPAT=0x10100000L LIBADD.ktls_test+= crypto util +LIBADD.socket_msg_waitall+= pthread LIBADD.sendfile_helper+= pthread LIBADD.fdgrowtable_test+= util pthread kvm procstat LIBADD.sigwait+= rt diff --git a/tests/sys/kern/socket_msg_waitall.c b/tests/sys/kern/socket_msg_waitall.c new file mode 100644 index 000000000000..e9018b47eec1 --- /dev/null +++ b/tests/sys/kern/socket_msg_waitall.c @@ -0,0 +1,181 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Mark Johnston under sponsorship from + * the FreeBSD Foundation. + */ + +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/un.h> + +#include <netinet/in.h> + +#include <errno.h> +#include <pthread.h> +#include <stdlib.h> +#include <unistd.h> + +#include <atf-c.h> + +struct close_test_params { + struct sockaddr_storage sa; + size_t msglen; + int count; + int af, type, proto; +}; + +static void * +close_test_client(void *arg) +{ + struct close_test_params *p = arg; + char *buf; + size_t buflen; + + buflen = p->msglen + 1; + buf = malloc(buflen); + ATF_REQUIRE(buf != NULL); + + while (p->count-- > 0) { + ssize_t n; + int error, s; + + s = socket(p->af, p->type, p->proto); + ATF_REQUIRE_MSG(s >= 0, "socket: %s", strerror(errno)); + + error = connect(s, (struct sockaddr *)&p->sa, p->sa.ss_len); + ATF_REQUIRE_MSG(error == 0, "connect: %s", strerror(errno)); + + n = recv(s, buf, buflen, MSG_WAITALL); + ATF_REQUIRE_MSG(n == (ssize_t)p->msglen, + "recv: %s", strerror(errno)); + + ATF_REQUIRE(close(s) == 0); + } + + return (NULL); +} + +static void +close_test(struct sockaddr *sa, unsigned int count, int af, int type, int proto) +{ + struct close_test_params p; + const char *msg; + pthread_t t; + size_t msglen; + int error, s; + + s = socket(af, type, proto); + ATF_REQUIRE_MSG(s >= 0, "socket %s", strerror(errno)); + + ATF_REQUIRE_MSG(bind(s, sa, sa->sa_len) == 0, + "bind: %s", strerror(errno)); + ATF_REQUIRE_MSG(listen(s, 1) == 0, + "listen: %s", strerror(errno)); + ATF_REQUIRE_MSG(getsockname(s, sa, &(socklen_t){ sa->sa_len }) == 0, + "getsockname: %s", strerror(errno)); + + msg = "hello bonjour"; + msglen = strlen(msg) + 1; + p = (struct close_test_params){ + .count = count, + .msglen = msglen, + .af = af, + .type = type, + .proto = proto, + }; + memcpy(&p.sa, sa, sa->sa_len); + error = pthread_create(&t, NULL, close_test_client, &p); + ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error)); + + while (count-- > 0) { + ssize_t n; + int cs; + + cs = accept(s, NULL, NULL); + ATF_REQUIRE_MSG(cs >= 0, "accept: %s", strerror(errno)); + + n = send(cs, msg, msglen, 0); + ATF_REQUIRE_MSG(n == (ssize_t)msglen, + "send: %s", strerror(errno)); + + ATF_REQUIRE(close(cs) == 0); + } + + ATF_REQUIRE(close(s) == 0); + ATF_REQUIRE(pthread_join(t, NULL) == 0); +} + +/* + * Make sure that closing a connection kicks a MSG_WAITALL recv() out of the + * syscall. See bugzilla PR 212716. + */ +ATF_TC(close_tcp); +ATF_TC_HEAD(close_tcp, tc) +{ + atf_tc_set_md_var(tc, "timeout", "10"); +} +ATF_TC_BODY(close_tcp, tc) +{ + struct sockaddr_in sin; + + sin = (struct sockaddr_in){ + .sin_len = sizeof(sin), + .sin_family = AF_INET, + .sin_addr = { htonl(INADDR_LOOPBACK) }, + .sin_port = htons(0), + }; + close_test((struct sockaddr *)&sin, 1000, AF_INET, SOCK_STREAM, + IPPROTO_TCP); +} + +/* A variant of the above test for UNIX domain stream sockets. */ +ATF_TC(close_unix_stream); +ATF_TC_HEAD(close_unix_stream, tc) +{ + atf_tc_set_md_var(tc, "timeout", "10"); +} +ATF_TC_BODY(close_unix_stream, tc) +{ + struct sockaddr_un sun; + + sun = (struct sockaddr_un){ + .sun_len = sizeof(sun), + .sun_family = AF_UNIX, + .sun_path = "socket_msg_waitall_unix", + }; + close_test((struct sockaddr *)&sun, 1000, AF_UNIX, SOCK_STREAM, 0); + ATF_REQUIRE_MSG(unlink(sun.sun_path) == 0, + "unlink: %s", strerror(errno)); +} + +/* A variant of the above test for UNIX domain seqpacket sockets. */ +ATF_TC(close_unix_seqpacket); +ATF_TC_HEAD(close_unix_seqpacket, tc) +{ + atf_tc_set_md_var(tc, "timeout", "10"); +} +ATF_TC_BODY(close_unix_seqpacket, tc) +{ + struct sockaddr_un sun; + + sun = (struct sockaddr_un){ + .sun_len = sizeof(sun), + .sun_family = AF_UNIX, + .sun_path = "socket_msg_waitall_unix", + }; + close_test((struct sockaddr *)&sun, 1000, AF_UNIX, SOCK_SEQPACKET, 0); + ATF_REQUIRE_MSG(unlink(sun.sun_path) == 0, + "unlink: %s", strerror(errno)); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, close_tcp); + ATF_TP_ADD_TC(tp, close_unix_stream); + ATF_TP_ADD_TC(tp, close_unix_seqpacket); + + return (atf_no_error()); +}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309160927.38G9RF8N016671>