From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
akpm@linux-foundation.org, neilb@suse.de, dgc@sgi.com,
tomoki.sekiyama.qu@hitachi.com, nikita@clusterfs.com,
trond.myklebust@fys.uio.no, yingchao.zhou@gmail.com
Subject: Re: [PATCH 09/12] mm: count unstable pages per BDI
Date: Thu, 19 Apr 2007 20:46:46 +0200 [thread overview]
Message-ID: <1177008406.2934.19.camel@lappy> (raw)
In-Reply-To: <1177006362.2934.13.camel@lappy>
On Thu, 2007-04-19 at 20:12 +0200, Peter Zijlstra wrote:
> On Thu, 2007-04-19 at 19:44 +0200, Miklos Szeredi wrote:
> > > Count per BDI unstable pages.
> > >
> >
> > I'm wondering, is it really worth having this category separate from
> > per BDI brity pages?
> >
> > With the exception of the export to sysfs, always the sum of unstable
> > + dirty is used.
>
> I guess you are right, but it offends my sense of aesthetics to break
> symmetry with the zone statistics. However, it has the added advantage
> of only needing 2 deltas as well.
I guess, this should do.
---
fs/buffer.c | 2 +-
fs/nfs/write.c | 11 +++++++----
include/linux/backing-dev.h | 3 +--
mm/page-writeback.c | 16 +++++++---------
mm/truncate.c | 2 +-
5 files changed, 17 insertions(+), 17 deletions(-)
Index: linux-2.6/fs/buffer.c
===================================================================
--- linux-2.6.orig/fs/buffer.c 2007-04-19 19:59:26.000000000 +0200
+++ linux-2.6/fs/buffer.c 2007-04-19 20:35:39.000000000 +0200
@@ -733,7 +733,7 @@ int __set_page_dirty_buffers(struct page
if (page->mapping) { /* Race with truncate? */
if (mapping_cap_account_dirty(mapping)) {
__inc_zone_page_state(page, NR_FILE_DIRTY);
- __inc_bdi_stat(mapping->backing_dev_info, BDI_DIRTY);
+ __inc_bdi_stat(mapping->backing_dev_info, BDI_RECLAIM);
task_io_account_write(PAGE_CACHE_SIZE);
}
radix_tree_tag_set(&mapping->page_tree,
Index: linux-2.6/fs/nfs/write.c
===================================================================
--- linux-2.6.orig/fs/nfs/write.c 2007-04-19 19:59:26.000000000 +0200
+++ linux-2.6/fs/nfs/write.c 2007-04-19 20:39:03.000000000 +0200
@@ -456,7 +456,7 @@ nfs_mark_request_commit(struct nfs_page
nfsi->ncommit++;
spin_unlock(&nfsi->req_lock);
inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
- inc_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_UNSTABLE);
+ inc_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_RECLAIM);
__mark_inode_dirty(inode, I_DIRTY_DATASYNC);
}
#endif
@@ -518,7 +518,8 @@ static void nfs_cancel_commit_list(struc
while(!list_empty(head)) {
req = nfs_list_entry(head->next);
dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
- dec_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_UNSTABLE);
+ dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
+ BDI_RECLAIM);
nfs_list_remove_request(req);
nfs_inode_remove_request(req);
nfs_unlock_request(req);
@@ -1247,7 +1248,8 @@ nfs_commit_list(struct inode *inode, str
nfs_list_remove_request(req);
nfs_mark_request_commit(req);
dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
- dec_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_UNSTABLE);
+ dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
+ BDI_RECLAIM);
nfs_clear_page_writeback(req);
}
return -ENOMEM;
@@ -1272,7 +1274,8 @@ static void nfs_commit_done(struct rpc_t
req = nfs_list_entry(data->pages.next);
nfs_list_remove_request(req);
dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
- dec_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_UNSTABLE);
+ dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
+ BDI_RECLAIM);
dprintk("NFS: commit (%s/%Ld %d@%Ld)",
req->wb_context->dentry->d_inode->i_sb->s_id,
Index: linux-2.6/include/linux/backing-dev.h
===================================================================
--- linux-2.6.orig/include/linux/backing-dev.h 2007-04-19 19:59:26.000000000 +0200
+++ linux-2.6/include/linux/backing-dev.h 2007-04-19 20:39:24.000000000 +0200
@@ -26,9 +26,8 @@ enum bdi_state {
typedef int (congested_fn)(void *, int);
enum bdi_stat_item {
- BDI_DIRTY,
+ BDI_RECLAIM,
BDI_WRITEBACK,
- BDI_UNSTABLE,
BDI_WRITEOUT,
NR_BDI_STAT_ITEMS
};
Index: linux-2.6/mm/page-writeback.c
===================================================================
--- linux-2.6.orig/mm/page-writeback.c 2007-04-19 20:00:09.000000000 +0200
+++ linux-2.6/mm/page-writeback.c 2007-04-19 20:40:29.000000000 +0200
@@ -300,8 +300,7 @@ static void balance_dirty_pages(struct a
get_dirty_limits(&background_thresh, &dirty_thresh,
&bdi_thresh, bdi);
- bdi_nr_reclaimable = bdi_stat(bdi, BDI_DIRTY) +
- bdi_stat(bdi, BDI_UNSTABLE);
+ bdi_nr_reclaimable = bdi_stat(bdi, BDI_RECLAIM);
bdi_nr_writeback = bdi_stat(bdi, BDI_WRITEBACK);
if (bdi_nr_reclaimable + bdi_nr_writeback <= bdi_thresh)
break;
@@ -321,16 +320,14 @@ static void balance_dirty_pages(struct a
get_dirty_limits(&background_thresh, &dirty_thresh,
&bdi_thresh, bdi);
- if (bdi_thresh < 3*bdi_stat_delta()) {
+ if (bdi_thresh < 2*bdi_stat_delta()) {
bdi_nr_reclaimable =
- bdi_stat_sum(bdi, BDI_DIRTY) +
- bdi_stat_sum(bdi, BDI_UNSTABLE);
+ bdi_stat_sum(bdi, BDI_RECLAIM);
bdi_nr_writeback =
bdi_stat_sum(bdi, BDI_WRITEBACK);
} else {
bdi_nr_reclaimable =
- bdi_stat(bdi, BDI_DIRTY) +
- bdi_stat(bdi, BDI_UNSTABLE);
+ bdi_stat(bdi, BDI_RECLAIM);
bdi_nr_writeback =
bdi_stat(bdi, BDI_WRITEBACK);
}
@@ -907,7 +904,8 @@ int __set_page_dirty_nobuffers(struct pa
BUG_ON(mapping2 != mapping);
if (mapping_cap_account_dirty(mapping)) {
__inc_zone_page_state(page, NR_FILE_DIRTY);
- __inc_bdi_stat(mapping->backing_dev_info, BDI_DIRTY);
+ __inc_bdi_stat(mapping->backing_dev_info,
+ BDI_RECLAIM);
task_io_account_write(PAGE_CACHE_SIZE);
}
radix_tree_tag_set(&mapping->page_tree,
@@ -1034,7 +1032,7 @@ int clear_page_dirty_for_io(struct page
set_page_dirty(page);
if (TestClearPageDirty(page)) {
dec_zone_page_state(page, NR_FILE_DIRTY);
- dec_bdi_stat(mapping->backing_dev_info, BDI_DIRTY);
+ dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIM);
return 1;
}
return 0;
Index: linux-2.6/mm/truncate.c
===================================================================
--- linux-2.6.orig/mm/truncate.c 2007-04-19 19:59:26.000000000 +0200
+++ linux-2.6/mm/truncate.c 2007-04-19 20:40:36.000000000 +0200
@@ -71,7 +71,7 @@ void cancel_dirty_page(struct page *page
struct address_space *mapping = page->mapping;
if (mapping && mapping_cap_account_dirty(mapping)) {
dec_zone_page_state(page, NR_FILE_DIRTY);
- dec_bdi_stat(mapping->backing_dev_info, BDI_DIRTY);
+ dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIM);
if (account_size)
task_io_account_cancelled_write(account_size);
}
WARNING: multiple messages have this Message-ID (diff)
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
akpm@linux-foundation.org, neilb@suse.de, dgc@sgi.com,
tomoki.sekiyama.qu@hitachi.com, nikita@clusterfs.com,
trond.myklebust@fys.uio.no, yingchao.zhou@gmail.com
Subject: Re: [PATCH 09/12] mm: count unstable pages per BDI
Date: Thu, 19 Apr 2007 20:46:46 +0200 [thread overview]
Message-ID: <1177008406.2934.19.camel@lappy> (raw)
In-Reply-To: <1177006362.2934.13.camel@lappy>
On Thu, 2007-04-19 at 20:12 +0200, Peter Zijlstra wrote:
> On Thu, 2007-04-19 at 19:44 +0200, Miklos Szeredi wrote:
> > > Count per BDI unstable pages.
> > >
> >
> > I'm wondering, is it really worth having this category separate from
> > per BDI brity pages?
> >
> > With the exception of the export to sysfs, always the sum of unstable
> > + dirty is used.
>
> I guess you are right, but it offends my sense of aesthetics to break
> symmetry with the zone statistics. However, it has the added advantage
> of only needing 2 deltas as well.
I guess, this should do.
---
fs/buffer.c | 2 +-
fs/nfs/write.c | 11 +++++++----
include/linux/backing-dev.h | 3 +--
mm/page-writeback.c | 16 +++++++---------
mm/truncate.c | 2 +-
5 files changed, 17 insertions(+), 17 deletions(-)
Index: linux-2.6/fs/buffer.c
===================================================================
--- linux-2.6.orig/fs/buffer.c 2007-04-19 19:59:26.000000000 +0200
+++ linux-2.6/fs/buffer.c 2007-04-19 20:35:39.000000000 +0200
@@ -733,7 +733,7 @@ int __set_page_dirty_buffers(struct page
if (page->mapping) { /* Race with truncate? */
if (mapping_cap_account_dirty(mapping)) {
__inc_zone_page_state(page, NR_FILE_DIRTY);
- __inc_bdi_stat(mapping->backing_dev_info, BDI_DIRTY);
+ __inc_bdi_stat(mapping->backing_dev_info, BDI_RECLAIM);
task_io_account_write(PAGE_CACHE_SIZE);
}
radix_tree_tag_set(&mapping->page_tree,
Index: linux-2.6/fs/nfs/write.c
===================================================================
--- linux-2.6.orig/fs/nfs/write.c 2007-04-19 19:59:26.000000000 +0200
+++ linux-2.6/fs/nfs/write.c 2007-04-19 20:39:03.000000000 +0200
@@ -456,7 +456,7 @@ nfs_mark_request_commit(struct nfs_page
nfsi->ncommit++;
spin_unlock(&nfsi->req_lock);
inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
- inc_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_UNSTABLE);
+ inc_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_RECLAIM);
__mark_inode_dirty(inode, I_DIRTY_DATASYNC);
}
#endif
@@ -518,7 +518,8 @@ static void nfs_cancel_commit_list(struc
while(!list_empty(head)) {
req = nfs_list_entry(head->next);
dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
- dec_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_UNSTABLE);
+ dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
+ BDI_RECLAIM);
nfs_list_remove_request(req);
nfs_inode_remove_request(req);
nfs_unlock_request(req);
@@ -1247,7 +1248,8 @@ nfs_commit_list(struct inode *inode, str
nfs_list_remove_request(req);
nfs_mark_request_commit(req);
dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
- dec_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_UNSTABLE);
+ dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
+ BDI_RECLAIM);
nfs_clear_page_writeback(req);
}
return -ENOMEM;
@@ -1272,7 +1274,8 @@ static void nfs_commit_done(struct rpc_t
req = nfs_list_entry(data->pages.next);
nfs_list_remove_request(req);
dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
- dec_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_UNSTABLE);
+ dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
+ BDI_RECLAIM);
dprintk("NFS: commit (%s/%Ld %d@%Ld)",
req->wb_context->dentry->d_inode->i_sb->s_id,
Index: linux-2.6/include/linux/backing-dev.h
===================================================================
--- linux-2.6.orig/include/linux/backing-dev.h 2007-04-19 19:59:26.000000000 +0200
+++ linux-2.6/include/linux/backing-dev.h 2007-04-19 20:39:24.000000000 +0200
@@ -26,9 +26,8 @@ enum bdi_state {
typedef int (congested_fn)(void *, int);
enum bdi_stat_item {
- BDI_DIRTY,
+ BDI_RECLAIM,
BDI_WRITEBACK,
- BDI_UNSTABLE,
BDI_WRITEOUT,
NR_BDI_STAT_ITEMS
};
Index: linux-2.6/mm/page-writeback.c
===================================================================
--- linux-2.6.orig/mm/page-writeback.c 2007-04-19 20:00:09.000000000 +0200
+++ linux-2.6/mm/page-writeback.c 2007-04-19 20:40:29.000000000 +0200
@@ -300,8 +300,7 @@ static void balance_dirty_pages(struct a
get_dirty_limits(&background_thresh, &dirty_thresh,
&bdi_thresh, bdi);
- bdi_nr_reclaimable = bdi_stat(bdi, BDI_DIRTY) +
- bdi_stat(bdi, BDI_UNSTABLE);
+ bdi_nr_reclaimable = bdi_stat(bdi, BDI_RECLAIM);
bdi_nr_writeback = bdi_stat(bdi, BDI_WRITEBACK);
if (bdi_nr_reclaimable + bdi_nr_writeback <= bdi_thresh)
break;
@@ -321,16 +320,14 @@ static void balance_dirty_pages(struct a
get_dirty_limits(&background_thresh, &dirty_thresh,
&bdi_thresh, bdi);
- if (bdi_thresh < 3*bdi_stat_delta()) {
+ if (bdi_thresh < 2*bdi_stat_delta()) {
bdi_nr_reclaimable =
- bdi_stat_sum(bdi, BDI_DIRTY) +
- bdi_stat_sum(bdi, BDI_UNSTABLE);
+ bdi_stat_sum(bdi, BDI_RECLAIM);
bdi_nr_writeback =
bdi_stat_sum(bdi, BDI_WRITEBACK);
} else {
bdi_nr_reclaimable =
- bdi_stat(bdi, BDI_DIRTY) +
- bdi_stat(bdi, BDI_UNSTABLE);
+ bdi_stat(bdi, BDI_RECLAIM);
bdi_nr_writeback =
bdi_stat(bdi, BDI_WRITEBACK);
}
@@ -907,7 +904,8 @@ int __set_page_dirty_nobuffers(struct pa
BUG_ON(mapping2 != mapping);
if (mapping_cap_account_dirty(mapping)) {
__inc_zone_page_state(page, NR_FILE_DIRTY);
- __inc_bdi_stat(mapping->backing_dev_info, BDI_DIRTY);
+ __inc_bdi_stat(mapping->backing_dev_info,
+ BDI_RECLAIM);
task_io_account_write(PAGE_CACHE_SIZE);
}
radix_tree_tag_set(&mapping->page_tree,
@@ -1034,7 +1032,7 @@ int clear_page_dirty_for_io(struct page
set_page_dirty(page);
if (TestClearPageDirty(page)) {
dec_zone_page_state(page, NR_FILE_DIRTY);
- dec_bdi_stat(mapping->backing_dev_info, BDI_DIRTY);
+ dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIM);
return 1;
}
return 0;
Index: linux-2.6/mm/truncate.c
===================================================================
--- linux-2.6.orig/mm/truncate.c 2007-04-19 19:59:26.000000000 +0200
+++ linux-2.6/mm/truncate.c 2007-04-19 20:40:36.000000000 +0200
@@ -71,7 +71,7 @@ void cancel_dirty_page(struct page *page
struct address_space *mapping = page->mapping;
if (mapping && mapping_cap_account_dirty(mapping)) {
dec_zone_page_state(page, NR_FILE_DIRTY);
- dec_bdi_stat(mapping->backing_dev_info, BDI_DIRTY);
+ dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIM);
if (account_size)
task_io_account_cancelled_write(account_size);
}
--
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:[~2007-04-19 18:48 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-17 7:10 [PATCH 00/12] per device dirty throttling -v4 Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 01/12] revert per-backing_dev-dirty-and-writeback-page-accounting Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 02/12] nfs: remove congestion_end() Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 03/12] lib: dampen the percpu_counter FBC_BATCH Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 04/12] lib: percpu_counter_mod64 Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 05/12] mm: bdi init hooks Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 06/12] mm: scalable bdi statistics counters Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 07/12] mm: count dirty pages per BDI Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 08/12] mm: count writeback " Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 09/12] mm: count unstable " Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-19 17:44 ` Miklos Szeredi
2007-04-19 17:44 ` Miklos Szeredi
2007-04-19 18:12 ` Peter Zijlstra
2007-04-19 18:12 ` Peter Zijlstra
2007-04-19 18:46 ` Peter Zijlstra [this message]
2007-04-19 18:46 ` Peter Zijlstra
2007-04-19 19:00 ` Peter Zijlstra
2007-04-19 19:00 ` Peter Zijlstra
2007-04-19 19:20 ` Miklos Szeredi
2007-04-19 19:20 ` Miklos Szeredi
2007-04-19 19:23 ` Peter Zijlstra
2007-04-19 19:23 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 10/12] mm: expose BDI statistics in sysfs Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 11/12] mm: per device dirty threshold Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
2007-04-19 17:49 ` Miklos Szeredi
2007-04-19 17:49 ` Miklos Szeredi
2007-04-19 18:04 ` Peter Zijlstra
2007-04-19 18:04 ` Peter Zijlstra
2007-04-17 7:10 ` [PATCH 12/12] debug: expose BDI statistics in sysfs Peter Zijlstra
2007-04-17 7:10 ` Peter Zijlstra
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=1177008406.2934.19.camel@lappy \
--to=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=dgc@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=miklos@szeredi.hu \
--cc=neilb@suse.de \
--cc=nikita@clusterfs.com \
--cc=tomoki.sekiyama.qu@hitachi.com \
--cc=trond.myklebust@fys.uio.no \
--cc=yingchao.zhou@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.