mm:add KPF_ZERO_PAGE flag for /proc/kpageflags

Add KPF_ZERO_PAGE flag for zero_page, so that userspace processes can
detect zero_page in /proc/kpageflags, and then do memory analysis more
accurately.

Signed-off-by: Yalin Wang <yalin.wang@sonymobile.com>
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Documentation/vm/pagemap.txt b/Documentation/vm/pagemap.txt
index 5948e455c4d24346c29bb245551571258991d37f..6fbd55ef6b45379f4e92c7ee009657c3c73bcd7c 100644 (file)
--- a/Documentation/vm/pagemap.txt
+++ b/Documentation/vm/pagemap.txt
@@ -62,6 +62,8 @@ There are three components to pagemap:
     20. NOPAGE
     21. KSM
     22. THP
+    23. BALLOON
+    24. ZERO_PAGE
 
 Short descriptions to the page flags:
 
@@ -102,6 +104,12 @@ Short descriptions to the page flags:
 22. THP
     contiguous pages which construct transparent hugepages
 
+23. BALLOON
+    balloon compaction page
+
+24. ZERO_PAGE
+    zero page for pfn_zero or huge_zero page
+
     [IO related page flags]
  1. ERROR     IO error occurred
  3. UPTODATE  page has up-to-date data

diff --git a/fs/proc/page.c b/fs/proc/page.c
index 1e3187da1fedbb76fedd9252a8969c159d7c15a2..7eee2d8b97d9786b7c05ca1078d477c4db6af5e1 100644 (file)
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -5,6 +5,7 @@
 #include <linux/ksm.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
+#include <linux/huge_mm.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/hugetlb.h>
@@ -121,9 +122,18 @@ u64 stable_page_flags(struct page *page)
         * just checks PG_head/PG_tail, so we need to check PageLRU/PageAnon
         * to make sure a given page is a thp, not a non-huge compound page.
         */
-       else if (PageTransCompound(page) && (PageLRU(compound_head(page)) ||
-                                            PageAnon(compound_head(page))))
-               u |= 1 << KPF_THP;
+       else if (PageTransCompound(page)) {
+               struct page *head = compound_head(page);
+
+               if (PageLRU(head) || PageAnon(head))
+                       u |= 1 << KPF_THP;
+               else if (is_huge_zero_page(head)) {
+                       u |= 1 << KPF_ZERO_PAGE;
+                       u |= 1 << KPF_THP;
+               }
+       } else if (is_zero_pfn(page_to_pfn(page)))
+               u |= 1 << KPF_ZERO_PAGE;
+
 
        /*
         * Caveats on high order pages: page->_count will only be set

diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index ad9051bab267dc775df152f5a6aedf5bf2a18856..f10b20f051599287a40188d322ead088726e2296 100644 (file)
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -157,6 +157,13 @@ static inline int hpage_nr_pages(struct page *page)
 extern int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
                                unsigned long addr, pmd_t pmd, pmd_t *pmdp);
 
+extern struct page *huge_zero_page;
+
+static inline bool is_huge_zero_page(struct page *page)
+{
+       return ACCESS_ONCE(huge_zero_page) == page;
+}
+
 #else /* CONFIG_TRANSPARENT_HUGEPAGE */
 #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })
 #define HPAGE_PMD_MASK ({ BUILD_BUG(); 0; })
@@ -206,6 +213,11 @@ static inline int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_str
        return 0;
 }
 
+static inline bool is_huge_zero_page(struct page *page)
+{
+       return false;
+}
+
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 
 #endif /* _LINUX_HUGE_MM_H */

diff --git a/include/uapi/linux/kernel-page-flags.h b/include/uapi/linux/kernel-page-flags.h
index 2f96d233c980bdaef504c0d6936f5e381e8cc532..a6c4962e5d4623912adb21f4c240b352de223481 100644 (file)
--- a/include/uapi/linux/kernel-page-flags.h
+++ b/include/uapi/linux/kernel-page-flags.h
@@ -32,6 +32,7 @@
 #define KPF_KSM                        21
 #define KPF_THP                        22
 #define KPF_BALLOON            23
+#define KPF_ZERO_PAGE          24
 
 
 #endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 817a875f2b8c0338dc9e56511b92d99a7ff7b992..8897131809804e895da583001170c0c73e8e95d3 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -171,12 +171,7 @@ static int start_khugepaged(void)
 }
 
 static atomic_t huge_zero_refcount;
-static struct page *huge_zero_page __read_mostly;
-
-static inline bool is_huge_zero_page(struct page *page)
-{
-       return ACCESS_ONCE(huge_zero_page) == page;
-}
+struct page *huge_zero_page __read_mostly;
 
 static inline bool is_huge_zero_pmd(pmd_t pmd)
 {

diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c
index 264fbc297e0b138262647e2426c059a87ff14cfe..8bdf16b8ba6047a2420998bde0adfd81489e117d 100644 (file)
--- a/tools/vm/page-types.c
+++ b/tools/vm/page-types.c
@@ -133,6 +133,7 @@ static const char * const page_flag_names[] = {
        [KPF_KSM]               = "x:ksm",
        [KPF_THP]               = "t:thp",
        [KPF_BALLOON]           = "o:balloon",
+       [KPF_ZERO_PAGE]         = "z:zero_page",
 
        [KPF_RESERVED]          = "r:reserved",
        [KPF_MLOCKED]           = "m:mlocked",