aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorMel Gorman <mel@csn.ul.ie>2010-10-26 17:21:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-26 19:52:07 -0400
commit52bb9198668968506f9d12bf35d7f5d3f094921e (patch)
tree6e1f79c46de902c4462054803eb13115673f8c8c /mm
parente11da5b4fdf01d71d73c21cb92b00595b917d7fd (diff)
writeback: account for time spent congestion_waited
There is strong evidence to indicate a lot of time is being spent in congestion_wait(), some of it unnecessarily. This patch adds a tracepoint for congestion_wait to record when congestion_wait() was called, how long the timeout was for and how long it actually slept. Signed-off-by: Mel Gorman <mel@csn.ul.ie> Reviewed-by: Minchan Kim <minchan.kim@gmail.com> Reviewed-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Wu Fengguang <fengguang.wu@intel.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Rik van Riel <riel@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/backing-dev.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 65d420499a61..55627306abe0 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -764,12 +764,17 @@ EXPORT_SYMBOL(set_bdi_congested);
764long congestion_wait(int sync, long timeout) 764long congestion_wait(int sync, long timeout)
765{ 765{
766 long ret; 766 long ret;
767 unsigned long start = jiffies;
767 DEFINE_WAIT(wait); 768 DEFINE_WAIT(wait);
768 wait_queue_head_t *wqh = &congestion_wqh[sync]; 769 wait_queue_head_t *wqh = &congestion_wqh[sync];
769 770
770 prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE); 771 prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE);
771 ret = io_schedule_timeout(timeout); 772 ret = io_schedule_timeout(timeout);
772 finish_wait(wqh, &wait); 773 finish_wait(wqh, &wait);
774
775 trace_writeback_congestion_wait(jiffies_to_usecs(timeout),
776 jiffies_to_usecs(jiffies - start));
777
773 return ret; 778 return ret;
774} 779}
775EXPORT_SYMBOL(congestion_wait); 780EXPORT_SYMBOL(congestion_wait);