summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangguang <wang.guang55@zte.com.cn>2016-09-15 11:32:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-22 12:06:49 +0200
commit3b17d6f59eea2959093bf27196b69975486f50a3 (patch)
tree4d4284fea6cc9643548836a8a0de3ec3372ce9dc
parentedae25ac50ff2cf7f94dd37a2e0e2c389f4ac0ed (diff)
downloadlinux-stable-3b17d6f59eea2959093bf27196b69975486f50a3.tar.gz
linux-stable-3b17d6f59eea2959093bf27196b69975486f50a3.tar.bz2
linux-stable-3b17d6f59eea2959093bf27196b69975486f50a3.zip
ext4: bugfix for mmaped pages in mpage_release_unused_pages()
commit 4e800c0359d9a53e6bf0ab216954971b2515247f upstream. Pages clear buffers after ext4 delayed block allocation failed, However, it does not clean its pte_dirty flag. if the pages unmap ,in cording to the pte_dirty , unmap_page_range may try to call __set_page_dirty, which may lead to the bugon at mpage_prepare_extent_to_map:head = page_buffers(page);. This patch just call clear_page_dirty_for_io to clean pte_dirty at mpage_release_unused_pages for pages mmaped. Steps to reproduce the bug: (1) mmap a file in ext4 addr = (char *)mmap(NULL, 4096, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); memset(addr, 'i', 4096); (2) return EIO at ext4_writepages->mpage_map_and_submit_extent->mpage_map_one_extent which causes this log message to be print: ext4_msg(sb, KERN_CRIT, "Delayed block allocation failed for " "inode %lu at logical offset %llu with" " max blocks %u with error %d", inode->i_ino, (unsigned long long)map->m_lblk, (unsigned)map->m_len, -err); (3)Unmap the addr cause warning at __set_page_dirty:WARN_ON_ONCE(warn && !PageUptodate(page)); (4) wait for a minute,then bugon happen. Signed-off-by: wangguang <wangguang03@zte.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/ext4/inode.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index e0afbdd01038..0dbe87a0d1e5 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1649,6 +1649,8 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,
BUG_ON(!PageLocked(page));
BUG_ON(PageWriteback(page));
if (invalidate) {
+ if (page_mapped(page))
+ clear_page_dirty_for_io(page);
block_invalidatepage(page, 0, PAGE_SIZE);
ClearPageUptodate(page);
}