Commit 7624ee72 authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds

mm: avoid resetting wb_start after each writeback round

WB_SYNC_NONE writeback is done in rounds of 1024 pages so that we don't
write out some huge inode for too long while starving writeout of other
inodes.  To avoid livelocks, we record time we started writeback in
wbc->wb_start and do not write out inodes which were dirtied after this
time.  But currently, writeback_inodes_wb() resets wb_start each time it
is called thus effectively invalidating this logic and making any
WB_SYNC_NONE writeback prone to livelocks.

This patch makes sure wb_start is set only once when we start writeback.
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Acked-by: default avatarJens Axboe <jaxboe@fusionio.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d9f8984c
...@@ -530,6 +530,7 @@ void writeback_inodes_wb(struct bdi_writeback *wb, ...@@ -530,6 +530,7 @@ void writeback_inodes_wb(struct bdi_writeback *wb,
{ {
int ret = 0; int ret = 0;
if (!wbc->wb_start)
wbc->wb_start = jiffies; /* livelock avoidance */ wbc->wb_start = jiffies; /* livelock avoidance */
spin_lock(&inode_lock); spin_lock(&inode_lock);
if (!wbc->for_kupdate || list_empty(&wb->b_io)) if (!wbc->for_kupdate || list_empty(&wb->b_io))
...@@ -559,7 +560,6 @@ static void __writeback_inodes_sb(struct super_block *sb, ...@@ -559,7 +560,6 @@ static void __writeback_inodes_sb(struct super_block *sb,
{ {
WARN_ON(!rwsem_is_locked(&sb->s_umount)); WARN_ON(!rwsem_is_locked(&sb->s_umount));
wbc->wb_start = jiffies; /* livelock avoidance */
spin_lock(&inode_lock); spin_lock(&inode_lock);
if (!wbc->for_kupdate || list_empty(&wb->b_io)) if (!wbc->for_kupdate || list_empty(&wb->b_io))
queue_io(wb, wbc->older_than_this); queue_io(wb, wbc->older_than_this);
...@@ -625,6 +625,7 @@ static long wb_writeback(struct bdi_writeback *wb, ...@@ -625,6 +625,7 @@ static long wb_writeback(struct bdi_writeback *wb,
wbc.range_end = LLONG_MAX; wbc.range_end = LLONG_MAX;
} }
wbc.wb_start = jiffies; /* livelock avoidance */
for (;;) { for (;;) {
/* /*
* Stop writeback when nr_pages has been consumed * Stop writeback when nr_pages has been consumed
......
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