From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9013E3FFD for ; Mon, 20 Oct 2025 12:55:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760964908; cv=none; b=CJzufgh4KHr5CsinOPkDKqY3MUqyD5zYWzLlLgmaTXkgMsVbq95Miuumo8UnaZUGM9kLUDvJEGs43xcilw+VYTdf2zC0InrqyBRbjmNycP2wAHNUh8Sxg98O6HNFvMXuvB0pa/Z8kP7OJRgAcBHHARtwkcPLLqdLPAlWide0TVg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760964908; c=relaxed/simple; bh=Nc2M4qmpnsJ5R8fM55kyUFGBKra3bTpWJIIy1D1j49U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ixGFIBCmq/L0pxo5RyushmKyx1cmBUmARxDaykng39PSHFIjDmZ1aqxTCS9QvK612Wse1qVPZ7Z8pzML9oCCGNScfiEWi6N5bi9k1OAv5+5ErK12d9XF6jP0VfQiPSpJqrzQJAEcyXdQ9gOzx00XVBrscH1OYBCqx07QJTYs7L8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pOc+YXSn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pOc+YXSn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0882C116B1; Mon, 20 Oct 2025 12:55:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760964908; bh=Nc2M4qmpnsJ5R8fM55kyUFGBKra3bTpWJIIy1D1j49U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pOc+YXSnDlyUC6icNzq8qDpNSEy8neXQfpdwUctk5+YvAwPusaK5hNSz83AoQtLzY cgK1E4RKGuRoDChEpPzZFjjEXgu6Z98XwsGtZnFQ9Bzu4I7iH+KVxmZrhbtRLPrtaq O0MEvSLMk6hCejsDq2cP+/G3KIMeLxBZeVBG/gEjlamLCUjBU2zmSnY/0rLVwm6e44 1VNOs3vwYfuKT/7uAGgN5F2r9lEgD8CUqKRrkCdIJDWTsPhyTBg+Ie3GxtF+GPoZ0e r6a1yPDpS+kYFjjMhvs67cmifc+4hCP+JRaObQbB8IsRF8j+aKoUjo1XxEPwwjgko7 XPeD/7sZN64tg== From: Sasha Levin To: stable@vger.kernel.org Cc: Sergey Bashirov , Konstantin Evtushenko , Christoph Hellwig , Jeff Layton , Chuck Lever , Sasha Levin Subject: [PATCH 6.1.y 3/3] NFSD: Fix last write offset handling in layoutcommit Date: Mon, 20 Oct 2025 08:55:03 -0400 Message-ID: <20251020125503.1760951-3-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251020125503.1760951-1-sashal@kernel.org> References: <2025101658-county-probation-13a9@gregkh> <20251020125503.1760951-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sergey Bashirov [ Upstream commit d68886bae76a4b9b3484d23e5b7df086f940fa38 ] The data type of loca_last_write_offset is newoffset4 and is switched on a boolean value, no_newoffset, that indicates if a previous write occurred or not. If no_newoffset is FALSE, an offset is not given. This means that client does not try to update the file size. Thus, server should not try to calculate new file size and check if it fits into the segment range. See RFC 8881, section 12.5.4.2. Sometimes the current incorrect logic may cause clients to hang when trying to sync an inode. If layoutcommit fails, the client marks the inode as dirty again. Fixes: 9cf514ccfacb ("nfsd: implement pNFS operations") Cc: stable@vger.kernel.org Co-developed-by: Konstantin Evtushenko Signed-off-by: Konstantin Evtushenko Signed-off-by: Sergey Bashirov Reviewed-by: Christoph Hellwig Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever [ removed rqstp parameter from proc_layoutcommit ] Signed-off-by: Sasha Levin --- fs/nfsd/blocklayout.c | 5 ++--- fs/nfsd/nfs4proc.c | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c index 01d7fd108cf3d..59f119cce3dc6 100644 --- a/fs/nfsd/blocklayout.c +++ b/fs/nfsd/blocklayout.c @@ -117,7 +117,6 @@ static __be32 nfsd4_block_commit_blocks(struct inode *inode, struct nfsd4_layoutcommit *lcp, struct iomap *iomaps, int nr_iomaps) { - loff_t new_size = lcp->lc_last_wr + 1; struct iattr iattr = { .ia_valid = 0 }; int error; @@ -127,9 +126,9 @@ nfsd4_block_commit_blocks(struct inode *inode, struct nfsd4_layoutcommit *lcp, iattr.ia_valid |= ATTR_ATIME | ATTR_CTIME | ATTR_MTIME; iattr.ia_atime = iattr.ia_ctime = iattr.ia_mtime = lcp->lc_mtime; - if (new_size > i_size_read(inode)) { + if (lcp->lc_size_chg) { iattr.ia_valid |= ATTR_SIZE; - iattr.ia_size = new_size; + iattr.ia_size = lcp->lc_newsize; } error = inode->i_sb->s_export_op->commit_blocks(inode, iomaps, diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index d83637af1c4ea..11f9060679437 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -2261,7 +2261,6 @@ nfsd4_layoutcommit(struct svc_rqst *rqstp, const struct nfsd4_layout_seg *seg = &lcp->lc_seg; struct svc_fh *current_fh = &cstate->current_fh; const struct nfsd4_layout_ops *ops; - loff_t new_size = lcp->lc_last_wr + 1; struct inode *inode; struct nfs4_layout_stateid *ls; __be32 nfserr; @@ -2276,13 +2275,21 @@ nfsd4_layoutcommit(struct svc_rqst *rqstp, goto out; inode = d_inode(current_fh->fh_dentry); - nfserr = nfserr_inval; - if (new_size <= seg->offset) - goto out; - if (new_size > seg->offset + seg->length) - goto out; - if (!lcp->lc_newoffset && new_size > i_size_read(inode)) - goto out; + lcp->lc_size_chg = false; + if (lcp->lc_newoffset) { + loff_t new_size = lcp->lc_last_wr + 1; + + nfserr = nfserr_inval; + if (new_size <= seg->offset) + goto out; + if (new_size > seg->offset + seg->length) + goto out; + + if (new_size > i_size_read(inode)) { + lcp->lc_size_chg = true; + lcp->lc_newsize = new_size; + } + } nfserr = nfsd4_preprocess_layout_stateid(rqstp, cstate, &lcp->lc_sid, false, lcp->lc_layout_type, @@ -2298,13 +2305,6 @@ nfsd4_layoutcommit(struct svc_rqst *rqstp, /* LAYOUTCOMMIT does not require any serialization */ mutex_unlock(&ls->ls_mutex); - if (new_size > i_size_read(inode)) { - lcp->lc_size_chg = 1; - lcp->lc_newsize = new_size; - } else { - lcp->lc_size_chg = 0; - } - nfserr = ops->proc_layoutcommit(inode, lcp); nfs4_put_stid(&ls->ls_stid); out: -- 2.51.0