From nobody Wed Aug 16 09:17:30 2023 X-Original-To: dev-commits-src-branches@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 4RQjG24Sh4z4qS3F; Wed, 16 Aug 2023 09:17:30 +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 4RQjG23b66z4Dx2; Wed, 16 Aug 2023 09:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177450; 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=7CCQT8BGE1y7XcV4MQ+skuc1Q9vWccxNFB3q9DMbKZQ=; b=anIMTH26VbPBzmdpHzYcnl5m374UoHlAKg+1eg9IhlomroRX5gAd890DFwHbg7/wAMqFzi oKBElsFTv8gUVKraQse4QsOhddA8+faJf7iTZzzuK8knNd0rFIX3mbB8Vbz+eEKIMZYd/e /IT3oodZp7zvdJ+lnm1DjykeF/prqOCKaX38sxtiA45FQaWwCrbQGBUa7pnWC+UTWke3tt K21L/2Fj36wV3MjykeM1SqYyrTqVOvnwY6N0UD2xOp0Uq0L85WxPPWRHtgv97HPao838Ud hb4fShlH6Xyi7+ob0hdRXxf0EvhNW8oiDI23YQOGrrnSLWuSfAIkRDzH4Tb3Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177450; 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=7CCQT8BGE1y7XcV4MQ+skuc1Q9vWccxNFB3q9DMbKZQ=; b=WmIPhDgbnkDLYDK7x9KhXTbx1VIK9rz0sBa2umRGo0d4Y+PT5GCBop5S8uE0PhJulPGmen Kjrqk0V/AcCr/v/oCnpfeYZRztId+GQrnH+aIutOjb6Qprov+8WYw6wL2tmgzuK+6uQ7X2 cP5PyeJjvL2SeTvNewKY8y8JZDVfVx/X7OmkSfICQdhRaP692wMh35gMdBpOd2mQr/9447 ON8RusDkJaJL42E3Gf7McSGWWFmOumwLovFL0AXG7C+QLvTXijfPm/Ti8cyQd5QBIx6u+4 gQHDemVzrRJ9+ULB1Jsu2ZZ5eY9VXGii9Hn02sx+x36NEpkonlU14AwC30GhHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692177450; a=rsa-sha256; cv=none; b=fpV0IuLCUlfILSKO15gSwljA/KkKnVrIVTDOIAxVixfdfBimNZeXqXwwk2Qhr5HHeK0wMy VHoRPOXay8F7fvexd/wjxBiVas5C4Dqs2+/aYt7PJk0mbBW7h8olcBd+bFB45QwJ/XMcY/ cgKZEeyB+1BmJ/PvnXCwVSIlogvnHdFC5e6GvnCEpG80df0f8iRsfxFjyS+KxjWm7P38uO mTErgSUEgZvvUzukDahwP9sGEPTJp2BlYv3vIb+3LBKZFLv5oQEgQcYi8cN9JpdCBy7rPv iMGh4rR7nVu+mBEt0i+DE/VVX74k6yTnzQ2lRmHaoiDZQlkX30I2d26OqhELaA== 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 4RQjG22Q79zm5D; Wed, 16 Aug 2023 09:17:30 +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 37G9HU5O093611; Wed, 16 Aug 2023 09:17:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G9HUnt093608; Wed, 16 Aug 2023 09:17:30 GMT (envelope-from git) Date: Wed, 16 Aug 2023 09:17:30 GMT Message-Id: <202308160917.37G9HUnt093608@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: b9ccef49d02c - stable/13 - vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: b9ccef49d02c9ad9e3b986347562408d80271b6c Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b9ccef49d02c9ad9e3b986347562408d80271b6c commit b9ccef49d02c9ad9e3b986347562408d80271b6c Author: Konstantin Belousov AuthorDate: 2023-07-23 15:55:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-16 09:16:09 +0000 vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault() PR: 272678 (cherry picked from commit 5b353925ff61b9ddb97bb453ba75278b578ed7d9) --- sys/kern/vfs_vnops.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 8f618a9ad46d..42080181d094 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 rl_locked; doio = uio->uio_rw == UIO_READ ? vn_read : vn_write; vp = fp->f_vnode; @@ -1464,12 +1465,7 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, } 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 (vp->v_type == VREG) { if (uio->uio_rw == UIO_READ) { rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); @@ -1481,11 +1477,22 @@ 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); } + rl_locked = true; + } else { + rl_locked = false; + } + 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; 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 (rl_locked) + vn_rangelock_unlock(vp, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); }