netfs: Advance iterator correctly rather than jumping it
Subsystems (2)
David Howells
maintainerPATCH 1/1 netfs: Advance iterator correctly rather than jumping it
In netfs_write_folio(), use iov_iter_advance() to advance the folio as we split bits of it off to subrequests rather than manually jumping the ->iov_offset value around. This becomes more problematic when we use a bounce buffer made out of single-page folios to cover a multipage pagecache folio.
--- fs/netfs/write_issue.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/netfs/write_issue.c +9 -3
@@ -317,6 +317,7 @@ static int netfs_write_folio(struct netfs_io_request *wreq,struct netfs_io_stream *stream;struct netfs_group *fgroup;/* TODO: Use this with ceph */ struct netfs_folio *finfo; +size_t iter_off =0 ;size_t fsize =folio_size (folio), flen = fsize, foff =0 ;loff_t fpos =folio_pos (folio), i_size;bool to_eof = false, streamw = false;
@@ -472,7 +473,12 @@ static int netfs_write_folio(struct netfs_io_request *wreq,if (choose_s <0 )break ; stream = &wreq->io_streams[choose_s]; - wreq->io_iter.iov_offset = stream->submit_off; + +/* Advance the iterator(s). */ +if (stream->submit_off > iter_off) { +iov_iter_advance (&wreq->io_iter, stream->submit_off - iter_off); + iter_off = stream->submit_off; + }atomic64_set (&wreq->issued_to, fpos + stream->submit_off); stream->submit_extendable_to = fsize - stream->submit_off;
@@ -487,8 +493,8 @@ static int netfs_write_folio(struct netfs_io_request *wreq, debug = true; } - wreq->io_iter.iov_offset =0 ; -iov_iter_advance (&wreq->io_iter, fsize); +if (fsize > iter_off) +iov_iter_advance (&wreq->io_iter, fsize - iter_off);atomic64_set (&wreq->issued_to, fpos + fsize);if (!debug)
Quoted 8 lines · David Howells
In
netfs_write_folio(), useiov_iter_advance()to advance the folio as we split bits of it off to subrequests rather than manually jumping the ->iov_offset value around. This becomes more problematic when we use a bounce buffer made out of single-page folios to cover a multipage pagecache folio.[...]
Applied to the vfs.fixes branch of the vfs/vfs.git tree. Patches in the vfs.fixes branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs.fixes
[1/1] netfs: Advance iterator correctly rather than jumping it
https://git.kernel.org/vfs/vfs/c/507a9ef9e851