From: Michal Hocko <mhocko@suse.cz>
To: Johannes Weiner <hannes@cmpxchg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
cgroups@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: Re: [patch 4/6] mm: memcg: keep ratelimit counter separate from event counters
Date: Tue, 15 May 2012 16:58:05 +0200 [thread overview]
Message-ID: <20120515145805.GI11346@tiehlicka.suse.cz> (raw)
In-Reply-To: <1337018451-27359-5-git-send-email-hannes@cmpxchg.org>
On Mon 14-05-12 20:00:49, Johannes Weiner wrote:
> All events except the ratelimit counter are statistics exported to
> userspace. Keep this internal value out of the event count array.
OK, makes sense. I was just thinking that events_internal array (with a
single MEM_CGROUP_EVENTS_COUNT) would be more consistent. Probably too
much churn for a single event though.
>
> Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
> ---
> mm/memcontrol.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 9e8551c..546e7db 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -105,7 +105,6 @@ enum mem_cgroup_stat_index {
> enum mem_cgroup_events_index {
> MEM_CGROUP_EVENTS_PGPGIN, /* # of pages paged in */
> MEM_CGROUP_EVENTS_PGPGOUT, /* # of pages paged out */
> - MEM_CGROUP_EVENTS_COUNT, /* # of pages paged in/out */
> MEM_CGROUP_EVENTS_PGFAULT, /* # of page-faults */
> MEM_CGROUP_EVENTS_PGMAJFAULT, /* # of major page-faults */
> MEM_CGROUP_EVENTS_NSTATS,
> @@ -129,6 +128,7 @@ enum mem_cgroup_events_target {
> struct mem_cgroup_stat_cpu {
> long count[MEM_CGROUP_STAT_NSTATS];
> unsigned long events[MEM_CGROUP_EVENTS_NSTATS];
> + unsigned long nr_page_events;
> unsigned long targets[MEM_CGROUP_NTARGETS];
> };
>
> @@ -736,7 +736,7 @@ static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg,
> nr_pages = -nr_pages; /* for event */
> }
>
> - __this_cpu_add(memcg->stat->events[MEM_CGROUP_EVENTS_COUNT], nr_pages);
> + __this_cpu_add(memcg->stat->nr_page_events, nr_pages);
>
> preempt_enable();
> }
> @@ -797,7 +797,7 @@ static bool mem_cgroup_event_ratelimit(struct mem_cgroup *memcg,
> {
> unsigned long val, next;
>
> - val = __this_cpu_read(memcg->stat->events[MEM_CGROUP_EVENTS_COUNT]);
> + val = __this_cpu_read(memcg->stat->nr_page_events);
> next = __this_cpu_read(memcg->stat->targets[target]);
> /* from time_after() in jiffies.h */
> if ((long)next - (long)val < 0) {
> --
> 1.7.10.1
>
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
--
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/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-05-15 14:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-14 18:00 [patch 0/6] mm: memcg: statistics implementation cleanups Johannes Weiner
2012-05-14 18:00 ` [patch 1/6] mm: memcg: remove obsolete statistics array boundary enum item Johannes Weiner
2012-05-15 14:14 ` Michal Hocko
2012-05-14 18:00 ` [patch 2/6] mm: memcg: convert numa stat to read_seq_string interface Johannes Weiner
2012-05-15 14:43 ` Michal Hocko
2012-05-14 18:00 ` [patch 3/6] mm: memcg: print statistics directly to seq_file Johannes Weiner
2012-05-15 14:46 ` Michal Hocko
2012-05-14 18:00 ` [patch 4/6] mm: memcg: keep ratelimit counter separate from event counters Johannes Weiner
2012-05-15 14:58 ` Michal Hocko [this message]
2012-05-14 18:00 ` [patch 5/6] mm: memcg: group swapped-out statistics counter logically Johannes Weiner
2012-05-15 15:04 ` Michal Hocko
2012-05-14 18:00 ` [patch 6/6] mm: memcg: print statistics from live counters Johannes Weiner
2012-05-15 15:27 ` Michal Hocko
2012-05-16 23:01 ` Andrew Morton
2012-05-17 0:01 ` KAMEZAWA Hiroyuki
2012-05-17 10:56 ` Glauber Costa
2012-05-15 0:19 ` [patch 0/6] mm: memcg: statistics implementation cleanups KAMEZAWA Hiroyuki
2012-05-15 11:03 ` Johannes Weiner
2012-05-16 0:01 ` KAMEZAWA Hiroyuki
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=20120515145805.GI11346@tiehlicka.suse.cz \
--to=mhocko@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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