Skip to content

Commit c97f59e

Browse files
dhowellsbrauner
authored andcommitted
netfs: Fix the pre-flush when appending to a file in writethrough mode
In netfs_perform_write(), when the file is marked NETFS_ICTX_WRITETHROUGH or O_*SYNC or RWF_*SYNC was specified, write-through caching is performed on a buffered file. When setting up for write-through, we flush any conflicting writes in the region and wait for the write to complete, failing if there's a write error to return. The issue arises if we're writing at or above the EOF position because we skip the flush and - more importantly - the wait. This becomes a problem if there's a partial folio at the end of the file that is being written out and we want to make a write to it too. Both the already-running write and the write we start both want to clear the writeback mark, but whoever is second causes a warning looking something like: ------------[ cut here ]------------ R=00000012: folio 11 is not under writeback WARNING: CPU: 34 PID: 654 at fs/netfs/write_collect.c:105 ... CPU: 34 PID: 654 Comm: kworker/u386:27 Tainted: G S ... ... Workqueue: events_unbound netfs_write_collection_worker ... RIP: 0010:netfs_writeback_lookup_folio Fix this by making the flush-and-wait unconditional. It will do nothing if there are no folios in the pagecache and will return quickly if there are no folios in the region specified. Further, move the WBC attachment above the flush call as the flush is going to attach a WBC and detach it again if it is not present - and since we need one anyway we might as well share it. Fixes: 41d8e76 ("netfs: Implement a write-through caching option") Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-lkp/[email protected] Signed-off-by: David Howells <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Jeffrey Layton <[email protected]> cc: Eric Van Hensbergen <[email protected]> cc: Latchesar Ionkov <[email protected]> cc: Dominique Martinet <[email protected]> cc: Christian Schoenebeck <[email protected]> cc: Marc Dionne <[email protected]> cc: [email protected] cc: [email protected] cc: [email protected] cc: [email protected] cc: [email protected] cc: [email protected] Signed-off-by: Christian Brauner <[email protected]>
1 parent 619606a commit c97f59e

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

fs/netfs/buffered_write.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,14 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,
172172
if (unlikely(test_bit(NETFS_ICTX_WRITETHROUGH, &ctx->flags) ||
173173
iocb->ki_flags & (IOCB_DSYNC | IOCB_SYNC))
174174
) {
175-
if (pos < i_size_read(inode)) {
176-
ret = filemap_write_and_wait_range(mapping, pos, pos + iter->count);
177-
if (ret < 0) {
178-
goto out;
179-
}
180-
}
181-
182175
wbc_attach_fdatawrite_inode(&wbc, mapping->host);
183176

177+
ret = filemap_write_and_wait_range(mapping, pos, pos + iter->count);
178+
if (ret < 0) {
179+
wbc_detach_inode(&wbc);
180+
goto out;
181+
}
182+
184183
wreq = netfs_begin_writethrough(iocb, iter->count);
185184
if (IS_ERR(wreq)) {
186185
wbc_detach_inode(&wbc);

0 commit comments

Comments
 (0)