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

Commit 65c45377 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

mm, rmap: account shmem thp pages 

Let's add ShmemHugePages and ShmemPmdMapped fields into meminfo and
smaps.  It indicates how many times we allocate and map shmem THP.

NR_ANON_TRANSPARENT_HUGEPAGES is renamed to NR_ANON_THPS.

Link: http://lkml.kernel.org/r/1466021202-61880-27-git-send-email-kirill.shutemov@linux.intel.com


Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fc127da0

drivers/base/node.c

+9 −4
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ static ssize_t node_read_meminfo(struct device *dev, 
		       "Node %d SUnreclaim:     %8lu kB\n"

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

		       "Node %d AnonHugePages:  %8lu kB\n"

		       "Node %d ShmemHugePages: %8lu kB\n"

		       "Node %d ShmemPmdMapped: %8lu kB\n"

#endif

			,

		       nid, K(node_page_state(nid, NR_FILE_DIRTY)),
@@ -131,9 +133,12 @@ static ssize_t node_read_meminfo(struct device *dev, 
				node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),

		       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))

			, nid,

			K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *

		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),

		       nid, K(node_page_state(nid, NR_ANON_THPS) *

				       HPAGE_PMD_NR),

		       nid, K(node_page_state(nid, NR_SHMEM_THPS) *

				       HPAGE_PMD_NR),

		       nid, K(node_page_state(nid, NR_SHMEM_PMDMAPPED) *

				       HPAGE_PMD_NR));

#else

		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));

fs/proc/meminfo.c

+5 −2
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v) 
#endif

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

		"AnonHugePages:  %8lu kB\n"

		"ShmemHugePages: %8lu kB\n"

		"ShmemPmdMapped: %8lu kB\n"

#endif

#ifdef CONFIG_CMA

		"CmaTotal:       %8lu kB\n"
@@ -162,8 +164,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v) 
		, atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)

#endif

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

		, K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *

		   HPAGE_PMD_NR)

		, K(global_page_state(NR_ANON_THPS) * HPAGE_PMD_NR)

		, K(global_page_state(NR_SHMEM_THPS) * HPAGE_PMD_NR)

		, K(global_page_state(NR_SHMEM_PMDMAPPED) * HPAGE_PMD_NR)

#endif

#ifdef CONFIG_CMA

		, K(totalcma_pages)

fs/proc/task_mmu.c

+9 −1
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ struct mem_size_stats { 
	unsigned long referenced;

	unsigned long anonymous;

	unsigned long anonymous_thp;

	unsigned long shmem_thp;

	unsigned long swap;

	unsigned long shared_hugetlb;

	unsigned long private_hugetlb;
@@ -576,7 +577,12 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr, 
	page = follow_trans_huge_pmd(vma, addr, pmd, FOLL_DUMP);

	if (IS_ERR_OR_NULL(page))

		return;

	if (PageAnon(page))

		mss->anonymous_thp += HPAGE_PMD_SIZE;

	else if (PageSwapBacked(page))

		mss->shmem_thp += HPAGE_PMD_SIZE;

	else

		VM_BUG_ON_PAGE(1, page);

	smaps_account(mss, page, true, pmd_young(*pmd), pmd_dirty(*pmd));

}

#else
@@ -770,6 +776,7 @@ static int show_smap(struct seq_file *m, void *v, int is_pid) 
		   "Referenced:     %8lu kB\n"

		   "Anonymous:      %8lu kB\n"

		   "AnonHugePages:  %8lu kB\n"

		   "ShmemPmdMapped: %8lu kB\n"

		   "Shared_Hugetlb: %8lu kB\n"

		   "Private_Hugetlb: %7lu kB\n"

		   "Swap:           %8lu kB\n"
@@ -787,6 +794,7 @@ static int show_smap(struct seq_file *m, void *v, int is_pid) 
		   mss.referenced >> 10,

		   mss.anonymous >> 10,

		   mss.anonymous_thp >> 10,

		   mss.shmem_thp >> 10,

		   mss.shared_hugetlb >> 10,

		   mss.private_hugetlb >> 10,

		   mss.swap >> 10,

include/linux/mmzone.h

+3 −1
Original line number Diff line number Diff line
@@ -154,7 +154,9 @@ enum zone_stat_item { 
	WORKINGSET_REFAULT,

	WORKINGSET_ACTIVATE,

	WORKINGSET_NODERECLAIM,

	NR_ANON_TRANSPARENT_HUGEPAGES,

	NR_ANON_THPS,

	NR_SHMEM_THPS,

	NR_SHMEM_PMDMAPPED,

	NR_FREE_CMA_PAGES,

	NR_VM_ZONE_STAT_ITEMS };

mm/huge_memory.c

+3 −1
Original line number Diff line number Diff line
@@ -3067,7 +3067,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, 


	if (atomic_add_negative(-1, compound_mapcount_ptr(page))) {

		/* Last compound_mapcount is gone. */

		__dec_zone_page_state(page, NR_ANON_TRANSPARENT_HUGEPAGES);

		__dec_zone_page_state(page, NR_ANON_THPS);

		if (TestClearPageDoubleMap(page)) {

			/* No need in mapcount reference anymore */

			for (i = 0; i < HPAGE_PMD_NR; i++)
@@ -3539,6 +3539,8 @@ int split_huge_page_to_list(struct page *page, struct list_head *list) 
			pgdata->split_queue_len--;

			list_del(page_deferred_list(head));

		}

		if (mapping)

			__dec_zone_page_state(page, NR_SHMEM_THPS);

		spin_unlock(&pgdata->split_queue_lock);

		__split_huge_page(page, list, flags);

		ret = 0;