Commit fe01aa65 authored by Takafumi Kubota's avatar Takafumi Kubota Committed by David Sterba

Btrfs: add another missing end_page_writeback on submit_extent_page failure

If btrfs_bio_alloc fails in submit_extent_page, submit_extent_page returns
without clearing the writeback bit of the failed page.

__extent_writepage_io, that is a caller of submit_extent_page,
does not clear the remaining writeback bit anywhere.
As a result, this will cause the hang at filemap_fdatawait_range,
because it waits the writeback bit to be cleared from the failed page.
So, we have to call end_page_writeback to clear the writeback bit.

For reproducing the hang, we inject a fault like

   if (should_failtest()) { // I define should_failtest()
        bio = NULL;
   }
   else {
        bio = btrfs_bio_alloc(...);
   }

in submit_extent_page.

We should also check whether page has the bit before end_page_writeback,
to avoid the conflict against the other end_page_writeback in bio_endio.
Thus, we add PageWriteback checks not only in __extent_writepage_io,
but also in write_one_eb too, because it misses the check.
Signed-off-by: default avatarTakafumi Kubota <takafumi.kubota1012@sslab.ics.keio.ac.jp>
Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Cc: David Sterba <dsterba@suse.cz>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 66bbc1c0
...@@ -3437,8 +3437,11 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode, ...@@ -3437,8 +3437,11 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
bdev, &epd->bio, max_nr, bdev, &epd->bio, max_nr,
end_bio_extent_writepage, end_bio_extent_writepage,
0, 0, 0, false); 0, 0, 0, false);
if (ret) if (ret) {
SetPageError(page); SetPageError(page);
if (PageWriteback(page))
end_page_writeback(page);
}
cur = cur + iosize; cur = cur + iosize;
pg_offset += iosize; pg_offset += iosize;
...@@ -3754,7 +3757,8 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb, ...@@ -3754,7 +3757,8 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,
epd->bio_flags = bio_flags; epd->bio_flags = bio_flags;
if (ret) { if (ret) {
set_btree_ioerr(p); set_btree_ioerr(p);
end_page_writeback(p); if (PageWriteback(p))
end_page_writeback(p);
if (atomic_sub_and_test(num_pages - i, &eb->io_pages)) if (atomic_sub_and_test(num_pages - i, &eb->io_pages))
end_extent_buffer_writeback(eb); end_extent_buffer_writeback(eb);
ret = -EIO; ret = -EIO;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment