Subject: [merged] backing_dev-fix-hung-task-on-sync.patch removed from -mm tree
To: dbasehore@xxxxxxxxxxxx,axboe@xxxxxxxxx,bleung@xxxxxxxxxxxx,darrick.wong@xxxxxxxxxx,david@xxxxxxxxxxxxx,gregkh@xxxxxxxxxxxxxxxxxxx,jack@xxxxxxx,keescook@xxxxxxxxxxxx,semenzato@xxxxxxxxxxxx,sonnyrao@xxxxxxxxxxxx,stable@xxxxxxxxxxxxxxx,tj@xxxxxxxxxx,viro@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 04 Apr 2014 12:29:18 -0700
The patch titled
Subject: backing_dev: fix hung task on sync
has been removed from the -mm tree. Its filename was
backing_dev-fix-hung-task-on-sync.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Derek Basehore <dbasehore@xxxxxxxxxxxx>
Subject: 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 839a8e8660b6
("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@xxxxxxx: update changelog, add comment, use bdi_wakeup_thread_delayed()]
Signed-off-by: Derek Basehore <dbasehore@xxxxxxxxxxxx>
Reviewed-by: Jan Kara <jack@xxxxxxx>
Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Tejun Heo <tj@xxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: "Darrick J. Wong" <darrick.wong@xxxxxxxxxx>
Cc: Derek Basehore <dbasehore@xxxxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Benson Leung <bleung@xxxxxxxxxxxx>
Cc: Sonny Rao <sonnyrao@xxxxxxxxxxxx>
Cc: Luigi Semenzato <semenzato@xxxxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Dave Chinner <david@xxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/fs-writeback.c | 8 ++++----
mm/backing-dev.c | 5 ++++-
2 files changed, 8 insertions(+), 5 deletions(-)
diff -puN fs/fs-writeback.c~backing_dev-fix-hung-task-on-sync fs/fs-writeback.c
--- a/fs/fs-writeback.c~backing_dev-fix-hung-task-on-sync
+++ a/fs/fs-writeback.c
@@ -1039,10 +1039,10 @@ void bdi_writeback_workfn(struct work_st
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;
}
diff -puN mm/backing-dev.c~backing_dev-fix-hung-task-on-sync mm/backing-dev.c
--- a/mm/backing-dev.c~backing_dev-fix-hung-task-on-sync
+++ a/mm/backing-dev.c
@@ -288,13 +288,16 @@ int bdi_has_dirty_io(struct backing_dev_
* 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);
}
/*
_
Patches currently in -mm which might be from dbasehore@xxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html