From nobody Sun Feb 11 15:15:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TXrkc6L6nz59tgT; Sun, 11 Feb 2024 15:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TXrkc5lgmz4Zwm; Sun, 11 Feb 2024 15:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707664536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PdCFIN5yT8VKq/tMNSuEJdo1XfS1rEv6HavXdmLLQqw=; b=gwBf9DtOefiLMbnrlDifRewhMQff5GdEn4S1gkA4I6Y3SvYAUuB8/8zyYAfAcRiPDrWnq4 wOf2xzGUyrnOtsCKJpJXkH88FmX3YX5g+bsTqIzej0X415402G9WMuq6QJ5bVAQnM56UvD Ycfj0Ga3bEz0ZfQ17+GpPwk1uN5lgmaFT/crItae2o8ROsfMojiqBQheri61i7WALGsmDL VSfru0Eu0eA5eDqzDCtIF82X7ouJ9e3L1WFY9WrcXTkDznEcV6+noSXV0C2hVb1Sxa8o/h sESLvX2j5n3PovLyYaxzkG5Jr9/xuMNAgH2VFShkF77UzwLX0rZtgXoMKps1Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707664536; a=rsa-sha256; cv=none; b=skswOtjc1KxfFjC83A9Cg4XAOdd2bzPFB1RMdiPnZ1OON4iBl3OJlGRVlmieF8NZYplJKF TJO4VuQe3YfFpEeQMkNNv66RLzBNQxter+/BiOyAT/NY7+JwwI0pUhw3NVSFOJXdMA2h4X qlRrj+4RbaHnzcSGQ21qAd+Bf/y/ltXzg4rjzka3WxGNcp02eJMiLx7rdA1dEilevPdp/S /gs6asuNM2oR3cq8XQ0pGqPg524lKJgKu5YORoJGb905N/O4kf2U1IIb8fq/NSvoPzXboS PBqyWk7ffgSo8C72m2t9grKCV3oPxc/L5fdU0F3TTaAu5S09dMwMxXx1Eyy8Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707664536; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PdCFIN5yT8VKq/tMNSuEJdo1XfS1rEv6HavXdmLLQqw=; b=TqC3oar8r1JmWP9D2w7Xka65GfKbLqVCX/e8WEnDBx+gLfXjYqceqY2sWwrmkZKST/ftB/ tXOzoQ+GsXZl6pv3gUhpJt7GvY/uH8mHbmPEmqNDuvfYbc2NJzLtYnCB1SRBX7B9pxE+Rz 5n7aGqBWrhdkG34UmUTdC7q16vciciEDjXSIdOqohrR55Ooel6w0Duvw5TzAouSeWxB/q1 20aJhsg1FQSzeZR/N2HTuZPBqWKgY6yn5A8E0+DncHspRM0xtAmDqDAG/SyqD4/uTLBqcr l+5yU77DH5625TAerCan6sdHvm6DvNKmEsVAV1M/VgNHu1LS+UB8I+acGKGlNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TXrkc4nznz14P4; Sun, 11 Feb 2024 15:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41BFFaSx041146; Sun, 11 Feb 2024 15:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41BFFagT041143; Sun, 11 Feb 2024 15:15:36 GMT (envelope-from git) Date: Sun, 11 Feb 2024 15:15:36 GMT Message-Id: <202402111515.41BFFagT041143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3a90a4453750 - stable/14 - kqueue tests: Add a regression test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a90a4453750b12444e96d647d7c1203dc1cc9c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3a90a4453750b12444e96d647d7c1203dc1cc9c5 commit 3a90a4453750b12444e96d647d7c1203dc1cc9c5 Author: Mark Johnston AuthorDate: 2023-11-24 15:28:13 +0000 Commit: Mark Johnston CommitDate: 2024-02-11 15:14:44 +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 (cherry picked from commit f5463265955b829775bbb32e1fd0bc11dafc36ce) --- 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 + * Copyright (c) 2023 Mark Johnston + * + * 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 +#include + +#include +#include +#include + +#include + +/* + * 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()); +}