From: Jan Kara <jack@suse.cz>
To: Wu Fengguang <fengguang.wu@intel.com>
Cc: linux-fsdevel@vger.kernel.org, Jan Kara <jack@suse.cz>,
Dave Chinner <david@fromorbit.com>,
Christoph Hellwig <hch@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 5/9] writeback: consolidate variable names in balance_dirty_pages()
Date: Thu, 30 Jun 2011 19:26:45 +0200 [thread overview]
Message-ID: <20110630172645.GI28475@quack.suse.cz> (raw)
In-Reply-To: <20110629145554.168078193@intel.com>
On Wed 29-06-11 22:52:50, Wu Fengguang wrote:
> Introduce
>
> nr_dirty = NR_FILE_DIRTY + NR_WRITEBACK + NR_UNSTABLE_NFS
>
> in order to simplify many tests in the following patches.
>
> balance_dirty_pages() will eventually care only about the dirty sums
> besides nr_writeback.
Looks OK.
Acked-by: Jan Kara <jack@suse.cz>
Honza
>
> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
> ---
> mm/page-writeback.c | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
>
> --- linux-next.orig/mm/page-writeback.c 2011-06-20 00:16:58.000000000 +0800
> +++ linux-next/mm/page-writeback.c 2011-06-20 00:17:06.000000000 +0800
> @@ -560,8 +560,9 @@ static void bdi_update_bandwidth(struct
> static void balance_dirty_pages(struct address_space *mapping,
> unsigned long write_chunk)
> {
> - long nr_reclaimable, bdi_nr_reclaimable;
> - long nr_writeback, bdi_nr_writeback;
> + unsigned long nr_reclaimable, bdi_nr_reclaimable;
> + unsigned long nr_dirty; /* = file_dirty + writeback + unstable_nfs */
> + unsigned long bdi_dirty;
> unsigned long background_thresh;
> unsigned long dirty_thresh;
> unsigned long bdi_thresh;
> @@ -574,7 +575,7 @@ static void balance_dirty_pages(struct a
> for (;;) {
> nr_reclaimable = global_page_state(NR_FILE_DIRTY) +
> global_page_state(NR_UNSTABLE_NFS);
> - nr_writeback = global_page_state(NR_WRITEBACK);
> + nr_dirty = nr_reclaimable + global_page_state(NR_WRITEBACK);
>
> global_dirty_limits(&background_thresh, &dirty_thresh);
>
> @@ -583,8 +584,7 @@ static void balance_dirty_pages(struct a
> * catch-up. This avoids (excessively) small writeouts
> * when the bdi limits are ramping up.
> */
> - if (nr_reclaimable + nr_writeback <=
> - (background_thresh + dirty_thresh) / 2)
> + if (nr_dirty <= (background_thresh + dirty_thresh) / 2)
> break;
>
> bdi_thresh = bdi_dirty_limit(bdi, dirty_thresh);
> @@ -602,10 +602,12 @@ static void balance_dirty_pages(struct a
> */
> 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_dirty = bdi_nr_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_dirty = bdi_nr_reclaimable +
> + bdi_stat(bdi, BDI_WRITEBACK);
> }
>
> /*
> @@ -614,9 +616,8 @@ static void balance_dirty_pages(struct a
> * 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_dirty > bdi_thresh) ||
> + (nr_dirty > dirty_thresh);
>
> if (!dirty_exceeded)
> break;
>
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
next prev parent reply other threads:[~2011-06-30 17:26 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-29 14:52 [PATCH 0/9] write bandwidth estimation and writeback fixes v2 Wu Fengguang
2011-06-29 14:52 ` [PATCH 1/9] writeback: make writeback_control.nr_to_write straight Wu Fengguang
2011-06-30 16:24 ` Jan Kara
2011-07-01 12:03 ` Wu Fengguang
2011-06-29 14:52 ` [PATCH 2/9] writeback: account per-bdi accumulated written pages Wu Fengguang
2011-06-29 14:52 ` [PATCH 3/9] writeback: bdi write bandwidth estimation Wu Fengguang
2011-06-30 19:56 ` Jan Kara
2011-07-01 14:58 ` Wu Fengguang
2011-07-04 3:05 ` Wu Fengguang
2011-07-13 23:30 ` Jan Kara
2011-07-23 7:26 ` Wu Fengguang
2011-07-01 15:20 ` Andrea Righi
2011-07-08 11:53 ` Wu Fengguang
2011-07-01 18:32 ` Vivek Goyal
2011-07-23 8:02 ` Wu Fengguang
2011-07-01 19:19 ` Vivek Goyal
2011-07-01 19:29 ` Vivek Goyal
2011-07-23 8:07 ` Wu Fengguang
2011-06-29 14:52 ` [PATCH 4/9] writeback: show bdi write bandwidth in debugfs Wu Fengguang
2011-06-29 14:52 ` [PATCH 5/9] writeback: consolidate variable names in balance_dirty_pages() Wu Fengguang
2011-06-30 17:26 ` Jan Kara [this message]
2011-06-29 14:52 ` [PATCH 6/9] writeback: introduce smoothed global dirty limit Wu Fengguang
2011-07-01 15:20 ` Andrea Righi
2011-07-08 11:51 ` Wu Fengguang
2011-06-29 14:52 ` [PATCH 7/9] writeback: introduce max-pause and pass-good dirty limits Wu Fengguang
2011-06-29 14:52 ` [PATCH 8/9] writeback: scale IO chunk size up to half device bandwidth Wu Fengguang
2011-06-29 14:52 ` [PATCH 9/9] writeback: trace global_dirty_state Wu Fengguang
2011-07-01 15:18 ` Christoph Hellwig
2011-07-01 15:45 ` 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=20110630172645.GI28475@quack.suse.cz \
--to=jack@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=david@fromorbit.com \
--cc=fengguang.wu@intel.com \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).