From nobody Wed Aug 16 09:17:31 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 4RQjG34mnDz4qS3G; Wed, 16 Aug 2023 09:17:31 +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 4RQjG3492hz4FH4; Wed, 16 Aug 2023 09:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177451; 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=QubN6wewfC3qcBT537985FxaZ167GqdaNitI/xK+JsA=; b=kPlJ9p6QBDOWZNVno60bQmwwKx5OjoxBKtATTz4Khg1c3Tkxk/ce7bWGt5CUPB9uM3RVUE RJcaweS/vI2VWYqCTgAQ5/oBHxAvaFjr5LbE7znnwx3G1iX6GJ7UA6b+MNCnZ49sJeYGSE 1V7gtrtM7XRrR0YJ703A5PDP6Odzi7rme9SCFBkd1SxZIulHZfIrxcWU2Ku2rKKO9xGh2A 6b4QmvpxIMmUmdRWjgiAP9ZrY5JWIzvGGkussxVMDOGbIfpZLO24reRwDiWgbsW1+vZJka DCoQJcdBbi5OkMmKguA49HfTlR/lioun4vBlGlTDpYp/nzk3cvRIj8oYDAaGzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177451; 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=QubN6wewfC3qcBT537985FxaZ167GqdaNitI/xK+JsA=; b=d7tgYvtZoqkyasq1kHqf53LXhbC1jioIOGNVUwFUhqLxSpi/MmVe+NdIja3zcNn8oNoJov bN6Z2FXUY/LxK2eN6llKSTUQAtCi/hJ4Kp3rV12jnYsDqSlYyfZsP3FaXzP0ed37Xyv+V1 xBC6dKvaN16WvPB4m3TgthoWFx34UvauQEHnoFm34ZtEj64KXNt7cCMwmUmYhh4I3J2WTG lNPfBG310dO4bw8MpIixtqE0No8oXiau8kASZwv3oK5PrTusqdYSSBXGTit6fCFnON93CE lex10RgwA/p9USWVpWu20efQIqVY+hiM/VOB1gZ7ozXS7w3taKz9yw4NeASnxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692177451; a=rsa-sha256; cv=none; b=XHn75NPakuoUXdalrDN9/OCTMAH7PV0HmhPEA4yVdxEQfxgBDl/4XDr7Z7S+UdI8hkZZfm BBphvYsvJd+xHsIqmdagrwNaOeHmH5RKgAL7vgvY4E2g8GBg2rChnW+rST1iNF+0Pqh28m 0K0dg9Vu4w5LuYh4+8cKitLW8TeVjQypIWQHStvzJBwsCjhmvzRVWN1yVneyWDmhoYUH7k eslpOwnglD4IRwRkGxrInqrvxqbJAWPF/ga3M1JNt1ZZ8rkBqyh2eNfHwofg5H3jQC4k7o sPFlzyALYXiQvXdddSGEktbWBgG2SMMqk/FfQ2dudwc8p9vcV9JntgvLtcXhbw== 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 4RQjG32wBMzmVD; Wed, 16 Aug 2023 09:17:31 +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 37G9HVMm093662; Wed, 16 Aug 2023 09:17:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G9HVdr093659; Wed, 16 Aug 2023 09:17:31 GMT (envelope-from git) Date: Wed, 16 Aug 2023 09:17:31 GMT Message-Id: <202308160917.37G9HVdr093659@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: febdac6a879a - stable/13 - Revert "vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault()" 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: febdac6a879ab5727d00086fc7c6f295b3036896 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=febdac6a879ab5727d00086fc7c6f295b3036896 commit febdac6a879ab5727d00086fc7c6f295b3036896 Author: Konstantin Belousov AuthorDate: 2023-08-06 01:23:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-16 09:16:09 +0000 Revert "vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault()" (cherry picked from commit 651fdc3d198d066b18823db3b74cf38a0144dfac) --- sys/kern/vfs_vnops.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 42080181d094..8f618a9ad46d 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1442,7 +1442,6 @@ 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; @@ -1465,7 +1464,12 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, } foffset_lock_uio(fp, uio, flags); - if (vp->v_type == VREG) { + 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 (uio->uio_rw == UIO_READ) { rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); @@ -1477,22 +1481,11 @@ 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); }