| Message ID | 8762e91a210f4cc5713fce05fe5906c18513bd0a.1697617238.git.jstancek@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iomap: fix short copy in iomap_write_iter() | expand |
On Wed, Oct 18, 2023 at 10:24:20AM +0200, Jan Stancek wrote:
> Make next iteration retry with amount of bytes we managed to copy.
The observation and logic fix look good. But I wonder if simply
using a goto instead of the extra variable would be a tad cleaner?
Something like this?
---
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 061f3d14c12001..2d491590795aa4 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -881,8 +881,10 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i)
size_t bytes; /* Bytes to write to folio */
size_t copied; /* Bytes copied from user */
+ bytes = iov_iter_count(i);
+retry:
offset = pos & (chunk - 1);
- bytes = min(chunk - offset, iov_iter_count(i));
+ bytes = min(chunk - offset, bytes);
status = balance_dirty_pages_ratelimited_flags(mapping,
bdp_flags);
if (unlikely(status))
@@ -933,10 +935,12 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i)
* halfway through, might be a race with munmap,
* might be severe memory pressure.
*/
- if (copied)
- bytes = copied;
if (chunk > PAGE_SIZE)
chunk /= 2;
+ if (copied) {
+ bytes = copied;
+ goto retry;
+ }
} else {
pos += status;
written += status;
On Wed, Oct 18, 2023 at 2:22 PM Christoph Hellwig <hch@lst.de> wrote: > > On Wed, Oct 18, 2023 at 10:24:20AM +0200, Jan Stancek wrote: > > Make next iteration retry with amount of bytes we managed to copy. > > The observation and logic fix look good. But I wonder if simply > using a goto instead of the extra variable would be a tad cleaner? > Something like this? Looks good to me. Would you be OK if I re-posted it as v2 with your Signed-off-by added? > > --- > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 061f3d14c12001..2d491590795aa4 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -881,8 +881,10 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i) > size_t bytes; /* Bytes to write to folio */ > size_t copied; /* Bytes copied from user */ > > + bytes = iov_iter_count(i); > +retry: > offset = pos & (chunk - 1); > - bytes = min(chunk - offset, iov_iter_count(i)); > + bytes = min(chunk - offset, bytes); > status = balance_dirty_pages_ratelimited_flags(mapping, > bdp_flags); > if (unlikely(status)) > @@ -933,10 +935,12 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i) > * halfway through, might be a race with munmap, > * might be severe memory pressure. > */ > - if (copied) > - bytes = copied; > if (chunk > PAGE_SIZE) > chunk /= 2; > + if (copied) { > + bytes = copied; > + goto retry; > + } > } else { > pos += status; > written += status; >
On Wed, Oct 18, 2023 at 04:32:19PM +0200, Jan Stancek wrote: > On Wed, Oct 18, 2023 at 2:22 PM Christoph Hellwig <hch@lst.de> wrote: > > > > On Wed, Oct 18, 2023 at 10:24:20AM +0200, Jan Stancek wrote: > > > Make next iteration retry with amount of bytes we managed to copy. > > > > The observation and logic fix look good. But I wonder if simply > > using a goto instead of the extra variable would be a tad cleaner? > > Something like this? > > Looks good to me. Would you be OK if I re-posted it as v2 with your > Signed-off-by added? Please skip my signoff. This is really your work and I just a very cosmetic suggestion.
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 5db54ca29a35..3f32df4ca9e3 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -869,6 +869,7 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i) { loff_t length = iomap_length(iter); size_t chunk = PAGE_SIZE << MAX_PAGECACHE_ORDER; + size_t retry_bytes = 0; loff_t pos = iter->pos; ssize_t written = 0; long status = 0; @@ -883,6 +884,10 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i) offset = pos & (chunk - 1); bytes = min(chunk - offset, iov_iter_count(i)); + if (retry_bytes) { + bytes = min(bytes, retry_bytes); + retry_bytes = 0; + } status = balance_dirty_pages_ratelimited_flags(mapping, bdp_flags); if (unlikely(status)) @@ -934,7 +939,7 @@ static loff_t iomap_write_iter(struct iomap_iter *iter, struct iov_iter *i) * might be severe memory pressure. */ if (copied) - bytes = copied; + retry_bytes = copied; if (chunk > PAGE_SIZE) chunk /= 2; } else {
Starting with commit 5d8edfb900d5 ("iomap: Copy larger chunks from userspace"), iomap_write_iter() can get into endless loop. This can be reproduced with LTP writev07 which uses partially valid iovecs: struct iovec wr_iovec[] = { { buffer, 64 }, { bad_addr, 64 }, { buffer + 64, 64 }, { buffer + 64 * 2, 64 }, }; commit bc1bb416bbb9 ("generic_perform_write()/iomap_write_actor(): saner logics for short copy") previously introduced the logic, which made short copy retry in next iteration with amount of "bytes" it managed to copy: if (unlikely(status == 0)) { /* * A short copy made iomap_write_end() reject the * thing entirely. Might be memory poisoning * halfway through, might be a race with munmap, * might be severe memory pressure. */ if (copied) bytes = copied; However, since 5d8edfb900d5 "bytes" is no longer carried into next iteration, because it is now always initialized at the beginning of the loop. And for iov_iter_count < PAGE_SIZE, "bytes" ends up with same value as previous iteration, making the loop retry same copy over and over, which leads to writev07 testcase hanging. Make next iteration retry with amount of bytes we managed to copy. Fixes: 5d8edfb900d5 ("iomap: Copy larger chunks from userspace") Signed-off-by: Jan Stancek <jstancek@redhat.com> --- fs/iomap/buffered-io.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)