Commit 807c6d09 authored Jan 05, 2024 by David Howells

netfs: Fix the loop that unmarks folios after writing to the cache



In the loop in netfs_rreq_unmark_after_write() that removes the PG_fscache
from folios after they've been written to the cache, as soon as we remove
the mark from a multipage folio, it can get split - and then we might see a
fragment of folio again.

Guard against this by advancing the 'unlocked' tracker to the index of the
last page in the folio to avoid a double removal of the PG_fscache mark.

Reported-by: Marc Dionne <marc.dionne@auristor.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Matthew Wilcox <willy@infradead.org>
cc: linux-afs@lists.infradead.org
cc: linux-cachefs@redhat.com
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org

parent 92a714d7

fs/netfs/buffered_write.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -698,6 +698,7 @@ static void netfs_pages_written_back(struct netfs_io_request *wreq)
		end_wb:
		if (folio_test_fscache(folio))
		folio_end_fscache(folio);
		xas_advance(&xas, folio_next_index(folio) - 1);
		folio_end_writeback(folio);
		}

fs/netfs/io.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ static void netfs_rreq_unmark_after_write(struct netfs_io_request *rreq,
		*/
		if (have_unlocked && folio_index(folio) <= unlocked)
		continue;
		unlocked = folio_index(folio);
		unlocked = folio_next_index(folio) - 1;
		trace_netfs_folio(folio, netfs_folio_trace_end_copy);
		folio_end_fscache(folio);
		have_unlocked = true;