mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
ext4: fix data integrity sync in ordered mode
When we perform a data integrity sync we tag all the dirty pages with PAGECACHE_TAG_TOWRITE at start of ext4_da_writepages. Later we check for this tag in write_cache_pages_da and creates a struct mpage_da_data containing contiguously indexed pages tagged with this tag and sync these pages with a call to mpage_da_map_and_submit. This process is done in while loop until all the PAGECACHE_TAG_TOWRITE pages are synced. We also do journal start and stop in each iteration. journal_stop could initiate journal commit which would call ext4_writepage which in turn will call ext4_bio_write_page even for delayed OR unwritten buffers. When ext4_bio_write_page is called for such buffers, even though it does not sync them but it clears the PAGECACHE_TAG_TOWRITE of the corresponding page and hence these pages are also not synced by the currently running data integrity sync. We will end up with dirty pages although sync is completed. This could cause a potential data loss when the sync call is followed by a truncate_pagecache call, which is exactly the case in collapse_range. (It will cause generic/127 failure in xfstests) To avoid this issue, we can use set_page_writeback_keepwrite instead of set_page_writeback, which doesn't clear TOWRITE tag. Cc: stable@vger.kernel.org Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com> Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Reviewed-by: Jan Kara <jack@suse.cz>
This commit is contained in:
parent
236f5ecb4a
commit
1c8349a171
5 changed files with 29 additions and 11 deletions
|
@ -2772,7 +2772,8 @@ extern void ext4_io_submit(struct ext4_io_submit *io);
|
||||||
extern int ext4_bio_write_page(struct ext4_io_submit *io,
|
extern int ext4_bio_write_page(struct ext4_io_submit *io,
|
||||||
struct page *page,
|
struct page *page,
|
||||||
int len,
|
int len,
|
||||||
struct writeback_control *wbc);
|
struct writeback_control *wbc,
|
||||||
|
bool keep_towrite);
|
||||||
|
|
||||||
/* mmp.c */
|
/* mmp.c */
|
||||||
extern int ext4_multi_mount_protect(struct super_block *, ext4_fsblk_t);
|
extern int ext4_multi_mount_protect(struct super_block *, ext4_fsblk_t);
|
||||||
|
|
|
@ -1846,6 +1846,7 @@ static int ext4_writepage(struct page *page,
|
||||||
struct buffer_head *page_bufs = NULL;
|
struct buffer_head *page_bufs = NULL;
|
||||||
struct inode *inode = page->mapping->host;
|
struct inode *inode = page->mapping->host;
|
||||||
struct ext4_io_submit io_submit;
|
struct ext4_io_submit io_submit;
|
||||||
|
bool keep_towrite = false;
|
||||||
|
|
||||||
trace_ext4_writepage(page);
|
trace_ext4_writepage(page);
|
||||||
size = i_size_read(inode);
|
size = i_size_read(inode);
|
||||||
|
@ -1876,6 +1877,7 @@ static int ext4_writepage(struct page *page,
|
||||||
unlock_page(page);
|
unlock_page(page);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
keep_towrite = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (PageChecked(page) && ext4_should_journal_data(inode))
|
if (PageChecked(page) && ext4_should_journal_data(inode))
|
||||||
|
@ -1892,7 +1894,7 @@ static int ext4_writepage(struct page *page,
|
||||||
unlock_page(page);
|
unlock_page(page);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
ret = ext4_bio_write_page(&io_submit, page, len, wbc);
|
ret = ext4_bio_write_page(&io_submit, page, len, wbc, keep_towrite);
|
||||||
ext4_io_submit(&io_submit);
|
ext4_io_submit(&io_submit);
|
||||||
/* Drop io_end reference we got from init */
|
/* Drop io_end reference we got from init */
|
||||||
ext4_put_io_end_defer(io_submit.io_end);
|
ext4_put_io_end_defer(io_submit.io_end);
|
||||||
|
@ -1911,7 +1913,7 @@ static int mpage_submit_page(struct mpage_da_data *mpd, struct page *page)
|
||||||
else
|
else
|
||||||
len = PAGE_CACHE_SIZE;
|
len = PAGE_CACHE_SIZE;
|
||||||
clear_page_dirty_for_io(page);
|
clear_page_dirty_for_io(page);
|
||||||
err = ext4_bio_write_page(&mpd->io_submit, page, len, mpd->wbc);
|
err = ext4_bio_write_page(&mpd->io_submit, page, len, mpd->wbc, false);
|
||||||
if (!err)
|
if (!err)
|
||||||
mpd->wbc->nr_to_write--;
|
mpd->wbc->nr_to_write--;
|
||||||
mpd->first_page++;
|
mpd->first_page++;
|
||||||
|
|
|
@ -401,7 +401,8 @@ static int io_submit_add_bh(struct ext4_io_submit *io,
|
||||||
int ext4_bio_write_page(struct ext4_io_submit *io,
|
int ext4_bio_write_page(struct ext4_io_submit *io,
|
||||||
struct page *page,
|
struct page *page,
|
||||||
int len,
|
int len,
|
||||||
struct writeback_control *wbc)
|
struct writeback_control *wbc,
|
||||||
|
bool keep_towrite)
|
||||||
{
|
{
|
||||||
struct inode *inode = page->mapping->host;
|
struct inode *inode = page->mapping->host;
|
||||||
unsigned block_start, blocksize;
|
unsigned block_start, blocksize;
|
||||||
|
@ -414,7 +415,10 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
|
||||||
BUG_ON(!PageLocked(page));
|
BUG_ON(!PageLocked(page));
|
||||||
BUG_ON(PageWriteback(page));
|
BUG_ON(PageWriteback(page));
|
||||||
|
|
||||||
set_page_writeback(page);
|
if (keep_towrite)
|
||||||
|
set_page_writeback_keepwrite(page);
|
||||||
|
else
|
||||||
|
set_page_writeback(page);
|
||||||
ClearPageError(page);
|
ClearPageError(page);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -317,13 +317,23 @@ CLEARPAGEFLAG(Uptodate, uptodate)
|
||||||
extern void cancel_dirty_page(struct page *page, unsigned int account_size);
|
extern void cancel_dirty_page(struct page *page, unsigned int account_size);
|
||||||
|
|
||||||
int test_clear_page_writeback(struct page *page);
|
int test_clear_page_writeback(struct page *page);
|
||||||
int test_set_page_writeback(struct page *page);
|
int __test_set_page_writeback(struct page *page, bool keep_write);
|
||||||
|
|
||||||
|
#define test_set_page_writeback(page) \
|
||||||
|
__test_set_page_writeback(page, false)
|
||||||
|
#define test_set_page_writeback_keepwrite(page) \
|
||||||
|
__test_set_page_writeback(page, true)
|
||||||
|
|
||||||
static inline void set_page_writeback(struct page *page)
|
static inline void set_page_writeback(struct page *page)
|
||||||
{
|
{
|
||||||
test_set_page_writeback(page);
|
test_set_page_writeback(page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void set_page_writeback_keepwrite(struct page *page)
|
||||||
|
{
|
||||||
|
test_set_page_writeback_keepwrite(page);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PAGEFLAGS_EXTENDED
|
#ifdef CONFIG_PAGEFLAGS_EXTENDED
|
||||||
/*
|
/*
|
||||||
* System with lots of page flags available. This allows separate
|
* System with lots of page flags available. This allows separate
|
||||||
|
|
|
@ -2398,7 +2398,7 @@ int test_clear_page_writeback(struct page *page)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int test_set_page_writeback(struct page *page)
|
int __test_set_page_writeback(struct page *page, bool keep_write)
|
||||||
{
|
{
|
||||||
struct address_space *mapping = page_mapping(page);
|
struct address_space *mapping = page_mapping(page);
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -2423,9 +2423,10 @@ int test_set_page_writeback(struct page *page)
|
||||||
radix_tree_tag_clear(&mapping->page_tree,
|
radix_tree_tag_clear(&mapping->page_tree,
|
||||||
page_index(page),
|
page_index(page),
|
||||||
PAGECACHE_TAG_DIRTY);
|
PAGECACHE_TAG_DIRTY);
|
||||||
radix_tree_tag_clear(&mapping->page_tree,
|
if (!keep_write)
|
||||||
page_index(page),
|
radix_tree_tag_clear(&mapping->page_tree,
|
||||||
PAGECACHE_TAG_TOWRITE);
|
page_index(page),
|
||||||
|
PAGECACHE_TAG_TOWRITE);
|
||||||
spin_unlock_irqrestore(&mapping->tree_lock, flags);
|
spin_unlock_irqrestore(&mapping->tree_lock, flags);
|
||||||
} else {
|
} else {
|
||||||
ret = TestSetPageWriteback(page);
|
ret = TestSetPageWriteback(page);
|
||||||
|
@ -2436,7 +2437,7 @@ int test_set_page_writeback(struct page *page)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(test_set_page_writeback);
|
EXPORT_SYMBOL(__test_set_page_writeback);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Return true if any of the pages in the mapping are marked with the
|
* Return true if any of the pages in the mapping are marked with the
|
||||||
|
|
Loading…
Reference in a new issue