ak: fuse: fix premature writetrhough request for large folio
Subsystems (2)
PATCH 1/1 ak: fuse: fix premature writetrhough request for large folio
When large folio is enabled and the initial folio offset exceeds PAGE_SIZE, e.g. the position resides in the second page of a large folio, after the folio copying the offset (in the page) won't be updated to 0 even though the expected range is successfully copied until the end of the folio. In this case fuse_fill_write_pages() exits prematurelly before the request has reached the max_write/max_pages limit.
Fix this by eliminating page offset entirely and use folio offset instead.
--- fs/fuse/file.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/fuse/file.c +4 -6
@@ -1272,7 +1272,6 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia, {struct fuse_args_pages *ap = &ia->ap;struct fuse_conn *fc =get_fuse_conn (mapping->host); -unsigned offset = pos & (PAGE_SIZE -1 );size_t count =0 ;unsigned int num;int err =0 ;
@@ -1299,7 +1298,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia,if (mapping_writably_mapped (mapping))flush_dcache_folio (folio); - folio_offset = ((index - folio->index) <<PAGE_SHIFT ) + offset; + folio_offset =offset_in_folio (folio, pos); bytes =min (folio_size (folio) - folio_offset, num); tmp =copy_folio_from_iter_atomic (folio, folio_offset, bytes, ii);
@@ -1329,9 +1328,6 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia, count += tmp; pos += tmp; num -= tmp; - offset += tmp; -if (offset ==folio_size (folio)) - offset =0 ;/* If we copied full folio, mark it uptodate */ if (tmp ==folio_size (folio))
@@ -1343,7 +1339,9 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia, ia->write.folio_locked = true;break ; } -if (!fc->big_writes || offset !=0 ) +if (!fc->big_writes) +break ; +if (folio_offset + tmp !=folio_size (folio))break ; }
Signature · 1 line
2.19.1.6.gb485710b
Hi Jingbo,
Quoted 63 lines · Jingbo Xu
When large folio is enabled and the initial folio offset exceeds
PAGE_SIZE, e.g. the position resides in the second page of a large folio, after the folio copying the offset (in the page) won't be updated to 0 even though the expected range is successfully copied until the end of the folio. In this casefuse_fill_write_pages()exits prematurelly before the request has reached the max_write/max_pages limit.Fix this by eliminating page offset entirely and use folio offset instead.
Fixes d60a6015e1a2 ("fuse: support large folios for writethrough writes")Signed-off-by Jingbo Xu <[email protected]>--- fs/fuse/file.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)fs/fuse/file.c +4
-6@@ -1272,7 +1272,6 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia, {struct fuse_args_pages *ap = &ia->ap;struct fuse_conn *fc =get_fuse_conn (mapping->host); -unsigned offset = pos & (PAGE_SIZE -1 );size_t count =0 ;unsigned int num;int err =0 ;@@ -1299,7 +1298,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia,if (mapping_writably_mapped (mapping))flush_dcache_folio (folio); - folio_offset = ((index - folio->index) <<PAGE_SHIFT ) + offset; + folio_offset =offset_in_folio (folio, pos); bytes =min (folio_size (folio) - folio_offset, num); tmp =copy_folio_from_iter_atomic (folio, folio_offset, bytes, ii);@@ -1329,9 +1328,6 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia, count += tmp; pos += tmp; num -= tmp; - offset += tmp; -if (offset ==folio_size (folio)) - offset =0 ;/* If we copied full folio, mark it uptodate */ if (tmp ==folio_size (folio))@@ -1343,7 +1339,9 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia, ia->write.folio_locked = true;break ; } -if (!fc->big_writes || offset !=0 ) +if (!fc->big_writes) +break ; +if (folio_offset + tmp !=folio_size (folio))break ; }Signature · 1 line
2.19.1.6.gb485710b
I think this might have been an oversight when moving from pages to folios.
Quoted 71 lines · Horst Birthelmer
Hi Jingbo,
Quoted 63 lines · Jingbo Xu
When large folio is enabled and the initial folio offset exceeds
PAGE_SIZE, e.g. the position resides in the second page of a large folio, after the folio copying the offset (in the page) won't be updated to 0 even though the expected range is successfully copied until the end of the folio. In this casefuse_fill_write_pages()exits prematurelly before the request has reached the max_write/max_pages limit.Fix this by eliminating page offset entirely and use folio offset instead.
Fixes d60a6015e1a2 ("fuse: support large folios for writethrough writes")Signed-off-by Jingbo Xu <[email protected]>--- fs/fuse/file.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)fs/fuse/file.c +4
-6@@ -1272,7 +1272,6 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia, {struct fuse_args_pages *ap = &ia->ap;struct fuse_conn *fc =get_fuse_conn (mapping->host); -unsigned offset = pos & (PAGE_SIZE -1 );size_t count =0 ;unsigned int num;int err =0 ;@@ -1299,7 +1298,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia,if (mapping_writably_mapped (mapping))flush_dcache_folio (folio); - folio_offset = ((index - folio->index) <<PAGE_SHIFT ) + offset; + folio_offset =offset_in_folio (folio, pos); bytes =min (folio_size (folio) - folio_offset, num); tmp =copy_folio_from_iter_atomic (folio, folio_offset, bytes, ii);@@ -1329,9 +1328,6 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia, count += tmp; pos += tmp; num -= tmp; - offset += tmp; -if (offset ==folio_size (folio)) - offset =0 ;/* If we copied full folio, mark it uptodate */ if (tmp ==folio_size (folio))@@ -1343,7 +1339,9 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia, ia->write.folio_locked = true;break ; } -if (!fc->big_writes || offset !=0 ) +if (!fc->big_writes) +break ; +if (folio_offset + tmp !=folio_size (folio))break ; }Signature · 1 line
2.19.1.6.gb485710bI think this might have been an oversight when moving from pages to folios.
Quoted 1 line
Reviewed-by Horst Birthelmer <[email protected]>
Right, it's not triggered until large folio is enabled.
Thanks for the review :)
Quoted 7 lines · Jingbo Xu
When large folio is enabled and the initial folio offset exceeds
PAGE_SIZE, e.g. the position resides in the second page of a large folio, after the folio copying the offset (in the page) won't be updated to 0 even though the expected range is successfully copied until the end of the folio. In this casefuse_fill_write_pages()exits prematurelly before the request has reached the max_write/max_pages limit.
Quoted 7 lines
Fix this by eliminating page offset entirely and use folio offset instead.
Fixes d60a6015e1a2 ("fuse: support large folios for writethrough writes")Signed-off-by Jingbo Xu <[email protected]>---
Sorry I will drop the incorrect prefix of the subject line later in v2 leaving some time for more feedbacks.
Signature · 2 lines
Thanks, Jingbo