FAILED: patch "[PATCH] NFS: Charge unstable writes by request size, not folio size" failed to apply to 6.6-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 27934d02cbeb8a957dd11c985a579e58d30c5270
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072039-unheard-expand-767d@gregkh' --subject-prefix 'PATCH 6.6.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 27934d02cbeb8a957dd11c985a579e58d30c5270 Mon Sep 17 00:00:00 2001
From: Benjamin Coddington <[email protected]>
Date: Tue, 7 Jul 2026 11:07:16 -0400
Subject: [PATCH] NFS: Charge unstable writes by request size, not folio size
nfs_folio_mark_unstable() and nfs_folio_clear_commit() charge and uncharge NR_WRITEBACK/WB_WRITEBACK by folio_nr_pages(folio) once per *request* added to or removed from a commit list. This is correct only when a folio has a single associated request. When pg_test splits a folio into N sub-folio requests (e.g. pNFS flexfiles striping with a stripe unit smaller than the folio size, or plain wsize-limited splitting), each of the N requests independently charges the whole folio's page count, inflating the accounting by a factor of N per folio. With large folios and small stripe units this reaches multiple orders of magnitude: a 2 MiB folio split into 512 4 KiB requests can charge up to 512x its real size, pushing global dirty+writeback accounting past the system's dirty threshold and forcing every buffered writer on the host into the hard-throttle path, including unrelated in-kernel NFS server threads sharing the box.
Charge each request only for the pages it actually covers.
fs/nfs/internal.h +7 -5
@@ -851,17 +851,19 @@ void nfs_super_set_maxbytes(struct super_block *sb, __u64 maxfilesize) }/* -* Record the page as unstable (an extra writeback period) and mark its -* inode as dirty. +* Record the request's range as unstable (an extra writeback period) and +* mark its inode as dirty. */ -static inline void nfs_folio_mark_unstable (struct folio *folio, +static inline void nfs_folio_mark_unstable (struct nfs_page *req,struct nfs_commit_info *cinfo) { +struct folio *folio =nfs_page_to_folio (req); +if (folio && !cinfo->dreq) {struct inode *inode = folio->mapping->host; -long nr =folio_nr_pages (folio); +long nr =DIV_ROUND_UP (req->wb_bytes,PAGE_SIZE ); -/* This page is really still in write-back - just that the +/* This range is really still in write-back - just that the * writeback is happening on the server now. */ node_stat_mod_folio (folio,NR_WRITEBACK , nr);
fs/nfs/pnfs_nfs.c +1 -1
@@ -1199,7 +1199,7 @@ pnfs_layout_mark_request_commit(struct nfs_page *req,nfs_request_add_commit_list_locked (req, list, cinfo);mutex_unlock (&NFS_I (cinfo->inode)->commit_mutex); -nfs_folio_mark_unstable (nfs_page_to_folio (req), cinfo); +nfs_folio_mark_unstable (req, cinfo);return ; out_resched:mutex_unlock (&NFS_I (cinfo->inode)->commit_mutex);
fs/nfs/write.c +8 -6
@@ -807,7 +807,7 @@ nfs_request_add_commit_list(struct nfs_page *req, struct nfs_commit_info *cinfo)mutex_lock (&NFS_I (cinfo->inode)->commit_mutex);nfs_request_add_commit_list_locked (req, &cinfo->mds->list, cinfo);mutex_unlock (&NFS_I (cinfo->inode)->commit_mutex); -nfs_folio_mark_unstable (nfs_page_to_folio (req), cinfo); +nfs_folio_mark_unstable (req, cinfo); }EXPORT_SYMBOL_GPL (nfs_request_add_commit_list);
@@ -866,10 +866,12 @@ nfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg,nfs_request_add_commit_list (req, cinfo); } -static void nfs_folio_clear_commit (struct folio *folio) +static void nfs_folio_clear_commit (struct nfs_page *req) { +struct folio *folio =nfs_page_to_folio (req); +if (folio) { -long nr =folio_nr_pages (folio); +long nr =DIV_ROUND_UP (req->wb_bytes,PAGE_SIZE );node_stat_mod_folio (folio,NR_WRITEBACK , -nr);bdi_wb_stat_mod (folio->mapping->host,WB_WRITEBACK , -nr);
@@ -889,7 +891,7 @@ static void nfs_clear_request_commit(struct nfs_commit_info *cinfo,nfs_request_remove_commit_list (req, cinfo); }mutex_unlock (&NFS_I (inode)->commit_mutex); -nfs_folio_clear_commit (nfs_page_to_folio (req)); +nfs_folio_clear_commit (req); } }
@@ -1741,7 +1743,7 @@ void nfs_retry_commit(struct list_head *page_list, req =nfs_list_entry (page_list->next);nfs_list_remove_request (req);nfs_mark_request_commit (req, lseg, cinfo, ds_commit_idx); -nfs_folio_clear_commit (nfs_page_to_folio (req)); +nfs_folio_clear_commit (req);nfs_unlock_and_release_request (req); } }
@@ -1813,7 +1815,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data) req =nfs_list_entry (data->pages.next);nfs_list_remove_request (req); folio =nfs_page_to_folio (req); -nfs_folio_clear_commit (folio); +nfs_folio_clear_commit (req); dprintk("NFS: commit (%s/%llu %d@%lld)", nfs_req_openctx(req)->dentry->d_sb->s_id,
Sasha Levin
maintainerPATCH 1/2 nfs: remove dead code for the old swap over NFS implementation
From: Christoph Hellwig <[email protected]>
[ Upstream commit 7e8e78a0ba00c88f0ded86de64bdddc82e06b196 ]
Remove the code testing folio_test_swapcache either explicitly or implicitly in pagemap.h headers, as is now handled using the direct I/O path and not the buffered I/O path that these helpers are located in.
Stable-dep-of: 27934d02cbeb ("NFS: Charge unstable writes by request size, not folio size")
--- fs/nfs/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/internal.h +1 -1
@@ -791,7 +791,7 @@ static inline void nfs_folio_mark_unstable(struct folio *folio, struct nfs_commit_info *cinfo) {if (folio && !cinfo->dreq) { -struct inode *inode =folio_file_mapping (folio)->host; +struct inode *inode = folio->mapping->host;long nr =folio_nr_pages (folio);/* This page is really still in write-back - just that the
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 NFS: Charge unstable writes by request size, not folio size
From: Benjamin Coddington <[email protected]>
[ Upstream commit 27934d02cbeb8a957dd11c985a579e58d30c5270 ]
nfs_folio_mark_unstable() and nfs_folio_clear_commit() charge and uncharge NR_WRITEBACK/WB_WRITEBACK by folio_nr_pages(folio) once per *request* added to or removed from a commit list. This is correct only when a folio has a single associated request. When pg_test splits a folio into N sub-folio requests (e.g. pNFS flexfiles striping with a stripe unit smaller than the folio size, or plain wsize-limited splitting), each of the N requests independently charges the whole folio's page count, inflating the accounting by a factor of N per folio. With large folios and small stripe units this reaches multiple orders of magnitude: a 2 MiB folio split into 512 4 KiB requests can charge up to 512x its real size, pushing global dirty+writeback accounting past the system's dirty threshold and forcing every buffered writer on the host into the hard-throttle path, including unrelated in-kernel NFS server threads sharing the box.
Charge each request only for the pages it actually covers.
--- fs/nfs/internal.h | 12 +++++++----- fs/nfs/pnfs_nfs.c | 2 +- fs/nfs/write.c | 14 ++++++++------ 3 files changed, 16 insertions(+), 12 deletions(-)
fs/nfs/internal.h +7 -5
@@ -784,17 +784,19 @@ void nfs_super_set_maxbytes(struct super_block *sb, __u64 maxfilesize) }/* -* Record the page as unstable (an extra writeback period) and mark its -* inode as dirty. +* Record the request's range as unstable (an extra writeback period) and +* mark its inode as dirty. */ -static inline void nfs_folio_mark_unstable (struct folio *folio, +static inline void nfs_folio_mark_unstable (struct nfs_page *req,struct nfs_commit_info *cinfo) { +struct folio *folio =nfs_page_to_folio (req); +if (folio && !cinfo->dreq) {struct inode *inode = folio->mapping->host; -long nr =folio_nr_pages (folio); +long nr =DIV_ROUND_UP (req->wb_bytes,PAGE_SIZE ); -/* This page is really still in write-back - just that the +/* This range is really still in write-back - just that the * writeback is happening on the server now. */ node_stat_mod_folio (folio,NR_WRITEBACK , nr);
fs/nfs/pnfs_nfs.c +1 -1
@@ -1226,7 +1226,7 @@ pnfs_layout_mark_request_commit(struct nfs_page *req,nfs_request_add_commit_list_locked (req, list, cinfo);mutex_unlock (&NFS_I (cinfo->inode)->commit_mutex); -nfs_folio_mark_unstable (nfs_page_to_folio (req), cinfo); +nfs_folio_mark_unstable (req, cinfo);return ; out_resched:mutex_unlock (&NFS_I (cinfo->inode)->commit_mutex);
fs/nfs/write.c +8 -6
@@ -933,7 +933,7 @@ nfs_request_add_commit_list(struct nfs_page *req, struct nfs_commit_info *cinfo)mutex_lock (&NFS_I (cinfo->inode)->commit_mutex);nfs_request_add_commit_list_locked (req, &cinfo->mds->list, cinfo);mutex_unlock (&NFS_I (cinfo->inode)->commit_mutex); -nfs_folio_mark_unstable (nfs_page_to_folio (req), cinfo); +nfs_folio_mark_unstable (req, cinfo); }EXPORT_SYMBOL_GPL (nfs_request_add_commit_list);
@@ -992,10 +992,12 @@ nfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg,nfs_request_add_commit_list (req, cinfo); } -static void nfs_folio_clear_commit (struct folio *folio) +static void nfs_folio_clear_commit (struct nfs_page *req) { +struct folio *folio =nfs_page_to_folio (req); +if (folio) { -long nr =folio_nr_pages (folio); +long nr =DIV_ROUND_UP (req->wb_bytes,PAGE_SIZE );node_stat_mod_folio (folio,NR_WRITEBACK , -nr); wb_stat_mod(&inode_to_bdi(folio_file_mapping(folio)->host)->wb,
@@ -1016,7 +1018,7 @@ static void nfs_clear_request_commit(struct nfs_commit_info *cinfo,nfs_request_remove_commit_list (req, cinfo); }mutex_unlock (&NFS_I (inode)->commit_mutex); -nfs_folio_clear_commit (nfs_page_to_folio (req)); +nfs_folio_clear_commit (req); } }
@@ -1834,7 +1836,7 @@ void nfs_retry_commit(struct list_head *page_list, req =nfs_list_entry (page_list->next);nfs_list_remove_request (req);nfs_mark_request_commit (req, lseg, cinfo, ds_commit_idx); -nfs_folio_clear_commit (nfs_page_to_folio (req)); +nfs_folio_clear_commit (req);nfs_unlock_and_release_request (req); } }
@@ -1902,7 +1904,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data) req =nfs_list_entry (data->pages.next);nfs_list_remove_request (req); folio =nfs_page_to_folio (req); -nfs_folio_clear_commit (folio); +nfs_folio_clear_commit (req); dprintk("NFS: commit (%s/%llu %d@%lld)", nfs_req_openctx(req)->dentry->d_sb->s_id,
Signature · 1 line
2.53.0