From nobody Wed Apr 5 03:33:44 2023 X-Original-To: dev-commits-src-main@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 4Prqwm2c9vz43jLK; Wed, 5 Apr 2023 03:33:44 +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 4Prqwm1gxcz3qkv; Wed, 5 Apr 2023 03:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680665624; 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=wp4R0TcJou2212z/CnIr2blkE+klHM6MwgwdR8JTu7M=; b=WcHZOegYByFLcsPZKcKJdu3Wp9ps86EnjpgR+0du7W0N+B+uNS8wIybckqnBLKz7MleE3v 77mzJa0RqOAXrWQxznZ/aoenhpFzOGUZSEd/iPhThDl72+33/53HVZt+wUCE/qwKam2cU5 L4ggN+gSN/2GtLbwi4a3HuTVzWHZw5N1CSlmfRTx8F6zlNyrDEswmIQI6lOAm3ViDxNHp0 dTGVguf53I9A4ghmhxHRe5JqD+GoVUT8suqNxk914SyVGiUYXr2IUXviBuqdYnvimeHNtk /x0ncFnoM+4cE6fIMxpdF1dOm+kXFtwbWpWqhE7EPQHT8R5r+Wtk9HuPS8pciQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680665624; 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=wp4R0TcJou2212z/CnIr2blkE+klHM6MwgwdR8JTu7M=; b=MeAPEp9oQPFsc5b92G/Q9ZbvNr4oshSbk2swO2MzkDEIky//pKCpBiDx5nyTXtpgHWJxSU ++Gd6EXz3etiAHR4yfCXpJecVrmuq4TXuv39cqERow/4UvlNQLhCG6nI9eZtsJFXUgzotj HhGq1JdfaMzamGN9KQbPa69qiz2w/IEN71WfJP1Piry8ageZJStZ961HDzNs5t55OwhMaz XMtsvDQV3xe5JRuGjVrtNQ/mR0n8U0vgEDeWRj7et7//V+Q/PwCHMY/5TbdPxNlO6ZD99K ms6DMKu0kOyBnqWEGfCgZZknzg6eEv8qa6TBqBjSUxhnNKV8SqLJwxHONPH/rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680665624; a=rsa-sha256; cv=none; b=magnydPqz4wMe45OvnDuYUfNrhcm8aHFgclz4YXi+Fgdv+hYyrxzqz7lrEsISL3VBkVkcY t2CV61xzc49k7Y3hRLai+AH2/jl8JPzBKQYj+45ng5sV2fNiBLICVnVI5RixIknHcUdBpi 6e2P2VJhqksDZZxTZHLq0TuRO53dKOvGH16Q1CCgXr3Ng2GpwkA1AqQSPujYnfJHTusgvq 5yG07+uIH6VZ61LijPnCq3A8j4hP4GBMfGT8LpiOXdqcKX4QSoS5ITpFqgdmmGOHtisHkG CTDATVguj1u56/mOvsTA+JL1xDv2O0E6BXe/vQCr2C+TRLN38cHDXsn84Ay3wg== 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 4Prqwm0mpDz16TV; Wed, 5 Apr 2023 03:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3353Xi23098676; Wed, 5 Apr 2023 03:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3353Xids098675; Wed, 5 Apr 2023 03:33:44 GMT (envelope-from git) Date: Wed, 5 Apr 2023 03:33:44 GMT Message-Id: <202304050333.3353Xids098675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 54579376c05e - main - Change kqueue1() to be compatible with NetBSD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54579376c05e7a039cde5f424c641fa29348835f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=54579376c05e7a039cde5f424c641fa29348835f commit 54579376c05e7a039cde5f424c641fa29348835f Author: Konstantin Belousov AuthorDate: 2023-03-31 22:31:41 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-05 03:29:49 +0000 Change kqueue1() to be compatible with NetBSD by making it accept some open(2) flags. More precisely, only O_CLOEXEC is supported, the flag is translated into the KQUEUE_CLOEXEC flag for kqueuex(2), and O_NONBLOCK is silently ignored. Reported and tested by: vishwin Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39377 --- lib/libc/gen/Makefile.inc | 1 + lib/libc/gen/Symbol.map | 1 + lib/libc/gen/kqueue1.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libc/sys/kqueue.2 | 8 ++++++++ sys/sys/event.h | 1 + 5 files changed, 63 insertions(+) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 860e96bcd291..317bb307cf3a 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -97,6 +97,7 @@ SRCS+= __getosreldate.c \ isinf.c \ isnan.c \ jrand48.c \ + kqueue1.c \ lcong48.c \ libc_dlopen.c \ lockf.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 0a20a41d0e20..84432432f4e6 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -436,6 +436,7 @@ FBSD_1.6 { }; FBSD_1.7 { + kqueue1; posix_spawn_file_actions_addchdir_np; posix_spawn_file_actions_addclosefrom_np; posix_spawn_file_actions_addfchdir_np; diff --git a/lib/libc/gen/kqueue1.c b/lib/libc/gen/kqueue1.c new file mode 100644 index 000000000000..b27a8f63019e --- /dev/null +++ b/lib/libc/gen/kqueue1.c @@ -0,0 +1,52 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * 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 + +/* + * Provide some NetBSD compatibility. They support a set of O_* + * flags, we only carry O_CLOEXEC, and accept but ignore O_NONBLOCK. + */ +int +kqueue1(int openflags) +{ + u_int flags; + + if ((openflags & ~(O_CLOEXEC | O_NONBLOCK)) != 0) { + errno = EINVAL; + return (-1); + } + + flags = 0; + if ((openflags & O_CLOEXEC) != 0) + flags |= KQUEUE_CLOEXEC; + return (kqueuex(flags)); +} diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2 index cad4361f2b3c..81bd1c3e52f4 100644 --- a/lib/libc/sys/kqueue.2 +++ b/lib/libc/sys/kqueue.2 @@ -107,6 +107,14 @@ The call is equivalent to .Ql fd = kqueuex(0) . .Pp +For compatibility with +.Nx , +the +.Fn kqueue1 +function is provided, which accepts the +.Dv O_CLOEXEC +flag with the expected semantic. +.Pp The .Fn kevent system call diff --git a/sys/sys/event.h b/sys/sys/event.h index b902f195723e..fe117371b452 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -362,6 +362,7 @@ struct timespec; __BEGIN_DECLS int kqueue(void); int kqueuex(unsigned flags); +int kqueue1(int flags); int kevent(int kq, const struct kevent *changelist, int nchanges, struct kevent *eventlist, int nevents, const struct timespec *timeout);