From: Wu Fengguang <fengguang.wu@intel.com>
To: linux-mm <linux-mm@kvack.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Wu Fengguang <fengguang.wu@intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
Theodore Ts'o <tytso@mit.edu>, Dave Chinner <david@fromorbit.com>,
Jan Kara <jack@suse.cz>, Peter Zijlstra <a.p.zijlstra@chello.nl>,
Mel Gorman <mel@csn.ul.ie>, Rik van Riel <riel@redhat.com>,
KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
Chris Mason <chris.mason@oracle.com>,
Christoph Hellwig <hch@lst.de>, Li Shaohua <shaohua.li@intel.com>
Subject: [PATCH 17/17] writeback: consolidate balance_dirty_pages() variable names
Date: Sun, 12 Sep 2010 23:50:02 +0800 [thread overview]
Message-ID: <20100912155205.275730419@intel.com> (raw)
In-Reply-To: 20100912154945.758129106@intel.com
[-- Attachment #1: writeback-cleanup-name-merge.patch --]
[-- Type: text/plain, Size: 3936 bytes --]
Lots of lenthy tests.. Let's compact the names
*_dirty3 = dirty + writeback + unstable
balance_dirty_pages() only cares about the above dirty sum except
in one place -- on starting background writeback.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
---
mm/page-writeback.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
--- linux-next.orig/mm/page-writeback.c 2010-09-12 13:30:38.000000000 +0800
+++ linux-next/mm/page-writeback.c 2010-09-12 13:34:04.000000000 +0800
@@ -493,8 +493,8 @@ start_over:
static void balance_dirty_pages(struct address_space *mapping,
unsigned long pages_dirtied)
{
- long nr_reclaimable, bdi_nr_reclaimable;
- long nr_writeback, bdi_nr_writeback;
+ long nr_reclaimable;
+ long nr_dirty3, bdi_dirty3;
long bdi_prev_dirty3 = 0;
unsigned long background_thresh;
unsigned long dirty_thresh;
@@ -518,7 +518,7 @@ static void balance_dirty_pages(struct a
*/
nr_reclaimable = global_page_state(NR_FILE_DIRTY) +
global_page_state(NR_UNSTABLE_NFS);
- nr_writeback = global_page_state(NR_WRITEBACK);
+ nr_dirty3 = nr_reclaimable + global_page_state(NR_WRITEBACK);
global_dirty_limits(&background_thresh, &dirty_thresh);
@@ -529,7 +529,7 @@ static void balance_dirty_pages(struct a
*/
thresh = (background_thresh + dirty_thresh) / 2;
thresh = thresh * vm_dirty_pressure / VM_DIRTY_PRESSURE;
- if (nr_reclaimable + nr_writeback <= thresh)
+ if (nr_dirty3 <= thresh)
break;
task_dirties_fraction(current, &numerator, &denominator);
@@ -548,11 +548,11 @@ static void balance_dirty_pages(struct a
* deltas.
*/
if (bdi_thresh < 2*bdi_stat_error(bdi)) {
- bdi_nr_reclaimable = bdi_stat_sum(bdi, BDI_RECLAIMABLE);
- bdi_nr_writeback = bdi_stat_sum(bdi, BDI_WRITEBACK);
+ bdi_dirty3 = bdi_stat_sum(bdi, BDI_RECLAIMABLE) +
+ bdi_stat_sum(bdi, BDI_WRITEBACK);
} else {
- bdi_nr_reclaimable = bdi_stat(bdi, BDI_RECLAIMABLE);
- bdi_nr_writeback = bdi_stat(bdi, BDI_WRITEBACK);
+ bdi_dirty3 = bdi_stat(bdi, BDI_RECLAIMABLE) +
+ bdi_stat(bdi, BDI_WRITEBACK);
}
/*
@@ -563,11 +563,10 @@ static void balance_dirty_pages(struct a
* So offer a complementary way to break out of the loop when
* enough bdi pages have been cleaned during our pause time.
*/
- if (nr_reclaimable + nr_writeback <= dirty_thresh &&
- bdi_prev_dirty3 - (bdi_nr_reclaimable + bdi_nr_writeback) >
- (long)pages_dirtied * 8)
+ if (nr_dirty3 <= dirty_thresh &&
+ bdi_prev_dirty3 - bdi_dirty3 > (long)pages_dirtied * 8)
break;
- bdi_prev_dirty3 = bdi_nr_reclaimable + bdi_nr_writeback;
+ bdi_prev_dirty3 = bdi_dirty3;
thresh = bdi_thresh - bdi_thresh / DIRTY_SOFT_THROTTLE_RATIO;
@@ -584,13 +583,13 @@ static void balance_dirty_pages(struct a
else if (thresh > bw)
thresh = bw;
}
- if (bdi_nr_reclaimable + bdi_nr_writeback <= thresh)
+ if (bdi_dirty3 <= thresh)
goto check_exceeded;
bdi_update_write_bandwidth(bdi, &bw_time, &bw_written);
- gap = bdi_thresh > (bdi_nr_reclaimable + bdi_nr_writeback) ?
- bdi_thresh - (bdi_nr_reclaimable + bdi_nr_writeback) : 0;
+ gap = bdi_thresh > bdi_dirty3 ?
+ bdi_thresh - bdi_dirty3 : 0;
bw = bdi->write_bandwidth * gap / (bdi_thresh - thresh + 1);
@@ -622,9 +621,8 @@ check_exceeded:
* bdi or process from holding back light ones; The latter is
* the last resort safeguard.
*/
- dirty_exceeded =
- (bdi_nr_reclaimable + bdi_nr_writeback > bdi_thresh)
- || (nr_reclaimable + nr_writeback > dirty_thresh);
+ dirty_exceeded = (bdi_dirty3 > bdi_thresh) ||
+ (nr_dirty3 > dirty_thresh);
if (!dirty_exceeded)
break;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2010-09-12 15:55 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-12 15:49 [PATCH 00/17] [RFC] soft and dynamic dirty throttling limits Wu Fengguang
2010-09-12 15:49 ` [PATCH 01/17] writeback: remove the internal 5% low bound on dirty_ratio Wu Fengguang
2010-09-13 9:23 ` Johannes Weiner
2010-09-13 9:51 ` Mel Gorman
2010-09-13 9:57 ` Wu Fengguang
2010-09-13 10:10 ` Mel Gorman
2010-09-12 15:49 ` [PATCH 02/17] writeback: IO-less balance_dirty_pages() Wu Fengguang
2010-09-13 8:45 ` Dave Chinner
2010-09-13 11:38 ` Wu Fengguang
2010-09-12 15:49 ` [PATCH 03/17] writeback: per-task rate limit to balance_dirty_pages() Wu Fengguang
2010-09-12 15:49 ` [PATCH 04/17] writeback: quit throttling when bdi dirty/writeback pages go down Wu Fengguang
2010-09-12 15:49 ` [PATCH 05/17] writeback: quit throttling when signal pending Wu Fengguang
2010-09-12 20:46 ` Neil Brown
2010-09-13 1:55 ` Wu Fengguang
2010-09-13 3:21 ` Neil Brown
2010-09-13 3:48 ` Wu Fengguang
2010-09-14 8:23 ` KOSAKI Motohiro
2010-09-14 8:33 ` Wu Fengguang
2010-09-14 8:44 ` KOSAKI Motohiro
2010-09-14 9:17 ` Wu Fengguang
2010-09-14 9:25 ` KOSAKI Motohiro
2010-09-12 15:49 ` [PATCH 06/17] writeback: move task dirty fraction to balance_dirty_pages() Wu Fengguang
2010-09-12 15:49 ` [PATCH 07/17] writeback: add trace event for balance_dirty_pages() Wu Fengguang
2010-09-12 15:49 ` [PATCH 08/17] writeback: account per-bdi accumulated written pages Wu Fengguang
2010-09-12 15:59 ` Wu Fengguang
2010-09-14 8:32 ` KOSAKI Motohiro
2010-09-12 15:49 ` [PATCH 09/17] writeback: bdi write bandwidth estimation Wu Fengguang
2010-09-12 15:49 ` [PATCH 10/17] writeback: show bdi write bandwidth in debugfs Wu Fengguang
2010-09-12 15:49 ` [PATCH 11/17] writeback: make nr_to_write a per-file limit Wu Fengguang
2010-09-12 15:49 ` [PATCH 12/17] writeback: scale IO chunk size up to device bandwidth Wu Fengguang
2010-09-12 15:49 ` [PATCH 13/17] writeback: reduce per-bdi dirty threshold ramp up time Wu Fengguang
2010-09-12 16:15 ` Wu Fengguang
2010-09-12 15:49 ` [PATCH 14/17] vmscan: add scan_control.priority Wu Fengguang
2010-09-12 15:50 ` [PATCH 15/17] mm: lower soft dirty limits on memory pressure Wu Fengguang
2010-09-13 9:40 ` Wu Fengguang
2010-09-12 15:50 ` [PATCH 16/17] mm: create /vm/dirty_pressure in debugfs Wu Fengguang
2010-09-12 15:50 ` Wu Fengguang [this message]
2010-10-12 14:17 ` [PATCH 00/17] [RFC] soft and dynamic dirty throttling limits Christoph Hellwig
2010-10-13 3:07 ` Dave Chinner
2010-10-13 3:23 ` Wu Fengguang
2010-10-13 8:26 ` Wu Fengguang
2010-10-13 9:26 ` Dave Chinner
2010-11-01 6:24 ` Dave Chinner
2010-11-04 3:41 ` Wu Fengguang
2010-11-04 12:48 ` Dave Chinner
2010-11-04 13:12 ` Christoph Hellwig
2010-11-05 14:56 ` Wu Fengguang
2010-11-06 10:42 ` Dave Chinner
2010-10-14 13:12 ` 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=20100912155205.275730419@intel.com \
--to=fengguang.wu@intel.com \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=chris.mason@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=jack@suse.cz \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mel@csn.ul.ie \
--cc=riel@redhat.com \
--cc=shaohua.li@intel.com \
--cc=tytso@mit.edu \
/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).