mm: rmap: fix huge file mmap accounting in the memcg stats (553af430) · Commits · 戴 / test

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:

Michal Hocko <mhocko@suse.com> Cc: Vladimir Davydov <vdavydov.dev@gmail.com> Cc: <stable@vger.kernel.org> [4.8+] Signed-off-by:

include/linux/memcontrol.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -740,6 +740,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)
		{

+2 −2

Original line number	Diff line number	Diff line
		@@ -1159,7 +1159,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);
		}
		@@ -1199,7 +1199,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);