Commit 25f3c502 authored by Chris Mason's avatar Chris Mason Committed by David Sterba

Btrfs: keep pages dirty when using btrfs_writepage_fixup_worker

For COW, btrfs expects pages dirty pages to have been through a few setup
steps.  This includes reserving space for the new block allocations and marking
the range in the state tree for delayed allocation.

A few places outside btrfs will dirty pages directly, especially when unmapping
mmap'd pages.  In order for these to properly go through COW, we run them
through a fixup worker to wait for stable pages, and do the delalloc prep.

87826df0 added a window where the dirty pages were cleaned, but pending
more action from the fixup worker.  We clear_page_dirty_for_io() before
we call into writepage, so the page is no longer dirty.  The commit
changed it so now we leave the page clean between unlocking it here and
the fixup worker starting at some point in the future.

During this window, page migration can jump in and relocate the page.  Once our
fixup work actually starts, it finds page->mapping is NULL and we end up
freeing the page without ever writing it.

This leads to crc errors and other exciting problems, since it screws up the
whole statemachine for waiting for ordered extents.  The fix here is to keep
the page dirty while we're waiting for the fixup worker to get to work.
This is accomplished by returning -EAGAIN from btrfs_writepage_cow_fixup
if we queued the page up for fixup, which will cause the writepage
function to redirty the page.

Because we now expect the page to be dirty once it gets to the fixup
worker we must adjust the error cases to call clear_page_dirty_for_io()
on the page.  That is the bulk of the patch, but it is not the fix, the
fix is the -EAGAIN from btrfs_writepage_cow_fixup.  We cannot separate
these two changes out because the error conditions change with the new
expectations.
Signed-off-by: default avatarChris Mason <clm@fb.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a30a3d20
...@@ -2202,17 +2202,27 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work) ...@@ -2202,17 +2202,27 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work)
struct inode *inode; struct inode *inode;
u64 page_start; u64 page_start;
u64 page_end; u64 page_end;
int ret; int ret = 0;
fixup = container_of(work, struct btrfs_writepage_fixup, work); fixup = container_of(work, struct btrfs_writepage_fixup, work);
page = fixup->page; page = fixup->page;
again: again:
lock_page(page); lock_page(page);
if (!page->mapping || !PageDirty(page) || !PageChecked(page)) {
ClearPageChecked(page); /*
* Before we queued this fixup, we took a reference on the page.
* page->mapping may go NULL, but it shouldn't be moved to a different
* address space.
*/
if (!page->mapping || !PageDirty(page) || !PageChecked(page))
goto out_page; goto out_page;
}
/*
* We keep the PageChecked() bit set until we're done with the
* btrfs_start_ordered_extent() dance that we do below. That drops and
* retakes the page lock, so we don't want new fixup workers queued for
* this page during the churn.
*/
inode = page->mapping->host; inode = page->mapping->host;
page_start = page_offset(page); page_start = page_offset(page);
page_end = page_offset(page) + PAGE_SIZE - 1; page_end = page_offset(page) + PAGE_SIZE - 1;
...@@ -2237,24 +2247,22 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work) ...@@ -2237,24 +2247,22 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work)
ret = btrfs_delalloc_reserve_space(inode, &data_reserved, page_start, ret = btrfs_delalloc_reserve_space(inode, &data_reserved, page_start,
PAGE_SIZE); PAGE_SIZE);
if (ret) { if (ret)
mapping_set_error(page->mapping, ret);
end_extent_writepage(page, ret, page_start, page_end);
ClearPageChecked(page);
goto out; goto out;
}
ret = btrfs_set_extent_delalloc(inode, page_start, page_end, 0, ret = btrfs_set_extent_delalloc(inode, page_start, page_end, 0,
&cached_state); &cached_state);
if (ret) { if (ret)
mapping_set_error(page->mapping, ret);
end_extent_writepage(page, ret, page_start, page_end);
ClearPageChecked(page);
goto out_reserved; goto out_reserved;
}
ClearPageChecked(page); /*
set_page_dirty(page); * Everything went as planned, we're now the owner of a dirty page with
* delayed allocation bits set and space reserved for our COW
* destination.
*
* The page was dirty when we started, nothing should have cleaned it.
*/
BUG_ON(!PageDirty(page));
out_reserved: out_reserved:
btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE); btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE);
if (ret) if (ret)
...@@ -2264,6 +2272,17 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work) ...@@ -2264,6 +2272,17 @@ static void btrfs_writepage_fixup_worker(struct btrfs_work *work)
unlock_extent_cached(&BTRFS_I(inode)->io_tree, page_start, page_end, unlock_extent_cached(&BTRFS_I(inode)->io_tree, page_start, page_end,
&cached_state); &cached_state);
out_page: out_page:
if (ret) {
/*
* We hit ENOSPC or other errors. Update the mapping and page
* to reflect the errors and clean the page.
*/
mapping_set_error(page->mapping, ret);
end_extent_writepage(page, ret, page_start, page_end);
clear_page_dirty_for_io(page);
SetPageError(page);
}
ClearPageChecked(page);
unlock_page(page); unlock_page(page);
put_page(page); put_page(page);
kfree(fixup); kfree(fixup);
...@@ -2291,6 +2310,13 @@ int btrfs_writepage_cow_fixup(struct page *page, u64 start, u64 end) ...@@ -2291,6 +2310,13 @@ int btrfs_writepage_cow_fixup(struct page *page, u64 start, u64 end)
if (TestClearPagePrivate2(page)) if (TestClearPagePrivate2(page))
return 0; return 0;
/*
* PageChecked is set below when we create a fixup worker for this page,
* don't try to create another one if we're already PageChecked()
*
* The extent_io writepage code will redirty the page if we send back
* EAGAIN.
*/
if (PageChecked(page)) if (PageChecked(page))
return -EAGAIN; return -EAGAIN;
...@@ -2303,7 +2329,8 @@ int btrfs_writepage_cow_fixup(struct page *page, u64 start, u64 end) ...@@ -2303,7 +2329,8 @@ int btrfs_writepage_cow_fixup(struct page *page, u64 start, u64 end)
btrfs_init_work(&fixup->work, btrfs_writepage_fixup_worker, NULL, NULL); btrfs_init_work(&fixup->work, btrfs_writepage_fixup_worker, NULL, NULL);
fixup->page = page; fixup->page = page;
btrfs_queue_work(fs_info->fixup_workers, &fixup->work); btrfs_queue_work(fs_info->fixup_workers, &fixup->work);
return -EBUSY;
return -EAGAIN;
} }
static int insert_reserved_file_extent(struct btrfs_trans_handle *trans, static int insert_reserved_file_extent(struct btrfs_trans_handle *trans,
......
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