 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_misc.c,v 1.260 2023/07/29 15:04:29 christos Exp $	*/
+/*	$NetBSD: linux_misc.c,v 1.261 2023/07/30 18:31:13 christos Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz; by Jason R. Thorpe
  * of the Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * 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
 @@ -47,27 +47,27 @@
  *	linux_sys_readdir		: linux_misc_notalpha.c
  *	linux_sys_setresgid		: linux_misc_notalpha.c
  *	linux_sys_time			: linux_misc_notalpha.c
  *	linux_sys_utime			: linux_misc_notalpha.c
  *	linux_sys_waitpid		: linux_misc_notalpha.c
  *	linux_sys_old_mmap		: linux_oldmmap.c
  *	linux_sys_oldolduname		: linux_oldolduname.c
  *	linux_sys_oldselect		: linux_oldselect.c
  *	linux_sys_olduname		: linux_olduname.c
  *	linux_sys_pipe			: linux_pipe.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.260 2023/07/29 15:04:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.261 2023/07/30 18:31:13 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/dirent.h>
 #include <sys/epoll.h>
 #include <sys/eventfd.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 @@ -1715,27 +1715,27 @@ int
 linux_sys_epoll_create1(struct lwp *l,
     const struct linux_sys_epoll_create1_args *uap, register_t *retval)
+{
 	/* {
 		syscallarg(int) flags;
 	} */
 	struct sys_epoll_create1_args ca;
         if ((SCARG(uap, flags) & ~(LINUX_O_CLOEXEC)) != 0)
 		return EINVAL;
 	SCARG(&ca, flags) = 0;
 	if ((SCARG(uap, flags) & LINUX_O_CLOEXEC) != 0)
-		SCARG(&ca, flags) |= O_CLOEXEC;
+		SCARG(&ca, flags) |= EPOLL_CLOEXEC;
 	return sys_epoll_create1(l, &ca, retval);
+}
 /*
  * epoll_ctl(2).  Copyin event and translate it if necessary and then
  * call epoll_ctl_common().
  */
 int
 linux_sys_epoll_ctl(struct lwp *l, const struct linux_sys_epoll_ctl_args *uap,
     register_t *retval)
