diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2014-02-17 17:30:03 +0100 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2014-03-24 18:27:21 -0400 |
| commit | 948b03c61aae3c9f3c004f535b253f9a16047fa0 (patch) | |
| tree | ff3f90eb565ff86bdf91216fc5ae64c07ce54cd6 | |
| parent | 03f5e8d3cc1bb115e6e9b0f8bd071dcd1de6d839 (diff) | |
fs: jbd2: pull your plug when waiting for space
Two cps in parallel managed to stall the the ext4 fs. It seems that
journal code is either waiting for locks or sleeping waiting for
something to happen. This seems similar to what Mike observed on ext3,
here is his description:
|With an -rt kernel, and a heavy sync IO load, tasks can jam
|up on journal locks without unplugging, which can lead to
|terminal IO starvation. Unplug and schedule when waiting
|for space.
Cc: stable-rt@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
| -rw-r--r-- | fs/jbd2/checkpoint.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index c78841ee81cf..a4d273b61596 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c @@ -125,6 +125,8 @@ void __jbd2_log_wait_for_space(journal_t *journal) if (journal->j_flags & JBD2_ABORT) return; write_unlock(&journal->j_state_lock); + if (current->plug) + io_schedule(); mutex_lock(&journal->j_checkpoint_mutex); /* |