From nobody Fri Jan 12 12:01:28 2024 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 4TBKrT0FbVz56h3P; Fri, 12 Jan 2024 12:01:29 +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 4TBKrS534Vz4qCv; Fri, 12 Jan 2024 12:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705060888; 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=JujJ1NzMP6ZWkhgE1sQUvDmaWIBq1ZP76FW/dFgcBIQ=; b=Tx3yv2kNBngmMoFTngWm6nzmP/2Va9eD446CYTcP7NjWQ1fT7pOy+mmDRh3ywZa6WBxxbS B3Qv4oiSmS6evzgkhYJZTsEuHWoony8+v0T5vQKrlPN5ZG//a/vQUZ43V3itl3JVaoUP+d DKaVaKMCI9cc81qxSkY8JdFo3gEtOkuNXp6nJCL/uvUzTdCHvaeobtMbAvlMuo8XzaMJah zaRaQEUlLJkafv/0NBiTDRbfbkzRmwsSTlJ8zWOSHrFPkEVnAJ2UL/hJ425ypSnDliKvak QeBFtkcvmEuCx1MOVK7q+nEXDsjCn3OMvwRULKtbjCOol8dbJxEJNMCyUPXUTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705060888; 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=JujJ1NzMP6ZWkhgE1sQUvDmaWIBq1ZP76FW/dFgcBIQ=; b=dfNeGMFtOdXCw0UrcVMHLF+qihUkgGE4sxL0YFRlTPr2eJhJodyFFXPlDPhBUpwVrY3+bs KCkp7cwkDZv39ziVVB0o0q1l12JgUdM8g18uwbzWLzukOGIJEybsG40V9XlqvfQr6NbLOy FRyKKGAJtRlqoKEcioFXxtjIG5GjZK1vj+7WjGRp/tm6aSPBkq4GMsi296ObyVJejwGPdx 16qNFXKw/DNG4fD2EcL3HnXtGPeZYFgrkJuzMuAnOIMf7B3/Fyx9SfEuDwtJRc4fXr4mqg grxwyJg7mFFaygLoyX1RBfv97aD9mnpeFBuxJ47PvaLGW0i5u2nlHxw93qLQ0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705060888; a=rsa-sha256; cv=none; b=ojw2QlgZtSiGHYC9rsAx3wYsEwEjQ7FfpKdgieg771EVJopfQ5P3VnO+u/MXKNQM6mTC+5 xia/KsRjkTTlMe0i3WCE0zoNzCrO0gZVapMXz10NVHUtFfkKherNAKAhP7hshO5T+x953Q 3dKyJJLJ5bkslGP52YjMGwu2PcAv0kpaJAb4mrgROwyJ37L5P9PMaLndj3Y+wwBHoXBTvs 2/WP5Z5m6so2u14ozFuI0DV4vobYsspCLWEYXAHf+DVzd5SL2OLBoQijuLLkHlHCBVB5wl B79zz6SycfdCZhHMt6JDFm59KitUxMLEt5nowGxhNPMdg6iKZLirz41nPLs1Nw== 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 4TBKrS46Y2z11nk; Fri, 12 Jan 2024 12:01:28 +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 40CC1SNs000754; Fri, 12 Jan 2024 12:01:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CC1StQ000751; Fri, 12 Jan 2024 12:01:28 GMT (envelope-from git) Date: Fri, 12 Jan 2024 12:01:28 GMT Message-Id: <202401121201.40CC1StQ000751@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: cbf323cf503b - stable/14 - nfsclient: limit situations when we do unlocked read-ahead by nfsiod 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/14 X-Git-Reftype: branch X-Git-Commit: cbf323cf503b69516ef19542c4630c0d42d74b05 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf323cf503b69516ef19542c4630c0d42d74b05 commit cbf323cf503b69516ef19542c4630c0d42d74b05 Author: Konstantin Belousov AuthorDate: 2024-01-01 22:22:44 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-11 16:46:53 +0000 nfsclient: limit situations when we do unlocked read-ahead by nfsiod (cherry picked from commit 70dc6b2ce314a0f32755005ad02802fca7ed186e) --- sys/fs/nfsclient/nfs_clbio.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c index 63e97f405198..7b9b68782d53 100644 --- a/sys/fs/nfsclient/nfs_clbio.c +++ b/sys/fs/nfsclient/nfs_clbio.c @@ -484,9 +484,14 @@ ncl_bioread(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred) on = uio->uio_offset - (lbn * biosize); /* - * Start the read ahead(s), as required. + * Start the read ahead(s), as required. Do not do + * read-ahead if there are writeable mappings, since + * unlocked read by nfsiod could obliterate changes + * done by userspace. */ - if (nmp->nm_readahead > 0) { + if (nmp->nm_readahead > 0 && + !vm_object_mightbedirty(vp->v_object) && + vp->v_object->un_pager.vnp.writemappings == 0) { for (nra = 0; nra < nmp->nm_readahead && nra < seqcount && (off_t)(lbn + 1 + nra) * biosize < nsize; nra++) { rabn = lbn + 1 + nra; @@ -674,6 +679,8 @@ ncl_bioread(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred) */ NFSLOCKNODE(np); if (nmp->nm_readahead > 0 && + !vm_object_mightbedirty(vp->v_object) && + vp->v_object->un_pager.vnp.writemappings == 0 && (bp->b_flags & B_INVAL) == 0 && (np->n_direofoffset == 0 || (lbn + 1) * NFS_DIRBLKSIZ < np->n_direofoffset) &&