From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc: miklos@szeredi.hu, akpm@linux-foundation.org, neilb@suse.de,
dgc@sgi.com, tomoki.sekiyama.qu@hitachi.com,
a.p.zijlstra@chello.nl, nikita@clusterfs.com,
trond.myklebust@fys.uio.no, yingchao.zhou@gmail.com,
andrea@suse.de
Subject: [PATCH 11/17] mm: count reclaimable pages per BDI
Date: Thu, 14 Jun 2007 23:58:28 +0200 [thread overview]
Message-ID: <20070614220447.042297958@chello.nl> (raw)
In-Reply-To: 20070614215817.389524447@chello.nl
[-- Attachment #1: bdi_stat_reclaimable.patch --]
[-- Type: text/plain, Size: 4077 bytes --]
Count per BDI reclaimable pages; nr_reclaimable = nr_dirty + nr_unstable.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
fs/buffer.c | 2 ++
fs/nfs/write.c | 7 +++++++
include/linux/backing-dev.h | 1 +
mm/page-writeback.c | 4 ++++
mm/truncate.c | 2 ++
5 files changed, 16 insertions(+)
Index: linux-2.6/fs/buffer.c
===================================================================
--- linux-2.6.orig/fs/buffer.c
+++ linux-2.6/fs/buffer.c
@@ -705,6 +705,8 @@ static int __set_page_dirty(struct page
if (mapping_cap_account_dirty(mapping)) {
__inc_zone_page_state(page, NR_FILE_DIRTY);
+ __inc_bdi_stat(mapping->backing_dev_info,
+ BDI_RECLAIMABLE);
task_io_account_write(PAGE_CACHE_SIZE);
}
radix_tree_tag_set(&mapping->page_tree,
Index: linux-2.6/mm/page-writeback.c
===================================================================
--- linux-2.6.orig/mm/page-writeback.c
+++ linux-2.6/mm/page-writeback.c
@@ -829,6 +829,8 @@ int __set_page_dirty_nobuffers(struct pa
WARN_ON_ONCE(!PagePrivate(page) && !PageUptodate(page));
if (mapping_cap_account_dirty(mapping)) {
__inc_zone_page_state(page, NR_FILE_DIRTY);
+ __inc_bdi_stat(mapping->backing_dev_info,
+ BDI_RECLAIMABLE);
task_io_account_write(PAGE_CACHE_SIZE);
}
radix_tree_tag_set(&mapping->page_tree,
@@ -963,6 +965,8 @@ int clear_page_dirty_for_io(struct page
*/
if (TestClearPageDirty(page)) {
dec_zone_page_state(page, NR_FILE_DIRTY);
+ dec_bdi_stat(mapping->backing_dev_info,
+ BDI_RECLAIMABLE);
return 1;
}
return 0;
Index: linux-2.6/mm/truncate.c
===================================================================
--- linux-2.6.orig/mm/truncate.c
+++ linux-2.6/mm/truncate.c
@@ -72,6 +72,8 @@ 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_RECLAIMABLE);
if (account_size)
task_io_account_cancelled_write(account_size);
}
Index: linux-2.6/fs/nfs/write.c
===================================================================
--- linux-2.6.orig/fs/nfs/write.c
+++ linux-2.6/fs/nfs/write.c
@@ -463,6 +463,7 @@ nfs_mark_request_commit(struct nfs_page
set_bit(PG_NEED_COMMIT, &(req)->wb_flags);
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_RECLAIMABLE);
__mark_inode_dirty(inode, I_DIRTY_DATASYNC);
}
@@ -549,6 +550,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_RECLAIMABLE);
nfs_list_remove_request(req);
clear_bit(PG_NEED_COMMIT, &(req)->wb_flags);
nfs_inode_remove_request(req);
@@ -1211,6 +1214,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_RECLAIMABLE);
nfs_clear_page_writeback(req);
}
return -ENOMEM;
@@ -1236,6 +1241,8 @@ static void nfs_commit_done(struct rpc_t
nfs_list_remove_request(req);
clear_bit(PG_NEED_COMMIT, &(req)->wb_flags);
dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
+ dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
+ BDI_RECLAIMABLE);
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
+++ linux-2.6/include/linux/backing-dev.h
@@ -27,6 +27,7 @@ enum bdi_state {
typedef int (congested_fn)(void *, int);
enum bdi_stat_item {
+ BDI_RECLAIMABLE,
NR_BDI_STAT_ITEMS
};
--
next prev parent reply other threads:[~2007-06-14 22:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-14 21:58 [PATCH 00/17] per device dirty throttling -v7 Peter Zijlstra
2007-06-14 21:58 ` [PATCH 01/17] nfs: remove congestion_end() Peter Zijlstra
2007-06-14 21:58 ` [PATCH 02/17] lib: percpu_counter variable batch Peter Zijlstra
2007-06-14 21:58 ` [PATCH 03/17] lib: percpu_counter_mod64 Peter Zijlstra
2007-06-14 21:58 ` [PATCH 04/17] lib: percpu_counter_set Peter Zijlstra
2007-06-14 21:58 ` [PATCH 05/17] lib: percpu_count_sum_signed() Peter Zijlstra
2007-07-17 16:32 ` Josef Sipek
2007-07-17 16:35 ` Josef Sipek
2007-06-14 21:58 ` [PATCH 06/17] lib: percpu_counter_init_irq Peter Zijlstra
2007-07-17 16:35 ` Josef Sipek
2007-06-14 21:58 ` [PATCH 07/17] mm: bdi init hooks Peter Zijlstra
2007-06-14 21:58 ` [PATCH 08/17] containers: " Peter Zijlstra
2007-06-14 21:58 ` [PATCH 09/17] mtd: give mtdconcat devices their own backing_dev_info Peter Zijlstra
2007-06-14 21:58 ` [PATCH 10/17] mm: scalable bdi statistics counters Peter Zijlstra
2007-06-14 21:58 ` Peter Zijlstra [this message]
2007-06-14 21:58 ` [PATCH 12/17] mm: count writeback pages per BDI Peter Zijlstra
2007-06-14 21:58 ` [PATCH 13/17] mm: expose BDI statistics in sysfs Peter Zijlstra
2007-06-14 21:58 ` [PATCH 14/17] lib: floating proportions Peter Zijlstra
2007-06-14 21:58 ` [PATCH 15/17] lib: floating proportions _single Peter Zijlstra
2007-06-14 21:58 ` [PATCH 16/17] mm: per device dirty threshold Peter Zijlstra
2007-06-14 21:58 ` [PATCH 17/17] mm: dirty balancing for tasks Peter Zijlstra
2007-06-14 23:14 ` [PATCH 00/17] per device dirty throttling -v7 Andrew Morton
2007-07-17 10:10 ` Miklos Szeredi
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=20070614220447.042297958@chello.nl \
--to=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=andrea@suse.de \
--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 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).