From nobody Sun Feb 11 01:54:37 2024 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 4TXVyP5HFxz596cl; Sun, 11 Feb 2024 01:54:37 +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 4TXVyP32mJz49qm; Sun, 11 Feb 2024 01:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707616477; 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=jD9BU3PosuoOwSwyyuZp3Haewe91719KDu5cMSGGvAY=; b=C5gzRBzNlw/URoBLv/2bbhin4EGTuBtyUjVpA6//PoJKXP3G4inEEopqPaBq7OdcNZO8v2 JMFP7NOwdKwZoXhdMrTCwwdNm4P9zdMQal8vjNnXFVfaTW7wtbUI3xO+EkJtyWUB0mQLtA qEJtzTIAfG4getCN951jBN/ztqjTlTEPXxqU7phmFBNRfMjkR35Z62Q/loaYFF4Wgk8pfM te9WcjRGo3H83VtGAqAfuuQQDmPa2pLE5Ug4oz8laxOs8MvsHKQ97J49jHip5x16BQkCpR KNn8Cxwjt03KthB1bTb1CDouIBBgfdZdhd4P71gwhDGF9kWP2xwJa69GwpC77Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707616477; a=rsa-sha256; cv=none; b=NYafue7q66NSuMg/49UbmL+x1HlpXzchPlRcvtNFqzC1CSggo5xNo+lNKIT6aB9eFgZt3/ qdF9IVzrxFzAOLXiSUljGYtDIp0guw1eEi2E1CIXZ9cO0/ptpOPhAz6XS9hmbTCK7lwVDN BtBrxtFqLLw5hEDuX79t4lyjbmqTeeUl5MchsUWsPoFAT6LPDnA92cGmrYGwbuk+pnZ5Tu EhFAjRdNnOLs9lAFI82FkJmLwQqyCVXLNVfaEeMHBH9XHFP3vIHn6e8e3Wa6OIx/ou9DVB PoK2pVjHBlA7C5Rthn+fuyfB7TxTGECX7MO2/BUSR3T9EQfpAsNuxBeVclQsqA== 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=1707616477; 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=jD9BU3PosuoOwSwyyuZp3Haewe91719KDu5cMSGGvAY=; b=wQDVGJgp+c/op0ArWacyqnTZu1NasopdXBWbnqQbbhC3DKJUroVgJDdRZRAV2UXzx1m8FS qjvwo5jTVSH7jSI9/NbqJvAABB95U2FVs6dot0hc9X4QEpH+UrSQcGttPGaYZo8MgGPShk +X8qHnL2o6cNsKQm23SvGX9KmSpfdaHkfPn5IuvsHFP3TQQvA9BCfW5T8aFsw+5l8Kc2NX bX2ZexPl+tf8FUpyl6wnfMapuG/KJ0c20umz5xgchRNTHCZh5GoEunP8pgjBsWnYz3rVLv qAJV7LS7eZEKv1SMfmBrOnQk3lvv8afgGuQcHNMf95Ri8N3YcuboUJz2JjvQwg== 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 4TXVyP26HWzgy0; Sun, 11 Feb 2024 01:54:37 +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 41B1sb4w090195; Sun, 11 Feb 2024 01:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41B1sbql090192; Sun, 11 Feb 2024 01:54:37 GMT (envelope-from git) Date: Sun, 11 Feb 2024 01:54:37 GMT Message-Id: <202402110154.41B1sbql090192@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: 06cb1c3f9528 - main - libc: add aio_read2() and aio_write2() functions 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: 06cb1c3f9528f088bdaf10d28dcfe7eeaad726d3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=06cb1c3f9528f088bdaf10d28dcfe7eeaad726d3 commit 06cb1c3f9528f088bdaf10d28dcfe7eeaad726d3 Author: Konstantin Belousov AuthorDate: 2024-02-01 02:39:00 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-11 01:54:00 +0000 libc: add aio_read2() and aio_write2() functions as wrappers around lio_listio(LIO_READ/WRITE | LIO_FOFFSET, &iocb, 1); Suggested and reviewed by: jhb Discussed with: asomers Sponsored by: The FreeBSD Foundation MFC after: 1 week Differrential revision: https://reviews.freebsd.org/D43448 --- lib/libc/gen/Makefile.inc | 2 ++ lib/libc/gen/Symbol.map | 2 ++ lib/libc/gen/aio_read2.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libc/gen/aio_write2.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ sys/sys/aio.h | 7 ++++++ 5 files changed, 123 insertions(+) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index bbd090e46b27..8d30e06cfed9 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -13,6 +13,8 @@ SRCS+= \ _rand48.c \ _spinlock_stub.c \ _thread_init.c \ + aio_read2.c \ + aio_write2.c \ alarm.c \ arc4random.c \ arc4random-compat.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 7d1fe00284fd..0821563e0c9f 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -455,6 +455,8 @@ FBSD_1.7 { }; FBSD_1.8 { + aio_read2; + aio_write2; execvpe; }; diff --git a/lib/libc/gen/aio_read2.c b/lib/libc/gen/aio_read2.c new file mode 100644 index 000000000000..3a783e1b1b15 --- /dev/null +++ b/lib/libc/gen/aio_read2.c @@ -0,0 +1,56 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 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 + +int +aio_read2(struct aiocb *iocb, int flags) +{ + int error; + + if ((flags & ~(AIO_OP2_FOFFSET)) != 0) { + errno = EINVAL; + return (-1); + } + iocb->aio_lio_opcode = LIO_READ; + if ((flags & AIO_OP2_FOFFSET) != 0) + iocb->aio_lio_opcode |= LIO_FOFFSET; + + error = lio_listio(LIO_NOWAIT, &iocb, 1, NULL); + if (error == -1 && errno == EIO) { + error = aio_error(iocb); + if (error != -1 && error != 0) + errno = error; + error = -1; + } + return (error); +} diff --git a/lib/libc/gen/aio_write2.c b/lib/libc/gen/aio_write2.c new file mode 100644 index 000000000000..8b5d4a38a6c5 --- /dev/null +++ b/lib/libc/gen/aio_write2.c @@ -0,0 +1,56 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 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 + +int +aio_write2(struct aiocb *iocb, int flags) +{ + int error; + + if ((flags & ~(AIO_OP2_FOFFSET)) != 0) { + errno = EINVAL; + return (-1); + } + iocb->aio_lio_opcode = LIO_WRITE; + if ((flags & AIO_OP2_FOFFSET) != 0) + iocb->aio_lio_opcode |= LIO_FOFFSET; + + error = lio_listio(LIO_NOWAIT, &iocb, 1, NULL); + if (error == -1 && errno == EIO) { + error = aio_error(iocb); + if (error != -1 && error != 0) + errno = error; + error = -1; + } + return (error); +} diff --git a/sys/sys/aio.h b/sys/sys/aio.h index f987f1e1dbd4..6680f9fed3fa 100644 --- a/sys/sys/aio.h +++ b/sys/sys/aio.h @@ -55,6 +55,11 @@ #define LIO_FOFFSET 0x40 #endif +/* aio_read2/aio_write2 flags */ +#if __BSD_VISIBLE +#define AIO_OP2_FOFFSET 0x00000001 +#endif + /* * LIO modes */ @@ -275,6 +280,8 @@ int aio_mlock(struct aiocb *); #if __BSD_VISIBLE ssize_t aio_waitcomplete(struct aiocb **, struct timespec *); +int aio_read2(struct aiocb *, int); +int aio_write2(struct aiocb *, int); #endif int aio_fsync(int op, struct aiocb *aiocbp);