Skip to content

Commit df1c357

Browse files
DaveWysochanskiRHtorvalds
authored andcommitted
netfs: Only call folio_start_fscache() one time for each folio
If a network filesystem using netfs implements a clamp_length() function, it can set subrequest lengths smaller than a page size. When we loop through the folios in netfs_rreq_unlock_folios() to set any folios to be written back, we need to make sure we only call folio_start_fscache() once for each folio. Otherwise, this simple testcase: mount -o fsc,rsize=1024,wsize=1024 127.0.0.1:/export /mnt/nfs dd if=/dev/zero of=/mnt/nfs/file.bin bs=4096 count=1 1+0 records in 1+0 records out 4096 bytes (4.1 kB, 4.0 KiB) copied, 0.0126359 s, 324 kB/s echo 3 > /proc/sys/vm/drop_caches cat /mnt/nfs/file.bin > /dev/null will trigger an oops similar to the following: page dumped because: VM_BUG_ON_FOLIO(folio_test_private_2(folio)) ------------[ cut here ]------------ kernel BUG at include/linux/netfs.h:44! ... CPU: 5 PID: 134 Comm: kworker/u16:5 Kdump: loaded Not tainted 6.4.0-rc5 ... RIP: 0010:netfs_rreq_unlock_folios+0x68e/0x730 [netfs] ... Call Trace: netfs_rreq_assess+0x497/0x660 [netfs] netfs_subreq_terminated+0x32b/0x610 [netfs] nfs_netfs_read_completion+0x14e/0x1a0 [nfs] nfs_read_completion+0x2f9/0x330 [nfs] rpc_free_task+0x72/0xa0 [sunrpc] rpc_async_release+0x46/0x70 [sunrpc] process_one_work+0x3bd/0x710 worker_thread+0x89/0x610 kthread+0x181/0x1c0 ret_from_fork+0x29/0x50 Fixes: 3d3c950 ("netfs: Provide readahead and readpage netfs helpers" Link: https://bugzilla.redhat.com/show_bug.cgi?id=2210612 Signed-off-by: Dave Wysochanski <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: David Howells <[email protected]> Link: https://lore.kernel.org/r/[email protected]/ # v1 Link: https://lore.kernel.org/r/[email protected]/ # v2 Signed-off-by: Linus Torvalds <[email protected]>
1 parent a49d273 commit df1c357

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

fs/netfs/buffered_read.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,25 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq)
4747
xas_for_each(&xas, folio, last_page) {
4848
loff_t pg_end;
4949
bool pg_failed = false;
50+
bool folio_started;
5051

5152
if (xas_retry(&xas, folio))
5253
continue;
5354

5455
pg_end = folio_pos(folio) + folio_size(folio) - 1;
5556

57+
folio_started = false;
5658
for (;;) {
5759
loff_t sreq_end;
5860

5961
if (!subreq) {
6062
pg_failed = true;
6163
break;
6264
}
63-
if (test_bit(NETFS_SREQ_COPY_TO_CACHE, &subreq->flags))
65+
if (!folio_started && test_bit(NETFS_SREQ_COPY_TO_CACHE, &subreq->flags)) {
6466
folio_start_fscache(folio);
67+
folio_started = true;
68+
}
6569
pg_failed |= subreq_failed;
6670
sreq_end = subreq->start + subreq->len - 1;
6771
if (pg_end < sreq_end)

0 commit comments

Comments
 (0)