Module Name: src Committed By: riastradh Date: Sun Oct 15 13:22:52 UTC 2023
Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/tests/kernel: Makefile Added Files: src/tests/kernel: t_fdrestart.c Log Message: t_fdrestart: New test of closing fd with another thread in I/O on it. Adapted from regress/sys/kern/dislodgefd. PR kern/57659 To generate a diff of this commit: cvs rdiff -u -r1.418 -r1.419 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1293 -r1.1294 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.75 -r1.76 src/tests/kernel/Makefile cvs rdiff -u -r0 -r1.1 src/tests/kernel/t_fdrestart.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.418 src/distrib/sets/lists/debug/mi:1.419 --- src/distrib/sets/lists/debug/mi:1.418 Sun Aug 20 12:27:02 2023 +++ src/distrib/sets/lists/debug/mi Sun Oct 15 13:22:52 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.418 2023/08/20 12:27:02 riastradh Exp $ +# $NetBSD: mi,v 1.419 2023/10/15 13:22:52 riastradh Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -1792,6 +1792,7 @@ ./usr/libdata/debug/usr/tests/kernel/t_extattrctl.debug tests-kernel-tests debug,atf,rump ./usr/libdata/debug/usr/tests/kernel/t_extent.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_fcntl.debug tests-kernel-tests debug,atf +./usr/libdata/debug/usr/tests/kernel/t_fdrestart.debug tests-kernel-tests debug,atf ./usr/libdata/debug/usr/tests/kernel/t_filedesc.debug tests-kernel-tests debug,atf,rump ./usr/libdata/debug/usr/tests/kernel/t_kauth_pr_47598.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_ksem.debug tests-kernel-tests debug,atf,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1293 src/distrib/sets/lists/tests/mi:1.1294 --- src/distrib/sets/lists/tests/mi:1.1293 Sat Aug 26 10:06:16 2023 +++ src/distrib/sets/lists/tests/mi Sun Oct 15 13:22:52 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1293 2023/08/26 10:06:16 rillig Exp $ +# $NetBSD: mi,v 1.1294 2023/10/15 13:22:52 riastradh Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2311,6 +2311,7 @@ ./usr/tests/kernel/t_extattrctl tests-kernel-tests atf,rump ./usr/tests/kernel/t_extent tests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_fcntl tests-kernel-tests atf +./usr/tests/kernel/t_fdrestart tests-kernel-tests atf ./usr/tests/kernel/t_fexecve tests-kernel-tests atf ./usr/tests/kernel/t_filedesc tests-kernel-tests atf,rump ./usr/tests/kernel/t_fpufork tests-kernel-tests atf Index: src/tests/kernel/Makefile diff -u src/tests/kernel/Makefile:1.75 src/tests/kernel/Makefile:1.76 --- src/tests/kernel/Makefile:1.75 Thu Aug 3 12:24:46 2023 +++ src/tests/kernel/Makefile Sun Oct 15 13:22:52 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2023/08/03 12:24:46 nia Exp $ +# $NetBSD: Makefile,v 1.76 2023/10/15 13:22:52 riastradh Exp $ NOMAN= # defined @@ -9,6 +9,7 @@ TESTSDIR= ${TESTSBASE}/kernel TESTS_SUBDIRS+= kqueue #TESTS_C= t_epoll TESTS_C+= t_fcntl +TESTS_C+= t_fdrestart TESTS_C+= t_lock TESTS_C+= t_lockf TESTS_C+= t_pty @@ -50,6 +51,13 @@ PROGS+= h_fpufork SCRIPTSDIR= ${TESTSDIR} SCRIPTS= h_interpreter.sh +LDADD.t_fdrestart+= -lpthread +LDADD.t_fdrestart+= -lrumpnet_local +LDADD.t_fdrestart+= -lrumpnet_net +LDADD.t_fdrestart+= -lrumpnet_netinet +LDADD.t_fdrestart+= -lrumpnet +LDADD.t_fdrestart+= ${LIBRUMPBASE} + LDADD.t_mqueue+= -lrt Added files: Index: src/tests/kernel/t_fdrestart.c diff -u /dev/null src/tests/kernel/t_fdrestart.c:1.1 --- /dev/null Sun Oct 15 13:22:52 2023 +++ src/tests/kernel/t_fdrestart.c Sun Oct 15 13:22:52 2023 @@ -0,0 +1,238 @@ +/* $NetBSD: t_fdrestart.c,v 1.1 2023/10/15 13:22:52 riastradh Exp $ */ + +/*- + * Copyright (c) 2023 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#define _KMEMUSER /* ERESTART */ + +#include <sys/cdefs.h> +__RCSID("$NetBSD: t_fdrestart.c,v 1.1 2023/10/15 13:22:52 riastradh Exp $"); + +#include <sys/socket.h> +#include <sys/un.h> + +#include <atf-c.h> +#include <errno.h> +#include <pthread.h> +#include <unistd.h> + +#include <rump/rump.h> +#include <rump/rump_syscalls.h> + +#include "h_macros.h" + +struct fdrestart { + void (*op)(struct fdrestart *); + int fd; + pthread_barrier_t barrier; +}; + +static void +doread(struct fdrestart *F) +{ + char c; + ssize_t nread; + int error; + + nread = rump_sys_read(F->fd, &c, sizeof(c)); + ATF_REQUIRE_EQ_MSG(nread, -1, "nread=%zd", nread); + error = errno; + ATF_REQUIRE_EQ_MSG(error, ERESTART, "errno=%d (%s)", error, + strerror(error)); + + nread = rump_sys_read(F->fd, &c, sizeof(c)); + ATF_REQUIRE_EQ_MSG(nread, -1, "nread=%zd", nread); + error = errno; + ATF_REQUIRE_EQ_MSG(error, EBADF, "errno=%d (%s)", error, + strerror(error)); +} + +static void +dowrite(struct fdrestart *F) +{ + static const char buf[1024*1024]; /* XXX >BIG_PIPE_SIZE */ + ssize_t nwrit; + int error; + + nwrit = rump_sys_write(F->fd, buf, sizeof(buf)); + if (nwrit != -1) /* filled buffer, try again */ + nwrit = rump_sys_write(F->fd, buf, sizeof(buf)); + ATF_REQUIRE_EQ_MSG(nwrit, -1, "nwrit=%zd", nwrit); + error = errno; + ATF_REQUIRE_EQ_MSG(error, ERESTART, "errno=%d (%s)", error, + strerror(error)); + + nwrit = rump_sys_write(F->fd, buf, sizeof(buf)); + error = errno; + ATF_REQUIRE_EQ_MSG(error, EBADF, "errno=%d (%s)", error, + strerror(error)); +} + +static void +waitforbarrier(struct fdrestart *F, const char *caller) +{ + int error; + + error = pthread_barrier_wait(&F->barrier); + switch (error) { + case 0: + case PTHREAD_BARRIER_SERIAL_THREAD: + break; + default: + atf_tc_fail("%s: pthread_barrier_wait: %d, %s", caller, error, + strerror(error)); + } +} + +static void * +doit(void *cookie) +{ + struct fdrestart *F = cookie; + + waitforbarrier(F, "user"); + (*F->op)(F); + + return NULL; +} + +static void +on_sigalrm(int signo) +{ + + atf_tc_fail("timed out"); +} + +static void +testfdrestart(struct fdrestart *F) +{ + pthread_t t; + + ATF_REQUIRE_MSG(signal(SIGALRM, &on_sigalrm) != SIG_ERR, + "errno=%d (%s)", errno, strerror(errno)); + + RZ(pthread_barrier_init(&F->barrier, NULL, 2)); + RZ(pthread_create(&t, NULL, &doit, F)); + waitforbarrier(F, "closer"); /* wait for thread to start */ + (void)sleep(1); /* wait for op to start */ + (void)alarm(1); + RL(rump_sys_close(F->fd)); + RZ(pthread_join(t, NULL)); +} + +ATF_TC(pipe_read); +ATF_TC_HEAD(pipe_read, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test pipe read fails on close"); +} +ATF_TC_BODY(pipe_read, tc) +{ + struct fdrestart fdrestart, *F = &fdrestart; + int fd[2]; + + rump_init(); + + RL(rump_sys_pipe(fd)); + + memset(F, 0, sizeof(*F)); + F->op = &doread; + F->fd = fd[0]; + atf_tc_expect_fail("PR kern/57659"); + testfdrestart(F); +} + +ATF_TC(pipe_write); +ATF_TC_HEAD(pipe_write, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test pipe write fails on close"); +} +ATF_TC_BODY(pipe_write, tc) +{ + struct fdrestart fdrestart, *F = &fdrestart; + int fd[2]; + + rump_init(); + + RL(rump_sys_pipe(fd)); + + memset(F, 0, sizeof(*F)); + F->op = &dowrite; + F->fd = fd[1]; + atf_tc_expect_fail("PR kern/57659"); + testfdrestart(F); +} + +ATF_TC(socketpair_read); +ATF_TC_HEAD(socketpair_read, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test socketpair read fails on close"); +} +ATF_TC_BODY(socketpair_read, tc) +{ + struct fdrestart fdrestart, *F = &fdrestart; + int fd[2]; + + rump_init(); + + RL(rump_sys_socketpair(AF_LOCAL, SOCK_STREAM, 0, fd)); + + memset(F, 0, sizeof(*F)); + F->op = &doread; + F->fd = fd[0]; + atf_tc_expect_fail("PR kern/57659"); + testfdrestart(F); +} + +ATF_TC(socketpair_write); +ATF_TC_HEAD(socketpair_write, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test socketpair write fails on close"); +} +ATF_TC_BODY(socketpair_write, tc) +{ + struct fdrestart fdrestart, *F = &fdrestart; + int fd[2]; + + rump_init(); + + RL(rump_sys_socketpair(AF_LOCAL, SOCK_STREAM, 0, fd)); + + memset(F, 0, sizeof(*F)); + F->op = &dowrite; + F->fd = fd[0]; + atf_tc_expect_fail("PR kern/57659"); + testfdrestart(F); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, pipe_read); + ATF_TP_ADD_TC(tp, pipe_write); + ATF_TP_ADD_TC(tp, socketpair_read); + ATF_TP_ADD_TC(tp, socketpair_write); + + return atf_no_error(); +}