From: Sha Zhengju <handai.szj@gmail.com> To: linux-mm@kvack.org, cgroups@vger.kernel.org Cc: kamezawa.hiroyu@jp.fujitsu.com, gthelen@google.com, yinghan@google.com, akpm@linux-foundation.org, mhocko@suse.cz, linux-kernel@vger.kernel.org, Sha Zhengju <handai.szj@taobao.com> Subject: [PATCH 6/7] memcg: add per cgroup writeback pages accounting Date: Thu, 28 Jun 2012 19:05:25 +0800 [thread overview] Message-ID: <1340881525-5835-1-git-send-email-handai.szj@taobao.com> (raw) In-Reply-To: <1340880885-5427-1-git-send-email-handai.szj@taobao.com> From: Sha Zhengju <handai.szj@taobao.com> Similar to dirty page, we add per cgroup writeback pages accounting. The lock rule still is: mem_cgroup_begin_update_page_stat() modify page WRITEBACK stat mem_cgroup_update_page_stat() mem_cgroup_end_update_page_stat() There're two writeback interface to modify: test_clear/set_page_writeback. Signed-off-by: Sha Zhengju <handai.szj@taobao.com> --- include/linux/memcontrol.h | 1 + mm/memcontrol.c | 5 +++++ mm/page-writeback.c | 12 ++++++++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ad37b59..9193d93 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -39,6 +39,7 @@ enum mem_cgroup_stat_index { MEM_CGROUP_STAT_FILE_MAPPED, /* # of pages charged as file rss */ MEM_CGROUP_STAT_SWAP, /* # of pages, swapped out */ MEM_CGROUP_STAT_FILE_DIRTY, /* # of dirty pages in page cache */ + MEM_CGROUP_STAT_FILE_WRITEBACK, /* # of pages under writeback */ MEM_CGROUP_STAT_NSTATS, }; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 90e2946..8493119 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -83,6 +83,7 @@ static const char * const mem_cgroup_stat_names[] = { "mapped_file", "swap", "dirty", + "writeback", }; enum mem_cgroup_events_index { @@ -2604,6 +2605,10 @@ static int mem_cgroup_move_account(struct page *page, mem_cgroup_move_account_page_stat(from, to, MEM_CGROUP_STAT_FILE_DIRTY); + if (PageWriteback(page)) + mem_cgroup_move_account_page_stat(from, to, + MEM_CGROUP_STAT_FILE_WRITEBACK); + mem_cgroup_charge_statistics(from, anon, -nr_pages); /* caller should have done css_get */ diff --git a/mm/page-writeback.c b/mm/page-writeback.c index e79a2f7..7398836 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -1981,6 +1981,7 @@ EXPORT_SYMBOL(account_page_dirtied); */ void account_page_writeback(struct page *page) { + mem_cgroup_inc_page_stat(page, MEM_CGROUP_STAT_FILE_WRITEBACK); inc_zone_page_state(page, NR_WRITEBACK); } EXPORT_SYMBOL(account_page_writeback); @@ -2214,7 +2215,10 @@ int test_clear_page_writeback(struct page *page) { struct address_space *mapping = page_mapping(page); int ret; + bool locked; + unsigned long flags; + mem_cgroup_begin_update_page_stat(page, &locked, &flags); if (mapping) { struct backing_dev_info *bdi = mapping->backing_dev_info; unsigned long flags; @@ -2235,9 +2239,12 @@ int test_clear_page_writeback(struct page *page) ret = TestClearPageWriteback(page); } if (ret) { + mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_FILE_WRITEBACK); dec_zone_page_state(page, NR_WRITEBACK); inc_zone_page_state(page, NR_WRITTEN); } + + mem_cgroup_end_update_page_stat(page, &locked, &flags); return ret; } @@ -2245,7 +2252,10 @@ int test_set_page_writeback(struct page *page) { struct address_space *mapping = page_mapping(page); int ret; + bool locked; + unsigned long flags; + mem_cgroup_begin_update_page_stat(page, &locked, &flags); if (mapping) { struct backing_dev_info *bdi = mapping->backing_dev_info; unsigned long flags; @@ -2272,6 +2282,8 @@ int test_set_page_writeback(struct page *page) } if (!ret) account_page_writeback(page); + + mem_cgroup_end_update_page_stat(page, &locked, &flags); return ret; } -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Sha Zhengju <handai.szj@gmail.com> To: linux-mm@kvack.org, cgroups@vger.kernel.org Cc: kamezawa.hiroyu@jp.fujitsu.com, gthelen@google.com, yinghan@google.com, akpm@linux-foundation.org, mhocko@suse.cz, linux-kernel@vger.kernel.org, Sha Zhengju <handai.szj@taobao.com> Subject: [PATCH 6/7] memcg: add per cgroup writeback pages accounting Date: Thu, 28 Jun 2012 19:05:25 +0800 [thread overview] Message-ID: <1340881525-5835-1-git-send-email-handai.szj@taobao.com> (raw) In-Reply-To: <1340880885-5427-1-git-send-email-handai.szj@taobao.com> From: Sha Zhengju <handai.szj@taobao.com> Similar to dirty page, we add per cgroup writeback pages accounting. The lock rule still is: mem_cgroup_begin_update_page_stat() modify page WRITEBACK stat mem_cgroup_update_page_stat() mem_cgroup_end_update_page_stat() There're two writeback interface to modify: test_clear/set_page_writeback. Signed-off-by: Sha Zhengju <handai.szj@taobao.com> --- include/linux/memcontrol.h | 1 + mm/memcontrol.c | 5 +++++ mm/page-writeback.c | 12 ++++++++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ad37b59..9193d93 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -39,6 +39,7 @@ enum mem_cgroup_stat_index { MEM_CGROUP_STAT_FILE_MAPPED, /* # of pages charged as file rss */ MEM_CGROUP_STAT_SWAP, /* # of pages, swapped out */ MEM_CGROUP_STAT_FILE_DIRTY, /* # of dirty pages in page cache */ + MEM_CGROUP_STAT_FILE_WRITEBACK, /* # of pages under writeback */ MEM_CGROUP_STAT_NSTATS, }; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 90e2946..8493119 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -83,6 +83,7 @@ static const char * const mem_cgroup_stat_names[] = { "mapped_file", "swap", "dirty", + "writeback", }; enum mem_cgroup_events_index { @@ -2604,6 +2605,10 @@ static int mem_cgroup_move_account(struct page *page, mem_cgroup_move_account_page_stat(from, to, MEM_CGROUP_STAT_FILE_DIRTY); + if (PageWriteback(page)) + mem_cgroup_move_account_page_stat(from, to, + MEM_CGROUP_STAT_FILE_WRITEBACK); + mem_cgroup_charge_statistics(from, anon, -nr_pages); /* caller should have done css_get */ diff --git a/mm/page-writeback.c b/mm/page-writeback.c index e79a2f7..7398836 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -1981,6 +1981,7 @@ EXPORT_SYMBOL(account_page_dirtied); */ void account_page_writeback(struct page *page) { + mem_cgroup_inc_page_stat(page, MEM_CGROUP_STAT_FILE_WRITEBACK); inc_zone_page_state(page, NR_WRITEBACK); } EXPORT_SYMBOL(account_page_writeback); @@ -2214,7 +2215,10 @@ int test_clear_page_writeback(struct page *page) { struct address_space *mapping = page_mapping(page); int ret; + bool locked; + unsigned long flags; + mem_cgroup_begin_update_page_stat(page, &locked, &flags); if (mapping) { struct backing_dev_info *bdi = mapping->backing_dev_info; unsigned long flags; @@ -2235,9 +2239,12 @@ int test_clear_page_writeback(struct page *page) ret = TestClearPageWriteback(page); } if (ret) { + mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_FILE_WRITEBACK); dec_zone_page_state(page, NR_WRITEBACK); inc_zone_page_state(page, NR_WRITTEN); } + + mem_cgroup_end_update_page_stat(page, &locked, &flags); return ret; } @@ -2245,7 +2252,10 @@ int test_set_page_writeback(struct page *page) { struct address_space *mapping = page_mapping(page); int ret; + bool locked; + unsigned long flags; + mem_cgroup_begin_update_page_stat(page, &locked, &flags); if (mapping) { struct backing_dev_info *bdi = mapping->backing_dev_info; unsigned long flags; @@ -2272,6 +2282,8 @@ int test_set_page_writeback(struct page *page) } if (!ret) account_page_writeback(page); + + mem_cgroup_end_update_page_stat(page, &locked, &flags); return ret; } -- 1.7.1 -- 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:[~2012-06-28 11:05 UTC|newest] Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-06-28 10:54 [PATCH 0/7] Per-cgroup page stat accounting Sha Zhengju 2012-06-28 10:54 ` Sha Zhengju 2012-06-28 10:54 ` Sha Zhengju 2012-06-28 10:57 ` [PATCH 1/7] memcg: update cgroup memory document Sha Zhengju 2012-06-28 10:57 ` Sha Zhengju 2012-06-28 10:57 ` Sha Zhengju 2012-07-02 7:00 ` Kamezawa Hiroyuki 2012-07-02 7:00 ` Kamezawa Hiroyuki 2012-07-04 12:47 ` Michal Hocko 2012-07-04 12:47 ` Michal Hocko 2012-07-04 12:47 ` Michal Hocko 2012-07-07 13:45 ` Fengguang Wu 2012-07-07 13:45 ` Fengguang Wu 2012-07-07 13:45 ` Fengguang Wu 2012-06-28 10:58 ` [PATCH 2/7] memcg: remove MEMCG_NR_FILE_MAPPED Sha Zhengju 2012-06-28 10:58 ` Sha Zhengju 2012-07-02 10:44 ` Kamezawa Hiroyuki 2012-07-02 10:44 ` Kamezawa Hiroyuki 2012-07-02 10:44 ` Kamezawa Hiroyuki 2012-07-04 12:56 ` Michal Hocko 2012-07-04 12:56 ` Michal Hocko 2012-07-04 12:58 ` Michal Hocko 2012-07-04 12:58 ` Michal Hocko 2012-07-04 12:58 ` Michal Hocko 2012-07-07 13:48 ` Fengguang Wu 2012-07-07 13:48 ` Fengguang Wu 2012-07-09 21:01 ` Greg Thelen 2012-07-09 21:01 ` Greg Thelen 2012-07-09 21:01 ` Greg Thelen 2012-07-11 8:00 ` Sha Zhengju 2012-07-11 8:00 ` Sha Zhengju 2012-06-28 11:01 ` [PATCH 3/7] Make TestSetPageDirty and dirty page accounting in one func Sha Zhengju 2012-06-28 11:01 ` Sha Zhengju 2012-07-02 11:14 ` Kamezawa Hiroyuki 2012-07-02 11:14 ` Kamezawa Hiroyuki 2012-07-02 11:14 ` Kamezawa Hiroyuki 2012-07-07 14:42 ` Fengguang Wu 2012-07-07 14:42 ` Fengguang Wu 2012-07-04 14:23 ` Michal Hocko 2012-07-04 14:23 ` Michal Hocko 2012-06-28 11:03 ` [PATCH 4/7] Use vfs __set_page_dirty interface instead of doing it inside filesystem Sha Zhengju 2012-06-28 11:03 ` Sha Zhengju 2012-06-28 11:03 ` Sha Zhengju 2012-06-29 5:21 ` Sage Weil 2012-06-29 5:21 ` Sage Weil 2012-06-29 5:21 ` Sage Weil 2012-07-02 8:10 ` Sha Zhengju 2012-07-02 8:10 ` Sha Zhengju 2012-07-02 14:49 ` Sage Weil 2012-07-02 14:49 ` Sage Weil 2012-07-04 8:11 ` Sha Zhengju 2012-07-04 8:11 ` Sha Zhengju 2012-07-05 15:20 ` Sage Weil 2012-07-05 15:20 ` Sage Weil 2012-07-05 15:40 ` Sha Zhengju 2012-07-05 15:40 ` Sha Zhengju 2012-07-04 14:27 ` Michal Hocko 2012-07-04 14:27 ` Michal Hocko 2012-06-28 11:04 ` [PATCH 5/7] memcg: add per cgroup dirty pages accounting Sha Zhengju 2012-06-28 11:04 ` Sha Zhengju 2012-06-28 11:04 ` Sha Zhengju 2012-07-03 5:57 ` Kamezawa Hiroyuki 2012-07-03 5:57 ` Kamezawa Hiroyuki 2012-07-08 14:45 ` Fengguang Wu 2012-07-08 14:45 ` Fengguang Wu 2012-07-04 16:11 ` Michal Hocko 2012-07-04 16:11 ` Michal Hocko 2012-07-04 16:11 ` Michal Hocko 2012-07-09 21:02 ` Greg Thelen 2012-07-09 21:02 ` Greg Thelen 2012-07-11 9:32 ` Sha Zhengju 2012-07-11 9:32 ` Sha Zhengju 2012-07-19 6:33 ` Kamezawa Hiroyuki 2012-07-19 6:33 ` Kamezawa Hiroyuki 2012-07-19 6:33 ` Kamezawa Hiroyuki 2012-06-28 11:05 ` Sha Zhengju [this message] 2012-06-28 11:05 ` [PATCH 6/7] memcg: add per cgroup writeback " Sha Zhengju 2012-07-03 6:31 ` Kamezawa Hiroyuki 2012-07-03 6:31 ` Kamezawa Hiroyuki 2012-07-04 8:24 ` Sha Zhengju 2012-07-04 8:24 ` Sha Zhengju 2012-07-08 14:44 ` Fengguang Wu 2012-07-08 14:44 ` Fengguang Wu 2012-07-08 23:01 ` Johannes Weiner 2012-07-08 23:01 ` Johannes Weiner 2012-07-09 1:37 ` Fengguang Wu 2012-07-09 1:37 ` Fengguang Wu 2012-07-09 1:37 ` Fengguang Wu 2012-07-04 16:15 ` Michal Hocko 2012-07-04 16:15 ` Michal Hocko 2012-06-28 11:06 ` Sha Zhengju 2012-06-28 11:06 ` Sha Zhengju 2012-06-28 11:06 ` Sha Zhengju 2012-07-08 14:53 ` Fengguang Wu 2012-07-08 14:53 ` Fengguang Wu 2012-07-08 14:53 ` Fengguang Wu 2012-07-09 3:36 ` Sha Zhengju 2012-07-09 3:36 ` Sha Zhengju 2012-07-09 3:36 ` Sha Zhengju 2012-07-09 4:14 ` Fengguang Wu 2012-07-09 4:14 ` Fengguang Wu 2012-07-09 4:14 ` Fengguang Wu 2012-07-09 4:18 ` Kamezawa Hiroyuki 2012-07-09 4:18 ` Kamezawa Hiroyuki 2012-07-09 5:22 ` Sha Zhengju 2012-07-09 5:22 ` Sha Zhengju 2012-07-09 5:22 ` Sha Zhengju 2012-07-09 5:28 ` Fengguang Wu 2012-07-09 5:28 ` Fengguang Wu 2012-07-09 5:28 ` Fengguang Wu 2012-07-09 5:19 ` Sha Zhengju 2012-07-09 5:19 ` Sha Zhengju 2012-07-09 5:25 ` Fengguang Wu 2012-07-09 5:25 ` Fengguang Wu 2012-07-09 21:02 ` Greg Thelen 2012-07-09 21:02 ` Greg Thelen 2012-06-28 11:06 ` [PATCH 7/7] memcg: print more detailed info while memcg oom happening Sha Zhengju 2012-06-28 11:06 ` Sha Zhengju 2012-06-28 11:06 ` Sha Zhengju 2012-07-04 8:25 ` Sha Zhengju 2012-07-04 8:25 ` Sha Zhengju 2012-07-04 8:25 ` Sha Zhengju 2012-07-04 8:29 ` Kamezawa Hiroyuki 2012-07-04 8:29 ` Kamezawa Hiroyuki 2012-07-04 11:20 ` Sha Zhengju 2012-07-04 11:20 ` Sha Zhengju 2012-07-04 11:20 ` Sha Zhengju 2012-06-29 8:23 ` [PATCH 0/7] Per-cgroup page stat accounting Kamezawa Hiroyuki 2012-06-29 8:23 ` Kamezawa Hiroyuki 2012-07-02 7:51 ` Sha Zhengju 2012-07-02 7:51 ` Sha Zhengju 2012-07-02 7:51 ` Sha Zhengju
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=1340881525-5835-1-git-send-email-handai.szj@taobao.com \ --to=handai.szj@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=cgroups@vger.kernel.org \ --cc=gthelen@google.com \ --cc=handai.szj@taobao.com \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mhocko@suse.cz \ --cc=yinghan@google.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: linkBe 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.