Skip to contentSkip to conversation

nfs: do not extent writes to the entire folio

PATCH In review Christoph Hellwig 3 participants 3 messages Jul 5, 2024 – Jul 11, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfs: do not extent writes to the entire folio

nfs_update_folio has code to extend a write to the entire page under certain conditions. With the support for large folios this now suddenly extents to the variable sized and potentially much larger folio. Add code to limit the extension to the page boundaries of the start and end of the write, which matches the historic expecation and the code comments.

Fixes b73fe2dd6cd5 ("nfs: add support for large folios")
---
 fs/nfs/write.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
fs/nfs/write.c +6 -2
index f3b556ff35f9d2..4e81325f95d740 100644
@@ -1294,8 +1294,12 @@ int nfs_update_folio(struct file *file, struct folio *folio,
 		goto out;
 
 	if (nfs_can_extend_write(file, folio, pagelen)) {
-		count = max(count + offset, pagelen);
-		offset = 0;
+		unsigned int end = count + offset;
+
+		offset = round_down(offset, PAGE_SIZE);
+		if (end < pagelen)
+			end = min(round_up(end, PAGE_SIZE), pagelen);
+		count = end - offset;
 	}
 
 	status = nfs_writepage_setup(ctx, folio, offset, count);
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#2 lore raw
In reply to Christoph Hellwig
Quoted 9 lines · Christoph Hellwig

nfs_update_folio has code to extend a write to the entire page under certain conditions. With the support for large folios this now suddenly extents to the variable sized and potentially much larger folio. Add code to limit the extension to the page boundaries of the start and end of the write, which matches the historic expecation and the code comments.

Fixes b73fe2dd6cd5 ("nfs: add support for large folios")

Ben