Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5707920 authored by Johannes Weiner's avatar Johannes Weiner Committed by Greg Kroah-Hartman
Browse files

mm: rmap: fix huge file mmap accounting in the memcg stats 

commit 553af430e7c981e6e8fa5007c5b7b5773acc63dd upstream.

Huge pages are accounted as single units in the memcg's "file_mapped"
counter.  Account the correct number of base pages, like we do in the
corresponding node counter.

Link: http://lkml.kernel.org/r/20170322005111.3156-1-hannes@cmpxchg.org


Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Reviewed-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 673dfb6d

include/linux/memcontrol.h

+6 −0
Original line number Diff line number Diff line
@@ -739,6 +739,12 @@ static inline bool mem_cgroup_oom_synchronize(bool wait) 
	return false;

}



static inline void mem_cgroup_update_page_stat(struct page *page,

					       enum mem_cgroup_stat_index idx,

					       int nr)

{

}



static inline void mem_cgroup_inc_page_stat(struct page *page,

					    enum mem_cgroup_stat_index idx)

{

mm/rmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1295,7 +1295,7 @@ void page_add_file_rmap(struct page *page, bool compound) 
			goto out;

	}

	__mod_node_page_state(page_pgdat(page), NR_FILE_MAPPED, nr);

	mem_cgroup_inc_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED);

	mem_cgroup_update_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED, nr);

out:

	unlock_page_memcg(page);

}
@@ -1335,7 +1335,7 @@ static void page_remove_file_rmap(struct page *page, bool compound) 
	 * pte lock(a spinlock) is held, which implies preemption disabled.

	 */

	__mod_node_page_state(page_pgdat(page), NR_FILE_MAPPED, -nr);

	mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED);

	mem_cgroup_update_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED, -nr);



	if (unlikely(PageMlocked(page)))

		clear_page_mlock(page);