From nobody Wed Aug 9 04:03:10 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 4RLGcb2LTdz4m6TM; Wed, 9 Aug 2023 04:03:11 +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 4RLGcb0Kvyz3b0J; Wed, 9 Aug 2023 04:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691553791; 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=oirqSHYmMD9ek0BdVEj+wV26QZxKwXYkVUqwhhRvgsc=; b=kLfETmpi2J7wodkTi6quobsKlswhGiS4O9QzuSNentbgn+otyG6t+vF8BTYsGZXHWdZMlF 3lCJylPSlGDUQGoI/qmJEZdE2pFwjcMqaHWPqBkzXuhUMUMHCzh5Pn8cTZcGt8jsVXrmo8 1lbgzC50+KTiFmDXmMEL/FohIqKxfA//uqZSnMNf14QuRi02KUIv7EPqW+8H9+CVcYN/Ou SUQsEWvAzaUy0p0XrFAAu7lLal82d84vgGKS/4NrqYMw9UsCwPYU5u4rPSTGYGQzcjrbxk vCqX1iXoRbxfit8k2lvrPuCEpYdcNJzaFmhJY0vtdEHqmeTLxL3MTFKD8zrtEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691553791; 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=oirqSHYmMD9ek0BdVEj+wV26QZxKwXYkVUqwhhRvgsc=; b=BWqM4lE+ovxgLzq8DNKJMSRtOOh5oKVUhBJeAWVwlBI/umgNFLRRF+5957MwY5mK6OfZZN fC3iBrJc9lkHZs1uXT0P+e5HpxzmwzIoFHCVHU3ruq3RVTPCrjqDhAT64qA8qWR1hYeidg wGlS9pZlzbUNoFbIVHwS6KKPlIpwO2RpY3Rh5gNZVq69gAAes5vrJySDE8Gc0KRPKO3gPU lnKbqicq76bINvXtE1jZWUCfV9d3wjMnOBnNIaZ3rTR/irdsmuJ0Ml6Czk5LXYYyRD1Dt3 YpxmI2ogM9uutchGGyVLhhmYXlFv4YAzqchcnUHZNv15Kq5XSreQ9dS7Qf6rxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691553791; a=rsa-sha256; cv=none; b=Fp7uYw/twk0g/ClkXWyoEbyUg4btjOkmRO/lScqYQyFaHiIcuZ7lsXD7JYtBtcW064JSWn v2FUeoRI0PSyhPWdwadUInOtGMo2kaGC6GaqKcO1fVxa6As8MPRB4tY4e8x6lKoOTWC4X1 9w0zaJlOcOJSGyYUqP+pW4ARcLP7SyHPzztvsfP/OT1FFIYU6bUdtuJir5ydt/FIJK0jma V//6AnQ1pLkmsA/Wju5V9YyKSMQeLCk9Mywbt0tFtFas5N6jPEVUJgNCkG2ME9+rLXl9pn KufBbeh33L8dFHeX0nIhe6Ae82rv+kTMvBKh9FdtdK/4mb4rtd+JUON3SHAbMQ== 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 4RLGcZ6WPNz11Xt; Wed, 9 Aug 2023 04:03:10 +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 37943AQV090199; Wed, 9 Aug 2023 04:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37943AWh090196; Wed, 9 Aug 2023 04:03:10 GMT (envelope-from git) Date: Wed, 9 Aug 2023 04:03:10 GMT Message-Id: <202308090403.37943AWh090196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 821dec4d56a8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 821dec4d56a876db56a82cf1dc54a84905b74f5b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=821dec4d56a876db56a82cf1dc54a84905b74f5b commit 821dec4d56a876db56a82cf1dc54a84905b74f5b Author: Konstantin Belousov AuthorDate: 2023-08-06 01:23:35 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-09 03:54:15 +0000 vnode io: request range-locking when pgcache reads are enabled PR: 272678 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41334 --- 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 83e95731d7c4..c6ca5b9b5120 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1443,6 +1443,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; @@ -1464,13 +1465,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); @@ -1482,11 +1480,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); }