From nobody Wed Apr 30 21:23:55 2025 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 4Znqth0yl0z5v1v4; Wed, 30 Apr 2025 21:23:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Znqtg6RT5z46bQ; Wed, 30 Apr 2025 21:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746048235; 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=rzG96pg4t1R/nJYciWeiHlINhnBviN1xgv4sCcuZjxA=; b=CwmvsYF+3tsnBwAbMKLohUarckjq8gRtTF7awjJ1j6lu3QXWlob4Kj6/78iwF1kjIW1NnD 12nm8Dew6iiPUfq7BgQbwVsNRkTsYC0BQUKpH5UtahXbvWyE7GOUqBWYjXHx1E7Il2LbCq 7mGCbwr2SmvQnizIgiqcHzUSV3GMiBn3JXmsj2PUv22dU3KeJi+4Paj6/I+Nxy2R4baBdN b2r7ZHfFAfydu6nfH3a1GMUQuPJQ4UcvtmpQFYViV0mCIjnquW/HTjDJq3sLFT5My8ZJ7Y DKJmYNfEdd1wXvGmcsLzILDfL9cTtGRofyKezo9sWly1+lMd4LJ886Q5IvnolQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746048235; a=rsa-sha256; cv=none; b=p8sFPNP8DxhhUDijbW2m13TydOGjz8phZhpcl2vjMp2GJm+ws/3kKJ45q/2gOY75vR0duH 9AnNQ6Ba1mNFgHpIz/v1X5vWNgsH6JFPG7eAmKZW6L4f/B8iz/mxRApADaCcaSXUC3QiDf DZIYA9SW4U3pauS7Bq7ubSLK41DdpvpBPVWd0+ZyM4W7vsB7qd8wGYfuQg4VOMhUOtVLOS wkAzv9Zf62FuLNHzhj0UcIe/GVlupdv6q/GkZjpBAUH/p+OFqL5HbsK9JXHb6Z6VmW5Qxm KLLG4AuAGT1byDfVdAdQMxopiEXbTRmzMoh4V/ly35qgnz8D1CO3YZOUsbUn3g== 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=1746048235; 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=rzG96pg4t1R/nJYciWeiHlINhnBviN1xgv4sCcuZjxA=; b=ZDKhdUgHs7VbUzyHKZK8UC4rIkl+BZUQ1KNyzmt/uyGzEuL5lCJ1lUw/eIbi2PEj8pIi7n o8IIj4noH63cIo3pttWCTgiOZsWy5JuCkXJFQ8TgXml96UTJKuxYVaotA7D80+n74V9Av6 gLapYYq7PadJefayl4jGrQerGJ8AL1MGUZYycu69ho0KvupTFzBzCcLx3ROZn/7D90SLrB vemZtokIuqDnxz9PC9VDicrnKO4DXSQoSA/aq3kqMCi4pt30Bj3lwCChL2iHYY0OHAEVc/ xhB9TWISUSGHUxSdm11HbBWYobodI5xQ5zUKlL5lLDEz8gM69tXGOoVhOBEDoA== 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 4Znqtg5y0bz78t; Wed, 30 Apr 2025 21:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53ULNtBJ045768; Wed, 30 Apr 2025 21:23:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53ULNtT1045765; Wed, 30 Apr 2025 21:23:55 GMT (envelope-from git) Date: Wed, 30 Apr 2025 21:23:55 GMT Message-Id: <202504302123.53ULNtT1045765@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a1424b75453f - main - uio: provide uioadvance() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1424b75453fe0bcf24a9794378287b675ee4517 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a1424b75453fe0bcf24a9794378287b675ee4517 commit a1424b75453fe0bcf24a9794378287b675ee4517 Author: Gleb Smirnoff AuthorDate: 2025-04-30 21:23:25 +0000 Commit: Gleb Smirnoff CommitDate: 2025-04-30 21:23:25 +0000 uio: provide uioadvance() The function advances data pointers forward in given uio by offset. It is planned to be used for interaction between aio(4) and unix(4). Differential Revision: https://reviews.freebsd.org/D48920 --- sys/kern/subr_uio.c | 31 +++++++++++++++++++++++++++++++ sys/sys/uio.h | 1 + 2 files changed, 32 insertions(+) diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c index ff63ac3e2dc0..6ac932fb6690 100644 --- a/sys/kern/subr_uio.c +++ b/sys/kern/subr_uio.c @@ -287,6 +287,37 @@ out: return (error); } +/* + * Advance the pointer in the uio by offset. + */ +void +uioadvance(struct uio *uio, size_t offset) +{ + + while (offset > 0) { + struct iovec *iov; + size_t cnt; + + MPASS(uio->uio_resid >= 0); + MPASS((size_t)uio->uio_resid >= offset); + MPASS(uio->uio_iovcnt > 0); + + iov = uio->uio_iov; + if ((cnt = iov->iov_len) == 0) { + uio->uio_iov++; + uio->uio_iovcnt--; + continue; + } + if (cnt > offset) + cnt = offset; + iov->iov_base = (char *)iov->iov_base + cnt; + iov->iov_len -= cnt; + uio->uio_resid -= cnt; + uio->uio_offset += cnt; + offset -= cnt; + } +} + /* * Wrapper for uiomove() that validates the arguments against a known-good * kernel buffer. Currently, uiomove accepts a signed (n) argument, which diff --git a/sys/sys/uio.h b/sys/sys/uio.h index 1c9d2d39cf57..ec4e92d852a6 100644 --- a/sys/sys/uio.h +++ b/sys/sys/uio.h @@ -90,6 +90,7 @@ int physcopyin_vlist(struct bus_dma_segment *src, off_t offset, vm_paddr_t dst, size_t len); int physcopyout_vlist(vm_paddr_t src, struct bus_dma_segment *dst, off_t offset, size_t len); +void uioadvance(struct uio *, size_t); int uiomove(void *cp, int n, struct uio *uio); int uiomove_frombuf(void *buf, int buflen, struct uio *uio); int uiomove_fromphys(struct vm_page *ma[], vm_offset_t offset, int n,