git: e9014ead574f - stable/14 - libc: add aio_read2() and aio_write2() functions

The branch stable/14 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=e9014ead574fe17b094110b78c2af40c61f9eee4

commit e9014ead574fe17b094110b78c2af40c61f9eee4
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-02-01 02:39:00 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-02-18 10:01:46 +0000

    libc: add aio_read2() and aio_write2() functions
    
    (cherry picked from commit 06cb1c3f9528f088bdaf10d28dcfe7eeaad726d3)
---
 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 3a3aa41c7d59..408eb2ff1e28 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -15,6 +15,8 @@ SRCS+=	__getosreldate.c \
 	_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 51c7348c5cc4..1f8d77e7cd0a 100644
--- a/lib/libc/gen/Symbol.map
+++ b/lib/libc/gen/Symbol.map
@@ -458,6 +458,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 <kib@FreeBSD.org>
+ * 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 <sys/aio.h>
+#include <errno.h>
+#include <stddef.h>
+
+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 <kib@FreeBSD.org>
+ * 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 <sys/aio.h>
+#include <errno.h>
+#include <stddef.h>
+
+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);