mm: memcg: clean up fault accounting

This change “mm: memcg: clean up fault accounting” (commit 0e574a9) in Linux kernel is authored by Johannes Weiner <jweiner [at]> on Thu Jan 12 17:18:35 2012 -0800.

Description of "mm: memcg: clean up fault accounting"

The change “mm: memcg: clean up fault accounting” introduces changes as follows.

mm: memcg: clean up fault accounting

The fault accounting functions have a single, memcg-internal user, so they
don't need to be global.  In fact, their one-line bodies can be directly
folded into the caller.  And since faults happen one at a time, use
this_cpu_inc() directly instead of this_cpu_add(foo, 1).

Signed-off-by: Johannes Weiner <>
Acked-by: KAMEZAWA Hiroyuki <>
Acked-by: Michal Hocko <>
Acked-by: Balbir Singh <>
Cc: David Rientjes <>
Cc: Hugh Dickins <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>

Linux kernel releases containing commit 0e574a9

The Linux kernel releases containing this commit are as follows.

Linux kernel code changes from "mm: memcg: clean up fault accounting"

There are 18 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 mm/memcontrol.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index aeb23933a052..93cb16d2b96a 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -655,16 +655,6 @@ static void mem_cgroup_swap_statistics(struct mem_cgroup *memcg,
 	this_cpu_add(memcg->stat->count[MEM_CGROUP_STAT_SWAPOUT], val);
-void mem_cgroup_pgfault(struct mem_cgroup *memcg, int val)
-	this_cpu_add(memcg->stat->events[MEM_CGROUP_EVENTS_PGFAULT], val);
-void mem_cgroup_pgmajfault(struct mem_cgroup *memcg, int val)
-	this_cpu_add(memcg->stat->events[MEM_CGROUP_EVENTS_PGMAJFAULT], val);
 static unsigned long mem_cgroup_read_events(struct mem_cgroup *memcg,
 					    enum mem_cgroup_events_index idx)
@@ -978,11 +968,11 @@ void mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx)
 		goto out;
 	switch (idx) {
-		mem_cgroup_pgmajfault(memcg, 1);
-		break;
 	case PGFAULT:
-		mem_cgroup_pgfault(memcg, 1);
+		this_cpu_inc(memcg->stat->events[MEM_CGROUP_EVENTS_PGFAULT]);
+		break;
+		this_cpu_inc(memcg->stat->events[MEM_CGROUP_EVENTS_PGMAJFAULT]);

The commit for this change in Linux stable tree is 0e574a9 (patch).

Last modified: 2020/02/10