From: Wu Fengguang <fengguang.wu@intel.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jan Kara <jack@suse.cz>, Wu Fengguang <fengguang.wu@intel.com>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: <linux-fsdevel@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 09/15] writeback: avoid extra sync work at enqueue time
Date: Wed, 08 Jun 2011 05:32:45 +0800 [thread overview]
Message-ID: <20110607213854.519920424@intel.com> (raw)
In-Reply-To: 20110607213236.634026193@intel.com
[-- Attachment #1: writeback-kill-wb_start.patch --]
[-- Type: text/plain, Size: 2179 bytes --]
This removes writeback_control.wb_start and does more straightforward
sync livelock prevention by setting .older_than_this to prevent extra
inodes from being enqueued in the first place.
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
fs/fs-writeback.c | 16 +++-------------
include/linux/writeback.h | 3 ---
2 files changed, 3 insertions(+), 16 deletions(-)
--- linux-next.orig/fs/fs-writeback.c 2011-05-24 11:17:21.000000000 +0800
+++ linux-next/fs/fs-writeback.c 2011-05-24 11:17:22.000000000 +0800
@@ -544,15 +544,6 @@ static int writeback_sb_inodes(struct su
continue;
}
- /*
- * Was this inode dirtied after sync_sb_inodes was called?
- * This keeps sync from extra jobs and livelock.
- */
- if (inode_dirtied_after(inode, wbc->wb_start)) {
- spin_unlock(&inode->i_lock);
- return 1;
- }
-
__iget(inode);
pages_skipped = wbc->pages_skipped;
@@ -585,9 +576,6 @@ static void __writeback_inodes_wb(struct
{
int ret = 0;
- if (!wbc->wb_start)
- wbc->wb_start = jiffies; /* livelock avoidance */
-
while (!list_empty(&wb->b_io)) {
struct inode *inode = wb_inode(wb->b_io.prev);
struct super_block *sb = inode->i_sb;
@@ -686,7 +674,9 @@ static long wb_writeback(struct bdi_writ
if (wbc.sync_mode == WB_SYNC_ALL || wbc.tagged_writepages)
write_chunk = LONG_MAX;
- wbc.wb_start = jiffies; /* livelock avoidance */
+ oldest_jif = jiffies;
+ wbc.older_than_this = &oldest_jif;
+
spin_lock(&wb->list_lock);
for (;;) {
/*
--- linux-next.orig/include/linux/writeback.h 2011-05-24 11:17:20.000000000 +0800
+++ linux-next/include/linux/writeback.h 2011-05-24 11:17:22.000000000 +0800
@@ -26,9 +26,6 @@ struct writeback_control {
enum writeback_sync_modes sync_mode;
unsigned long *older_than_this; /* If !NULL, only write back inodes
older than this */
- unsigned long wb_start; /* Time writeback_inodes_wb was
- called. This is needed to avoid
- extra jobs and livelock */
long nr_to_write; /* Write this many pages, and decrement
this for each page written */
long pages_skipped; /* Pages which were not written */
next prev parent reply other threads:[~2011-06-07 21:44 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-07 21:32 [PATCH 00/15] writeback fixes and cleanups for 3.0 (v5) Wu Fengguang
2011-06-07 21:32 ` [PATCH 01/15] writeback: introduce .tagged_writepages for the WB_SYNC_NONE sync stage Wu Fengguang
2011-06-07 23:02 ` Andrew Morton
2011-06-07 23:24 ` Wu Fengguang
2011-06-07 21:32 ` [PATCH 02/15] writeback: update dirtied_when for synced inode to prevent livelock Wu Fengguang
2011-06-07 23:02 ` Andrew Morton
2011-06-07 23:51 ` Wu Fengguang
2011-06-07 21:32 ` [PATCH 03/15] writeback: introduce writeback_control.inodes_cleaned Wu Fengguang
2011-06-07 23:03 ` Andrew Morton
2011-06-08 0:10 ` Wu Fengguang
2011-06-07 21:32 ` [PATCH 04/15] writeback: try more writeback as long as something was written Wu Fengguang
2011-06-07 21:32 ` [PATCH 05/15] writeback: the kupdate expire timestamp should be a moving target Wu Fengguang
2011-06-07 21:32 ` [PATCH 06/15] writeback: refill b_io iff empty Wu Fengguang
2011-06-07 21:32 ` [PATCH 07/15] writeback: split inode_wb_list_lock into bdi_writeback.list_lock Wu Fengguang
2011-06-07 23:03 ` Andrew Morton
2011-06-08 0:20 ` Wu Fengguang
2011-06-08 0:35 ` Andrew Morton
2011-06-08 1:36 ` Wu Fengguang
2011-06-07 21:32 ` [PATCH 08/15] writeback: elevate queue_io() into wb_writeback() Wu Fengguang
2011-06-07 21:32 ` Wu Fengguang [this message]
2011-06-07 21:32 ` [PATCH 10/15] writeback: add bdi_dirty_limit() kernel-doc Wu Fengguang
2011-06-07 21:32 ` [PATCH 11/15] writeback: skip balance_dirty_pages() for in-memory fs Wu Fengguang
2011-06-11 13:07 ` Wu Fengguang
2011-06-13 13:42 ` Jan Kara
2011-06-07 21:32 ` [PATCH 12/15] writeback: remove writeback_control.more_io Wu Fengguang
2011-07-11 21:31 ` Hugh Dickins
2011-07-12 6:20 ` Wu Fengguang
2011-07-12 19:50 ` Hugh Dickins
2011-07-13 5:49 ` Hugh Dickins
2011-07-13 10:57 ` Hugh Dickins
2011-07-13 11:19 ` Jan Kara
2011-07-13 15:06 ` Hugh Dickins
2011-07-13 22:07 ` Wu Fengguang
2011-06-07 21:32 ` [PATCH 13/15] writeback: remove .nonblocking and .encountered_congestion Wu Fengguang
2011-06-07 21:32 ` [PATCH 14/15] writeback: trace event writeback_single_inode Wu Fengguang
2011-06-07 21:32 ` [PATCH 15/15] writeback: trace event writeback_queue_io Wu Fengguang
2011-06-07 23:04 ` [PATCH 00/15] writeback fixes and cleanups for 3.0 (v5) Andrew Morton
2011-06-08 2:01 ` Wu Fengguang
2011-06-08 6:21 ` Sedat Dilek
2011-06-08 13:45 ` Wu Fengguang
2011-06-09 1:16 ` Stephen Rothwell
2011-06-09 2:18 ` Wu Fengguang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110607213854.519920424@intel.com \
--to=fengguang.wu@intel.com \
--cc=akpm@linux-foundation.org \
--cc=jack@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).