Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ca738d6 authored by Derek Basehore's avatar Derek Basehore Committed by Linus Torvalds
Browse files

backing_dev: fix hung task on sync 



bdi_wakeup_thread_delayed() used the mod_delayed_work() function to
schedule work to writeback dirty inodes.  The problem with this is that
it can delay work that is scheduled for immediate execution, such as the
work from sync_inodes_sb().  This can happen since mod_delayed_work()
can now steal work from a work_queue.  This fixes the problem by using
queue_delayed_work() instead.  This is a regression caused by commit
839a8e86 ("writeback: replace custom worker pool implementation with
unbound workqueue").

The reason that this causes a problem is that laptop-mode will change
the delay, dirty_writeback_centisecs, to 60000 (10 minutes) by default.
In the case that bdi_wakeup_thread_delayed() races with
sync_inodes_sb(), sync will be stopped for 10 minutes and trigger a hung
task.  Even if dirty_writeback_centisecs is not long enough to cause a
hung task, we still don't want to delay sync for that long.

We fix the problem by using queue_delayed_work() when we want to
schedule writeback sometime in future.  This function doesn't change the
timer if it is already armed.

For the same reason, we also change bdi_writeback_workfn() to
immediately queue the work again in the case that the work_list is not
empty.  The same problem can happen if the sync work is run on the
rescue worker.

[jack@suse.cz: update changelog, add comment, use bdi_wakeup_thread_delayed()]
Signed-off-by: default avatarDerek Basehore <dbasehore@chromium.org>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Cc: Alexander Viro <viro@zento.linux.org.uk>
Reviewed-by: default avatarTejun Heo <tj@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Derek Basehore <dbasehore@chromium.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Benson Leung <bleung@chromium.org>
Cc: Sonny Rao <sonnyrao@chromium.org>
Cc: Luigi Semenzato <semenzato@chromium.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Dave Chinner <david@fromorbit.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a0c32761

fs/fs-writeback.c

+4 −4
Original line number Diff line number Diff line
@@ -1039,10 +1039,10 @@ void bdi_writeback_workfn(struct work_struct *work) 
		trace_writeback_pages_written(pages_written);

	}



	if (!list_empty(&bdi->work_list) ||

	    (wb_has_dirty_io(wb) && dirty_writeback_interval))

		queue_delayed_work(bdi_wq, &wb->dwork,

			msecs_to_jiffies(dirty_writeback_interval * 10));

	if (!list_empty(&bdi->work_list))

		mod_delayed_work(bdi_wq, &wb->dwork, 0);

	else if (wb_has_dirty_io(wb) && dirty_writeback_interval)

		bdi_wakeup_thread_delayed(bdi);



	current->flags &= ~PF_SWAPWRITE;

}

mm/backing-dev.c

+4 −1
Original line number Diff line number Diff line
@@ -288,13 +288,16 @@ int bdi_has_dirty_io(struct backing_dev_info *bdi) 
 * Note, we wouldn't bother setting up the timer, but this function is on the

 * fast-path (used by '__mark_inode_dirty()'), so we save few context switches

 * by delaying the wake-up.

 *

 * We have to be careful not to postpone flush work if it is scheduled for

 * earlier. Thus we use queue_delayed_work().

 */

void bdi_wakeup_thread_delayed(struct backing_dev_info *bdi)

{

	unsigned long timeout;



	timeout = msecs_to_jiffies(dirty_writeback_interval * 10);

	mod_delayed_work(bdi_wq, &bdi->wb.dwork, timeout);

	queue_delayed_work(bdi_wq, &bdi->wb.dwork, timeout);

}



/*