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: LKML <linux-kernel@vger.kernel.org>
Cc: <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 5/6] writeback: trace event writeback_queue_io
Date: Wed, 04 May 2011 17:17:12 +0800 [thread overview]
Message-ID: <20110504091909.766872085@intel.com> (raw)
In-Reply-To: 20110504091707.910929441@intel.com
[-- Attachment #1: writeback-trace-queue_io.patch --]
[-- Type: text/plain, Size: 3305 bytes --]
Note that it adds a little overheads to account the moved/enqueued
inodes from b_dirty to b_io. The "moved" accounting may be later used to
limit the number of inodes that can be moved in one shot, in order to
keep spinlock hold time under control.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
fs/fs-writeback.c | 16 +++++++++++-----
include/trace/events/writeback.h | 23 +++++++++++++++++++++++
2 files changed, 34 insertions(+), 5 deletions(-)
--- linux-next.orig/fs/fs-writeback.c 2011-05-04 16:01:27.000000000 +0800
+++ linux-next/fs/fs-writeback.c 2011-05-04 16:09:01.000000000 +0800
@@ -248,15 +248,16 @@ static bool inode_dirtied_after(struct i
/*
* Move expired dirty inodes from @delaying_queue to @dispatch_queue.
*/
-static void move_expired_inodes(struct list_head *delaying_queue,
- struct list_head *dispatch_queue,
- struct writeback_control *wbc)
+static int move_expired_inodes(struct list_head *delaying_queue,
+ struct list_head *dispatch_queue,
+ struct writeback_control *wbc)
{
LIST_HEAD(tmp);
struct list_head *pos, *node;
struct super_block *sb = NULL;
struct inode *inode;
int do_sb_sort = 0;
+ int moved = 0;
while (!list_empty(delaying_queue)) {
inode = wb_inode(delaying_queue->prev);
@@ -267,12 +268,13 @@ static void move_expired_inodes(struct l
do_sb_sort = 1;
sb = inode->i_sb;
list_move(&inode->i_wb_list, &tmp);
+ moved++;
}
/* just one sb in list, splice to dispatch_queue and we're done */
if (!do_sb_sort) {
list_splice(&tmp, dispatch_queue);
- return;
+ goto out;
}
/* Move inodes from one superblock together */
@@ -284,6 +286,8 @@ static void move_expired_inodes(struct l
list_move(&inode->i_wb_list, dispatch_queue);
}
}
+out:
+ return moved;
}
/*
@@ -299,9 +303,11 @@ static void move_expired_inodes(struct l
*/
static void queue_io(struct bdi_writeback *wb, struct writeback_control *wbc)
{
+ int moved;
assert_spin_locked(&wb->list_lock);
list_splice_init(&wb->b_more_io, &wb->b_io);
- move_expired_inodes(&wb->b_dirty, &wb->b_io, wbc);
+ moved = move_expired_inodes(&wb->b_dirty, &wb->b_io, wbc);
+ trace_writeback_queue_io(wb, wbc, moved);
}
static int write_inode(struct inode *inode, struct writeback_control *wbc)
--- linux-next.orig/include/trace/events/writeback.h 2011-05-04 16:06:50.000000000 +0800
+++ linux-next/include/trace/events/writeback.h 2011-05-04 16:08:58.000000000 +0800
@@ -165,6 +165,29 @@ DEFINE_WBC_EVENT(wbc_balance_dirty_writt
DEFINE_WBC_EVENT(wbc_balance_dirty_wait);
DEFINE_WBC_EVENT(wbc_writepage);
+TRACE_EVENT(writeback_queue_io,
+ TP_PROTO(struct bdi_writeback *wb,
+ struct writeback_control *wbc,
+ int moved),
+ TP_ARGS(wb, wbc, moved),
+ TP_STRUCT__entry(
+ __array(char, name, 32)
+ __field(int, older)
+ __field(int, moved)
+ ),
+ TP_fast_assign(
+ strncpy(__entry->name, dev_name(wb->bdi->dev), 32);
+ __entry->older = wbc->older_than_this ?
+ (jiffies - *wbc->older_than_this) * 1000 / HZ
+ : -1;
+ __entry->moved = moved;
+ ),
+ TP_printk("bdi %s: older=%d enqueue=%d",
+ __entry->name,
+ __entry->older,
+ __entry->moved)
+);
+
DECLARE_EVENT_CLASS(writeback_congest_waited_template,
TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed),
next prev parent reply other threads:[~2011-05-04 9:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-04 9:17 [PATCH 0/6] writeback fixes and trace events Wu Fengguang
2011-05-04 9:17 ` [PATCH 1/6] writeback: add bdi_dirty_limit() kernel-doc Wu Fengguang
2011-05-04 9:17 ` [PATCH 2/6] writeback: skip balance_dirty_pages() for in-memory fs Wu Fengguang
2011-05-04 9:17 ` [PATCH 3/6] writeback: make nr_to_write a per-file limit Wu Fengguang
2011-05-04 9:42 ` Christoph Hellwig
2011-05-04 11:52 ` Wu Fengguang
2011-05-04 15:51 ` Wu Fengguang
2011-05-04 16:18 ` Christoph Hellwig
2011-05-05 10:47 ` Wu Fengguang
2011-05-04 9:17 ` [PATCH 4/6] writeback: trace event writeback_single_inode Wu Fengguang
2011-05-04 9:17 ` Wu Fengguang [this message]
2011-05-05 16:37 ` [PATCH 5/6] writeback: trace event writeback_queue_io (v2) Wu Fengguang
2011-05-05 17:26 ` Jan Kara
2011-05-04 9:17 ` [PATCH 6/6] writeback: convert to relative older_than_this in trace events Wu Fengguang
2011-05-04 22:23 ` Jan Kara
2011-05-05 12:33 ` Wu Fengguang
2011-05-04 9:46 ` [PATCH 0/6] writeback fixes and " Christoph Hellwig
2011-05-04 9:56 ` Wu Fengguang
2011-05-04 10:06 ` Dave Chinner
2011-05-04 11:18 ` Christoph Hellwig
2011-05-04 13:12 ` Theodore Tso
2011-05-04 22:31 ` Jan Kara
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=20110504091909.766872085@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).