+{
 	/* {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sys_epoll.c,v 1.3 2023/07/30 04:39:00 rin Exp $	*/
+/*	$NetBSD: sys_epoll.c,v 1.4 2023/07/30 18:31:13 christos Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
+ *
  * Copyright (c) 2007 Roman Divacky
  * Copyright (c) 2014 Dmitry Chagin <dchagin@FreeBSD.org>
+ *
  * 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
 @@ -18,27 +18,27 @@
  * 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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_epoll.c,v 1.3 2023/07/30 04:39:00 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_epoll.c,v 1.4 2023/07/30 18:31:13 christos Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/bitops.h>
 #include <sys/epoll.h>
 #include <sys/event.h>
 #include <sys/eventvar.h>
 #include <sys/errno.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/fcntl.h>
 #include <sys/proc.h>
 @@ -90,30 +90,32 @@ static int	epoll_check_loop_and_depth(st
 /*
  * epoll_create1(2).  Parse the flags and then create a kqueue instance.
  */
 int
 sys_epoll_create1(struct lwp *l, const struct sys_epoll_create1_args *uap,
     register_t *retval)
+{
 	/* {
 		syscallarg(int) flags;
 	} */
 	struct sys_kqueue1_args kqa;
-	if ((SCARG(uap, flags) & ~(O_CLOEXEC)) != 0)
+	if ((SCARG(uap, flags) & ~(EPOLL_CLOEXEC)) != 0)
 		return EINVAL;
-	SCARG(&kqa, flags) = SCARG(uap, flags);
+	SCARG(&kqa, flags) = 0;
 	if (SCARG(uap, flags) & EPOLL_CLOEXEC)
 		SCARG(&kqa, flags) |= O_CLOEXEC;
 	return sys_kqueue1(l, &kqa, retval);
+}
 /*
  * Structure converting function from epoll to kevent.
  */
 static int
 epoll_to_kevent(int epfd, int fd, struct epoll_event *l_event,
     struct kevent *kevent, int *nkevents)
+{
 	uint32_t levents = l_event->events;
 	uint32_t kev_flags = EV_ADD | EV_ENABLE;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: epoll.h,v 1.1 2023/07/28 18:19:01 christos Exp $	*/
+/*	$NetBSD: epoll.h,v 1.2 2023/07/30 18:31:14 christos Exp $	*/
 /*-
  * Copyright (c) 2007 Roman Divacky
  * Copyright (c) 2014 Dmitry Chagin <dchagin@FreeBSD.org>
+ *
  * 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.
 @@ -21,30 +21,33 @@
  * 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.
+ *
  * $FreeBSD$
  */
 #ifndef _SYS_EPOLL_H_
 #define	_SYS_EPOLL_H_
 #include <sys/fcntl.h>			/* for O_CLOEXEC */
 #include <sys/types.h>			/* for uint32_t, uint64_t */
 #include <sys/sigtypes.h>		/* for sigset_t */
 struct timespec;
 #define	EPOLL_CLOEXEC	O_CLOEXEC
 #define	EPOLLIN		0x00000001
 #define	EPOLLPRI	0x00000002
 #define	EPOLLOUT	0x00000004
 #define	EPOLLERR	0x00000008
 #define	EPOLLHUP	0x00000010
 #define	EPOLLRDNORM	0x00000040
 #define	EPOLLRDBAND	0x00000080
 #define	EPOLLWRNORM	0x00000100
 #define	EPOLLWRBAND	0x00000200
 #define	EPOLLMSG	0x00000400
 #define	EPOLLRDHUP	0x00002000
 #define	EPOLLWAKEUP	0x20000000
 #define	EPOLLONESHOT	0x40000000

 @@ -1,14 +1,14 @@
-/*	$NetBSD: t_epoll.c,v 1.1 2023/07/28 18:19:01 christos Exp $	*/
+/*	$NetBSD: t_epoll.c,v 1.2 2023/07/30 18:31:14 christos Exp $	*/
 /*-
  * Copyright (c) 2023 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Theodore Preduta.
+ *
  * 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.
 @@ -19,57 +19,78 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_epoll.c,v 1.1 2023/07/28 18:19:01 christos Exp $");
+__RCSID("$NetBSD: t_epoll.c,v 1.2 2023/07/30 18:31:14 christos Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/epoll.h>
 #include <sys/fcntl.h>
 #include <errno.h>
 #include <atf-c.h>
 #include "h_macros.h"
 ATF_TC(create_size);
 ATF_TC_HEAD(create_size, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Checks that epoll_create requires a non-positive size");
+}
 ATF_TC_BODY(create_size, tc)
+{
 	ATF_REQUIRE_EQ_MSG(epoll_create(-1), -1,
 	    "epoll_create succeeded unexpectedly");
 	ATF_REQUIRE_ERRNO(EINVAL, true);
 	ATF_REQUIRE_EQ_MSG(epoll_create(0), -1,
 	    "epoll_create succeeded unexpectedly");
 	ATF_REQUIRE_ERRNO(EINVAL, true);
 	RL(epoll_create(1));
+}
 ATF_TC(create_cloexec);
 ATF_TC_HEAD(create_cloexec, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Checks that epoll_create1 sets close on exec when desired");
+}
 ATF_TC_BODY(create_cloexec, tc)
+{
 	int fd;
 	RL(fd = epoll_create1(0));
 	ATF_REQUIRE_MSG((fcntl(fd, F_GETFD) & FD_CLOEXEC) == 0,
 	    "Close on exec set unexpectedly.");
 	RL(fd = epoll_create1(EPOLL_CLOEXEC));
 	ATF_REQUIRE_MSG((fcntl(fd, F_GETFD) & FD_CLOEXEC) != 0,
 	    "Close on exec was not set.");
+}
 ATF_TC(bad_epfd);
 ATF_TC_HEAD(bad_epfd, tc)
+{
 	atf_tc_set_md_var(tc, "descr",
 	    "Checks that epoll_ctl detects an invalid epfd");
+}
 ATF_TC_BODY(bad_epfd, tc)
+{
 	int fd;
 	struct epoll_event event;
 	RL(fd = epoll_create1(0));
 @@ -204,22 +225,23 @@ ATF_TC_BODY(watch_depth, tc)
 		RL(tmp = epoll_create1(0));
 		RL(epoll_ctl(tmp, EPOLL_CTL_ADD, epfd, &event));
 		epfd = tmp;
+	}
 	RL(tmp = epoll_create1(0));
 	ATF_REQUIRE_EQ_MSG(epoll_ctl(tmp, EPOLL_CTL_ADD, epfd, &event), -1,
 	    "epoll_ctl succeeded unexpectedly");
 	ATF_REQUIRE_ERRNO(EINVAL, true);
+}
 ATF_TP_ADD_TCS(tp)
+{
 	ATF_TP_ADD_TC(tp, create_size);
 	ATF_TP_ADD_TC(tp, create_cloexec);
 	ATF_TP_ADD_TC(tp, bad_epfd);
 	ATF_TP_ADD_TC(tp, bad_fd);
 	ATF_TP_ADD_TC(tp, not_added);
 	ATF_TP_ADD_TC(tp, watching_self);
 	ATF_TP_ADD_TC(tp, watch_loops);
 	ATF_TP_ADD_TC(tp, watch_depth);
 	return atf_no_error();
+}