From nobody Wed Aug 16 09:17:32 2023 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 4RQjG53F7Rz4qSD0; Wed, 16 Aug 2023 09:17:33 +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 4RQjG455P4z4F0g; Wed, 16 Aug 2023 09:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177452; 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=GrddOUuFDRXzRRSz0Bd0x1Wib4Fc4ioI4HCIQO9dz5Q=; b=elN5eeFEXLS9d+gPXEZRKSlVZ0+JMhL9S6RNu1Uy52Gq/z/GPOvORzAVRrgUgFY3XnOUgt 0veirPEz9eWR6CohOncN6LSet2VDpBhpr5KLEsa7C4xH4PuhfSmCU8jADQ4S83PSWisxVB X1bzlQqk+IOipPLeRDX73VJ+Hj+8LA8i23Lk1aPOOM37VK2K9x+uGCylPO5I5Ay3OH7xV2 zlrapBFxFb0ko4602h1A7SUGBhz2yC5VwXVqDztdmo4x5J8uR/fojyXBpvCNwgV/Ury/kU NkK+nhLm4tBZy4hM66yTFFqZgMtb2Xvr0TTRhCSsh9C7V0ZMzJ8UvhlcTgFHkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177452; 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=GrddOUuFDRXzRRSz0Bd0x1Wib4Fc4ioI4HCIQO9dz5Q=; b=skpssNCgHNRk1SOPFcstmkKi8715wat1RxhcF2pew2se+pOix3sokEOS8K4QzU4mq5aP9j GrVm4KMzXYykFOHSBSFAkV/cvL7BkJ8Cw9fdeTRULSL/57Un76kpyMAFUeMTcDDcVhAxRd jryO0c3hnn+y+00Gc4Y67kbbTYvYlCqUyioL5oBoSh4tWkSrC6LmVHRhuwmjQWRVTPAWUY GO7RSYbonmidYqjmsYtJkRQ49tWKwkSsdo7hfzeHUm0zFCm68iXRAlhm3vExr6jV8GQOUu nIyhVKpi0whzselUDgybNN/FShoxpE7PhSRgUOk0PbuHT74SnOWlfcSjzPapeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692177452; a=rsa-sha256; cv=none; b=oWWK5ZHcfC/qzMo6U7zmzatOArnzL1L/iW/ADA58YtKdcUw3R0KR2vO/sgSbIzg5D0ySK7 E1nZEH0YZLgpIUqio5Q14ZoNr46aFg7xpwmcdURrAsVPe5XG2LVwK5cc66j1jTJTeRxHeM 8W/YwU3dPV/OM2Npf8orBBzQZBoLRbajhfLuQ5aAC3bJvoSdfbfV5LDeZdX3xCjo9lsJOG KDfcqti1D0Rg8tUfp8Y1sU2FxfWQgBg7B7YTFuKOJ7/wHB0E1Kho4qu4/iNEhyYtgT7ADk dvOl2XZy1evLhTzLNlPf/Elhz6epKEh+BcsoqFbzn5nkI8c/IznJh4faJj+/rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQjG43yq5zm5F; Wed, 16 Aug 2023 09:17:32 +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 37G9HWvB093716; Wed, 16 Aug 2023 09:17:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G9HWej093713; Wed, 16 Aug 2023 09:17:32 GMT (envelope-from git) Date: Wed, 16 Aug 2023 09:17:32 GMT Message-Id: <202308160917.37G9HWej093713@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: ee3b3146293c - stable/13 - vnode io: request range-locking when pgcache reads are enabled 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/13 X-Git-Reftype: branch X-Git-Commit: ee3b3146293c0dd2e8a779ebb0a3ee65318e8c3b Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ee3b3146293c0dd2e8a779ebb0a3ee65318e8c3b commit ee3b3146293c0dd2e8a779ebb0a3ee65318e8c3b Author: Konstantin Belousov AuthorDate: 2023-08-06 01:23:35 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-16 09:16:09 +0000 vnode io: request range-locking when pgcache reads are enabled PR: 272678 (cherry picked from commit 821dec4d56a876db56a82cf1dc54a84905b74f5b) --- sys/kern/vfs_vnops.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 8f618a9ad46d..d9bd52c2822e 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1442,6 +1442,7 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, void *rl_cookie; struct vn_io_fault_args args; int error; + bool do_io_fault, do_rangelock; doio = uio->uio_rw == UIO_READ ? vn_read : vn_write; vp = fp->f_vnode; @@ -1463,13 +1464,10 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, return (EISDIR); } + do_io_fault = do_vn_io_fault(vp, uio); + do_rangelock = do_io_fault || (vn_irflag_read(vp) & VIRF_PGREAD) != 0; foffset_lock_uio(fp, uio, flags); - if (do_vn_io_fault(vp, uio)) { - args.kind = VN_IO_FAULT_FOP; - args.args.fop_args.fp = fp; - args.args.fop_args.doio = doio; - args.cred = active_cred; - args.flags = flags | FOF_OFFSET; + if (do_rangelock) { if (uio->uio_rw == UIO_READ) { rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); @@ -1481,11 +1479,19 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, rl_cookie = vn_rangelock_wlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); } + } + if (do_io_fault) { + args.kind = VN_IO_FAULT_FOP; + args.args.fop_args.fp = fp; + args.args.fop_args.doio = doio; + args.cred = active_cred; + args.flags = flags | FOF_OFFSET; error = vn_io_fault1(vp, uio, &args, td); - vn_rangelock_unlock(vp, rl_cookie); } else { error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td); } + if (do_rangelock) + vn_rangelock_unlock(vp, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); }