From: Sha Zhengju <handai.szj@gmail.com>
To: cgroups@vger.kernel.org, linux-mm@kvack.org
Cc: mhocko@suse.cz, kamezawa.hiroyu@jp.fujitsu.com,
glommer@parallels.com, akpm@linux-foundation.org,
mgorman@suse.de, Sha Zhengju <handai.szj@taobao.com>
Subject: [PATCH 4/6] memcg: Don't account root memcg swap stats
Date: Tue, 12 Mar 2013 18:10:39 +0800 [thread overview]
Message-ID: <1363083039-3830-1-git-send-email-handai.szj@taobao.com> (raw)
In-Reply-To: <1363082773-3598-1-git-send-email-handai.szj@taobao.com>
Similar with root memcg's CACHE/RSS, we don't account its swap stats
to improve performance.
And for root memcg memcg_stat_show():
nr(MEM_CGROUP_STAT_SWAP) = total_swap_pages - nr_swap_pages
- sum_of_all_memcg(MEM_CGROUP_STAT_SWAP);
Signed-off-by: Sha Zhengju <handai.szj@taobao.com>
---
mm/memcontrol.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 24ce5e6d..b73758e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -934,7 +934,9 @@ static void mem_cgroup_swap_statistics(struct mem_cgroup *memcg,
bool charge)
{
int val = (charge) ? 1 : -1;
- this_cpu_add(memcg->stat->count[MEM_CGROUP_STAT_SWAP], val);
+
+ if (!mem_cgroup_is_root(memcg))
+ this_cpu_add(memcg->stat->count[MEM_CGROUP_STAT_SWAP], val);
}
static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg,
@@ -5460,10 +5462,13 @@ static int memcg_stat_show(struct cgroup *cont, struct cftype *cft,
if (i == MEM_CGROUP_STAT_SWAP && !do_swap_account)
continue;
- if (mem_cgroup_is_root(memcg) && (i != MEM_CGROUP_STAT_SWAP)) {
- val = global_page_state(global_stat[i]) -
- mem_cgroup_recursive_stat(memcg, i);
- root_stat[i] = val = val < 0 ? 0 : val;
+ if (mem_cgroup_is_root(memcg)) {
+ if (i == MEM_CGROUP_STAT_SWAP)
+ val = total_swap_pages -
+ atomic_long_read(&nr_swap_pages);
+ else
+ val = global_page_state(global_stat[i]);
+ val = val - mem_cgroup_recursive_stat(memcg, i);
} else
val = mem_cgroup_read_stat(memcg, i);
seq_printf(m, "%s %ld\n", mem_cgroup_stat_names[i],
--
1.7.9.5
--
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:[~2013-03-12 10:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-12 10:06 [PATCH 0/6] memcg: bypass root memcg page stat accounting Sha Zhengju
2013-03-12 10:08 ` [PATCH 1/6] memcg: use global stat directly for root memcg usage Sha Zhengju
2013-03-13 1:05 ` Kamezawa Hiroyuki
2013-03-13 8:50 ` Sha Zhengju
2013-03-12 10:09 ` [PATCH 2/6] memcg: Don't account root memcg CACHE/RSS stats Sha Zhengju
2013-03-13 1:12 ` Kamezawa Hiroyuki
2013-03-13 9:09 ` Sha Zhengju
2013-03-20 7:07 ` Glauber Costa
2013-03-12 10:10 ` [PATCH 3/6] memcg: Don't account root memcg MEM_CGROUP_STAT_FILE_MAPPED stats Sha Zhengju
2013-03-12 10:10 ` Sha Zhengju [this message]
2013-03-12 10:11 ` [PATCH 5/6] memcg: Don't account root memcg PGFAULT/PGMAJFAULT events Sha Zhengju
2013-03-12 10:11 ` [PATCH 6/6] memcg: disable memcg page stat accounting Sha Zhengju
2013-03-20 7:09 ` Glauber Costa
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=1363083039-3830-1-git-send-email-handai.szj@taobao.com \
--to=handai.szj@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=glommer@parallels.com \
--cc=handai.szj@taobao.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.cz \
/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