From nobody Sun Feb 18 10:02:24 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 4Td1S15gNHz5C7l9; Sun, 18 Feb 2024 10:02:25 +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 4Td1S05Lqdz47HS; Sun, 18 Feb 2024 10:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708250544; 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=LC+r0g7YpnowAGf7m4+/B1n+QwvgNGfKVgUGZrgXMK8=; b=g/7L4wuXg+pJDAkfKhB6IfA5q+aGLjbD3UFkXo9c49zWelRQNkKcWGlXcvaZopAApodOeC 8QqDfYpohyAlMwBt5Msx7k7tnTSjDjurJ90hbf+Vb4oTRQE8qNKnrUFDnPe4DezCu+WYYW f3sarBsYYEKQl1X4DGLKx7gEoGxm+KjsuO3junctRu5sTLrC8Wboa8/zFFRAQouPrkxQSq Cki7ng84wKvLD38pupCa24vG2VhAqgvq6vQFZtD7YRB554vCzACQ2DtMj7gKEieNvNBwjU NVACvXO0Rr681ip3VAksW8Vs3/zeLEdf1jwUkdlYFAYe0VtCRKdspZ5ZI9HY+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708250544; 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=LC+r0g7YpnowAGf7m4+/B1n+QwvgNGfKVgUGZrgXMK8=; b=iNi/zCI3WxaO2D0o3R2cPzgJRC7aBx3/w+999/4gdgwEKrs8AJ21g4geh0A5ao4MoFu/Zu KlKa490c5c/QV0cxQQIMbYvfwEEA8HA03meSZr2eXAHSUUPf2SHOG0LwCi+NC66n5nu9pJ sm3x9OyrazMG3CdyEiBP/U6/jfN7x2wUqYVofIFlZxovvK8Ew6dH1G9QsZOm1S6vl7wLGN /pgPSW0Qh3fV2ad/3TGF37F/+ZsS/l9kV6LDFzU8amxRc2I0THbQp16VXoXxCeJtO/33me YPpLhrlTN20u2sdfelwHasxLUx+Lm6iTA7q9Z7ntjPtqA5PVElgj2WlNNVC2yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708250544; a=rsa-sha256; cv=none; b=NXG9kNycVjA5lm6CLfS/nrTGJEOLUWqdVWNs3UNxupfQeXXLFdxW2gaoHAETDL3ytaKHjh QVyqMrMP9gM2hmJBb5LsSj/pBLkltRLjjREQ7fWtBBLJe4WK1IVUgQGso4yo1T2w0Xmgy2 ezA8IzjTYAKoPtObwy2WsBR/NdVHsN8z4FkJ8rgwWEfiBfNoDLXJnGocuCGamgSpRwrnaU Xv/BuQMohU51zm6d9TIXDkz701FATscCQIwU3brcErS3Emi2pLRy9P6sgXgm5iUx3ewNyM g2GArRVSrjJWbFOfFKZW+7iN9+XqjQ2Il7bQQzdPd6lQ9657gWmrVYqTDczPjA== 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 4Td1S04NppzmYW; Sun, 18 Feb 2024 10:02:24 +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 41IA2Orj084548; Sun, 18 Feb 2024 10:02:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41IA2O5r084545; Sun, 18 Feb 2024 10:02:24 GMT (envelope-from git) Date: Sun, 18 Feb 2024 10:02:24 GMT Message-Id: <202402181002.41IA2O5r084545@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e331ce2d60b6 - stable/14 - aio_read2/aio_write2: add AIO_OP2_VECTORED 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e331ce2d60b6ffb3aa67f882d91336a587d07e40 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e331ce2d60b6ffb3aa67f882d91336a587d07e40 commit e331ce2d60b6ffb3aa67f882d91336a587d07e40 Author: Konstantin Belousov AuthorDate: 2024-02-03 18:09:36 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-18 10:01:46 +0000 aio_read2/aio_write2: add AIO_OP2_VECTORED (cherry picked from commit 8dfc788b8480a13f1f945f0a94d8b1e327af5c6f) --- lib/libc/gen/aio_read2.c | 4 +++- lib/libc/gen/aio_write2.c | 4 +++- sys/sys/aio.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/aio_read2.c b/lib/libc/gen/aio_read2.c index 3a783e1b1b15..a5186d509b26 100644 --- a/lib/libc/gen/aio_read2.c +++ b/lib/libc/gen/aio_read2.c @@ -37,13 +37,15 @@ aio_read2(struct aiocb *iocb, int flags) { int error; - if ((flags & ~(AIO_OP2_FOFFSET)) != 0) { + if ((flags & ~(AIO_OP2_FOFFSET | AIO_OP2_VECTORED)) != 0) { errno = EINVAL; return (-1); } iocb->aio_lio_opcode = LIO_READ; if ((flags & AIO_OP2_FOFFSET) != 0) iocb->aio_lio_opcode |= LIO_FOFFSET; + if ((flags & AIO_OP2_VECTORED) != 0) + iocb->aio_lio_opcode |= LIO_VECTORED; error = lio_listio(LIO_NOWAIT, &iocb, 1, NULL); if (error == -1 && errno == EIO) { diff --git a/lib/libc/gen/aio_write2.c b/lib/libc/gen/aio_write2.c index 8b5d4a38a6c5..8f4f6a35fd4d 100644 --- a/lib/libc/gen/aio_write2.c +++ b/lib/libc/gen/aio_write2.c @@ -37,13 +37,15 @@ aio_write2(struct aiocb *iocb, int flags) { int error; - if ((flags & ~(AIO_OP2_FOFFSET)) != 0) { + if ((flags & ~(AIO_OP2_FOFFSET | AIO_OP2_VECTORED)) != 0) { errno = EINVAL; return (-1); } iocb->aio_lio_opcode = LIO_WRITE; if ((flags & AIO_OP2_FOFFSET) != 0) iocb->aio_lio_opcode |= LIO_FOFFSET; + if ((flags & AIO_OP2_VECTORED) != 0) + iocb->aio_lio_opcode |= LIO_VECTORED; error = lio_listio(LIO_NOWAIT, &iocb, 1, NULL); if (error == -1 && errno == EIO) { diff --git a/sys/sys/aio.h b/sys/sys/aio.h index 6680f9fed3fa..919a6180b130 100644 --- a/sys/sys/aio.h +++ b/sys/sys/aio.h @@ -58,6 +58,7 @@ /* aio_read2/aio_write2 flags */ #if __BSD_VISIBLE #define AIO_OP2_FOFFSET 0x00000001 +#define AIO_OP2_VECTORED 0x00000002 #endif /*