The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f5463265955b829775bbb32e1fd0bc11dafc36ce
commit f5463265955b829775bbb32e1fd0bc11dafc36ce Author: Mark Johnston <[email protected]> AuthorDate: 2023-11-24 15:28:13 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2024-01-27 18:51:13 +0000 kqueue tests: Add a regression test Based on the test case submitted by Andreas Bock for PR 275286. PR: 275286 MFC after: 2 weeks --- tests/sys/kqueue/Makefile | 4 +- tests/sys/kqueue/kqueue_fork.c | 89 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/tests/sys/kqueue/Makefile b/tests/sys/kqueue/Makefile index 3267b9ad8d9a..37f4f323904d 100644 --- a/tests/sys/kqueue/Makefile +++ b/tests/sys/kqueue/Makefile @@ -1,10 +1,10 @@ - TESTSRC= ${SRCTOP}/contrib/netbsd-tests/kernel/kqueue TESTSDIR= ${TESTSBASE}/sys/kqueue BINDIR= ${TESTSDIR} -ATF_TESTS_C+= kqueue_peek_signal +ATF_TESTS_C+= kqueue_fork \ + kqueue_peek_signal NETBSD_ATF_TESTS_C= proc1_test # XXX: fails `ke.fflags & NOTE_TRACKERR` invariant diff --git a/tests/sys/kqueue/kqueue_fork.c b/tests/sys/kqueue/kqueue_fork.c new file mode 100644 index 000000000000..e4c0412c1980 --- /dev/null +++ b/tests/sys/kqueue/kqueue_fork.c @@ -0,0 +1,89 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Andreas Bock <[email protected]> + * Copyright (c) 2023 Mark Johnston <[email protected]> + * + * 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 AUTHOR 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 AUTHOR 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. + */ + +#include <sys/event.h> +#include <sys/wait.h> + +#include <err.h> +#include <signal.h> +#include <unistd.h> + +#include <atf-c.h> + +/* + * A regression test for bugzilla 275286. + */ +ATF_TC_WITHOUT_HEAD(shared_table_filt_sig); +ATF_TC_BODY(shared_table_filt_sig, tc) +{ + struct sigaction sa; + pid_t pid; + int error, status; + + sa.sa_handler = SIG_IGN; + sigemptyset(&sa.sa_mask); + sa.sa_flags = 0; + error = sigaction(SIGINT, &sa, NULL); + ATF_REQUIRE(error == 0); + + pid = rfork(RFPROC); + ATF_REQUIRE(pid != -1); + if (pid == 0) { + struct kevent ev; + int kq; + + kq = kqueue(); + if (kq < 0) + err(1, "kqueue"); + EV_SET(&ev, SIGINT, EVFILT_SIGNAL, EV_ADD | EV_ENABLE, 0, 0, + NULL); + if (kevent(kq, &ev, 1, NULL, 0, NULL) < 0) + err(2, "kevent"); + if (kevent(kq, NULL, 0, &ev, 1, NULL) < 0) + err(3, "kevent"); + _exit(0); + } + + /* Wait for the child to block in kevent(). */ + usleep(100000); + + error = kill(pid, SIGINT); + ATF_REQUIRE(error == 0); + + error = waitpid(pid, &status, 0); + ATF_REQUIRE(error != -1); + ATF_REQUIRE(WIFEXITED(status)); + ATF_REQUIRE_EQ(WEXITSTATUS(status), 0); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, shared_table_filt_sig); + + return (atf_no_error()); +}
