Skip to content

Commit 212be98

Browse files
dhowellsbrauner
authored andcommitted
netfs: Fix writeback that needs to go to both server and cache
When netfslib is performing writeback (ie. ->writepages), it maintains two parallel streams of writes, one to the server and one to the cache, but it doesn't mark either stream of writes as active until it gets some data that needs to be written to that stream. This is done because some folios will only be written to the cache (e.g. copying to the cache on read is done by marking the folios and letting writeback do the actual work) and sometimes we'll only be writing to the server (e.g. if there's no cache). Now, since we don't actually dispatch uploads and cache writes in parallel, but rather flip between the streams, depending on which has the lowest so-far-issued offset, and don't wait for the subreqs to finish before flipping, we can end up in a situation where, say, we issue a write to the server and this completes before we start the write to the cache. But because we only activate a stream when we first add a subreq to it, the result collection code may run before we manage to activate the stream - resulting in the folio being cleaned and having the writeback-in-progress mark removed. At this point, the folio no longer belongs to us. This is only really a problem for folios that need to be written to both streams - and in that case, the upload to the server is started first, followed by the write to the cache - and the cache write may see a bad folio. Fix this by activating the cache stream up front if there's a cache available. If there's a cache, then all data is going to be written to it. Fixes: 288ace2 ("netfs: New writeback implementation") Signed-off-by: David Howells <[email protected]> Link: https://lore.kernel.org/r/[email protected] cc: Jeff Layton <[email protected]> cc: [email protected] cc: [email protected] Signed-off-by: Christian Brauner <[email protected]>
1 parent 1bb8dce commit 212be98

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

fs/netfs/write_issue.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ struct netfs_io_request *netfs_create_write_req(struct address_space *mapping,
122122
wreq->io_streams[1].transferred = LONG_MAX;
123123
if (fscache_resources_valid(&wreq->cache_resources)) {
124124
wreq->io_streams[1].avail = true;
125+
wreq->io_streams[1].active = true;
125126
wreq->io_streams[1].prepare_write = wreq->cache_resources.ops->prepare_write_subreq;
126127
wreq->io_streams[1].issue_write = wreq->cache_resources.ops->issue_write;
127128
}

0 commit comments

Comments
 (0)