From: Jens Axboe <jens.axboe@oracle.com>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: chris.mason@oracle.com, david@fromorbit.com, hch@infradead.org,
akpm@linux-foundation.org, jack@suse.cz,
yanmin_zhang@linux.intel.com, richard@rsk.demon.co.uk,
damien.wyart@free.fr, fweisbec@gmail.com, Alan.Brunelle@hp.com,
Jens Axboe <jens.axboe@oracle.com>
Subject: [PATCH 6/9] writeback: allow sleepy exit of default writeback task
Date: Thu, 30 Jul 2009 23:24:01 +0200 [thread overview]
Message-ID: <1248989044-21605-7-git-send-email-jens.axboe@oracle.com> (raw)
In-Reply-To: <1248989044-21605-1-git-send-email-jens.axboe@oracle.com>
Since we do lazy create of default writeback tasks for a bdi, we can
allow sleepy exit if it has been completely idle for 5 minutes.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---
fs/fs-writeback.c | 30 +++++++++++++++++++++++++-----
include/linux/backing-dev.h | 5 +++++
include/linux/writeback.h | 2 +-
3 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 8069483..796b243 100644
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -369,7 +369,7 @@ static struct bdi_work *get_next_work_item(struct backing_dev_info *bdi,
/*
* Retrieve work items and do the writeback they describe
*/
-void wb_do_writeback(struct bdi_writeback *wb, int force_wait)
+long wb_do_writeback(struct bdi_writeback *wb, int force_wait)
{
struct backing_dev_info *bdi = wb->bdi;
struct bdi_work *work;
@@ -414,8 +414,10 @@ void wb_do_writeback(struct bdi_writeback *wb, int force_wait)
global_page_state(NR_UNSTABLE_NFS) +
(inodes_stat.nr_inodes - inodes_stat.nr_unused);
- wb_writeback(wb, nr_pages, NULL, WB_SYNC_NONE, 1);
+ wrote = wb_writeback(wb, nr_pages, NULL, WB_SYNC_NONE, 1);
}
+
+ return wrote;
}
/*
@@ -424,10 +426,28 @@ void wb_do_writeback(struct bdi_writeback *wb, int force_wait)
*/
int bdi_writeback_task(struct bdi_writeback *wb)
{
+ unsigned long last_active = jiffies;
+ unsigned long wait_jiffies = -1UL;
+ long pages_written;
+
while (!kthread_should_stop()) {
- unsigned long wait_jiffies;
+ pages_written = wb_do_writeback(wb, 0);
+
+ if (pages_written)
+ last_active = jiffies;
+ else if (wait_jiffies != -1UL) {
+ unsigned long max_idle;
- wb_do_writeback(wb, 0);
+ /*
+ * Longest period of inactivity that we tolerate. If we
+ * see dirty data again later, the task will get
+ * recreated automatically.
+ */
+ max_idle = max(5UL * 60 * HZ, wait_jiffies);
+ if (time_after(jiffies, max_idle + last_active) &&
+ wb_is_default_task(wb))
+ break;
+ }
wait_jiffies = msecs_to_jiffies(dirty_writeback_interval * 10);
set_current_state(TASK_INTERRUPTIBLE);
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index 90a1910..7a23f2f 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -110,6 +110,11 @@ int bdi_has_dirty_io(struct backing_dev_info *bdi);
extern spinlock_t bdi_lock;
extern struct list_head bdi_list;
+static inline int wb_is_default_task(struct bdi_writeback *wb)
+{
+ return wb == &wb->bdi->wb;
+}
+
static inline int bdi_wblist_needs_lock(struct backing_dev_info *bdi)
{
return test_bit(BDI_wblist_lock, &bdi->state);
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index 588a449..e070b91 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -68,7 +68,7 @@ struct writeback_control {
void writeback_inodes(struct writeback_control *wbc);
int inode_wait(void *);
void sync_inodes_sb(struct super_block *, int wait);
-void wb_do_writeback(struct bdi_writeback *wb, int force_wait);
+long wb_do_writeback(struct bdi_writeback *wb, int force_wait);
/* writeback.h requires fs.h; it, too, is not included from here. */
static inline void wait_on_inode(struct inode *inode)
--
1.6.3.2.306.g4f4fa
next prev parent reply other threads:[~2009-07-30 21:24 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-30 21:23 [PATCH 0/9] Per-bdi writeback flusher threads v13 Jens Axboe
2009-07-30 21:23 ` [PATCH 1/9] writeback: move dirty inodes from super_block to backing_dev_info Jens Axboe
2009-08-06 21:35 ` Christoph Hellwig
2009-08-12 16:12 ` Jens Axboe
2009-08-12 16:18 ` Jens Axboe
2009-08-28 20:29 ` Christoph Hellwig
2009-07-30 21:23 ` [PATCH 2/9] writeback: switch to per-bdi threads for flushing data Jens Axboe
2009-08-05 16:35 ` Jan Kara
2009-08-06 21:44 ` Christoph Hellwig
2009-07-30 21:23 ` [PATCH 3/9] writeback: get rid of pdflush completely Jens Axboe
2009-07-30 21:23 ` [PATCH 4/9] writeback: separate the flushing state/task from the bdi Jens Axboe
2009-07-30 21:24 ` [PATCH 5/9] writeback: support > 1 flusher thread per bdi Jens Axboe
2009-08-05 19:55 ` Jan Kara
2009-08-06 7:05 ` Jens Axboe
2009-08-06 20:56 ` Jan Kara
2009-08-24 11:43 ` Jens Axboe
2009-08-24 12:36 ` Jan Kara
2009-08-24 14:09 ` Jens Axboe
2009-08-06 21:33 ` Christoph Hellwig
2009-07-30 21:24 ` Jens Axboe [this message]
2009-08-05 19:57 ` [PATCH 6/9] writeback: allow sleepy exit of default writeback task Jan Kara
2009-08-06 7:03 ` Jens Axboe
2009-08-06 18:55 ` Jan Kara
2009-07-30 21:24 ` [PATCH 7/9] writeback: add some debug inode list counters to bdi stats Jens Axboe
2009-07-30 21:24 ` [PATCH 8/9] writeback: add name to backing_dev_info Jens Axboe
2009-07-30 21:24 ` [PATCH 9/9] writeback: check for registered bdi in flusher add and inode dirty Jens Axboe
2009-07-31 6:30 ` [PATCH 0/9] Per-bdi writeback flusher threads v13 Damien Wyart
2009-07-31 7:15 ` Jens Axboe
2009-08-03 19:29 ` Damien Wyart
2009-08-03 20:28 ` Jens Axboe
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=1248989044-21605-7-git-send-email-jens.axboe@oracle.com \
--to=jens.axboe@oracle.com \
--cc=Alan.Brunelle@hp.com \
--cc=akpm@linux-foundation.org \
--cc=chris.mason@oracle.com \
--cc=damien.wyart@free.fr \
--cc=david@fromorbit.com \
--cc=fweisbec@gmail.com \
--cc=hch@infradead.org \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=richard@rsk.demon.co.uk \
--cc=yanmin_zhang@linux.intel.com \
/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).