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@xxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxx>
> ---
> 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@xxxxxxxxx. 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@xxxxxxxxx";> email@xxxxxxxxx </a>