From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 AF14644160C; Tue, 21 Jul 2026 21:06:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668005; cv=none; b=VWcJWjt90rcJK79qjJe2o7cLuEx/JpQNfuK271gPnEHs5iKuxK/DW8O2K8t4n7By18s5njbda9X944f7N7e3CLrFjOxi2ROWVu6X6ia5qG2lD9vAxPFttAnEBGooqzWaYwEqRVYmqWVw0R4P1N92juzFvFTzeSHhE/C9B7lD7n8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784668005; c=relaxed/simple; bh=5O2wmZjtdjm3Dz+vupD4PYJXNU/uCUdencjR5RTBNyc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sfBGi8k/Y89aNkeFpczonmc63nc3Vfe9Qv1YOcyaICxmUewWY/5y4dNTrqT62ti+e0huFK+joP2mMS1NXd40inXiCVIAYYFI18tRZ2BS3mhtoNfFvQ0lDAzpeZhHJGoIO+we33evEqZ0FkuInSisYLQJcNDMoGnq6jp+F6MU9nQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=i/XKELW+; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="i/XKELW+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B83D1F000E9; Tue, 21 Jul 2026 21:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784668004; bh=IOmo167UaYruViYnxxCPOSclat9Epocl2k5roCXOGdI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=i/XKELW+4GXPt9S7lbXRL1T5bMZODvQY36dQUg5LusCFsJ3p1Aj3qlJjXel4SYydG 25Jej/IJzZ8fxwVfgXICZgeY1FzlWuq0G20qdSp2nAcoy9pqL7NfFa4N+9q4Y7QfTL ZQVOMC4SgXh8mnOvc1zhZlGaTj1qJZem8K4S+sDo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chris Mason , Jeff Layton , Chuck Lever , Chuck Lever , Sasha Levin Subject: [PATCH 6.1 0004/1067] nfsd: reset write verifier on deferred writeback errors Date: Tue, 21 Jul 2026 17:10:05 +0200 Message-ID: <20260721152424.630012120@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeff Layton commit 2090b05803faab8a9fa62fbff871007862cac1b7 upstream. nfsd_vfs_write() and nfsd_commit() both call filemap_check_wb_err() to detect deferred writeback errors, but neither rotates the server's write verifier (nn->writeverf) when this check fails. Every other durable-storage-failure path in these functions calls commit_reset_write_verifier() before returning an error. The missing rotation means clients holding UNSTABLE write data under the current verifier will COMMIT, receive the unchanged verifier back, and conclude their data is durable — silently dropping data that failed writeback. This violates the UNSTABLE+COMMIT durability contract (RFC 1813 §3.3.7, RFC 8881 §18.32). Add commit_reset_write_verifier() calls at both filemap_check_wb_err() error sites, matching the pattern used by adjacent error paths in the same functions. The helper already filters -EAGAIN and -ESTALE internally, so the calls are unconditionally safe. Reported-by: Chris Mason Fixes: 555dbf1a9aac ("nfsd: Replace use of rwsem with errseq_t") Cc: stable@vger.kernel.org Assisted-by: kres:claude-opus-4-6 Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever [ cel: open-code the reset; commit_reset_write_verifier() is v6.7 ] Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- fs/nfsd/vfs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 87a596fc6654dd..c40b2a706691c5 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1134,8 +1134,11 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf, nfsd_stats_io_write_add(nn, exp, *cnt); fsnotify_modify(file); host_err = filemap_check_wb_err(file->f_mapping, since); - if (host_err < 0) + if (host_err < 0) { + nfsd_reset_write_verifier(nn); + trace_nfsd_writeverf_reset(nn, rqstp, host_err); goto out_nfserr; + } if (stable && use_wgather) { host_err = wait_for_concurrent_writes(file); @@ -1271,6 +1274,10 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf, nfsd_copy_write_verifier(verf, nn); err2 = filemap_check_wb_err(nf->nf_file->f_mapping, since); + if (err2 < 0) { + nfsd_reset_write_verifier(nn); + trace_nfsd_writeverf_reset(nn, rqstp, err2); + } err = nfserrno(err2); break; case -EINVAL: -- 2.53.0