1 files changed, 39 insertions, 0 deletions

diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 6916fe4bf0cb..afd40054d157 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -34,6 +34,41 @@ struct cpa_data {
         unsigned        force_split : 1;
 };
 
+#ifdef CONFIG_PROC_FS
+static unsigned long direct_pages_count[PG_LEVEL_NUM];
+
+void update_page_count(int level, unsigned long pages)
+{
+        unsigned long flags;
+
+        /* Protect against CPA */
+        spin_lock_irqsave(&pgd_lock, flags);
+        direct_pages_count[level] += pages;
+        spin_unlock_irqrestore(&pgd_lock, flags);
+}
+
+static void split_page_count(int level)
+{
+        direct_pages_count[level]--;
+        direct_pages_count[level - 1] += PTRS_PER_PTE;
+}
+
+int arch_report_meminfo(char *page)
+{
+        int n = sprintf(page, "DirectMap4k:  %8lu\n"
+                        "DirectMap2M:  %8lu\n",
+                        direct_pages_count[PG_LEVEL_4K],
+                        direct_pages_count[PG_LEVEL_2M]);
+#ifdef CONFIG_X86_64
+        n += sprintf(page + n, "DirectMap1G:  %8lu\n",
+                     direct_pages_count[PG_LEVEL_1G]);
+#endif
+        return n;
+}
+#else
+static inline void split_page_count(int level) { }
+#endif
+
 #ifdef CONFIG_X86_64
 
 static inline unsigned long highmap_start_pfn(void)
@@ -500,6 +535,10 @@ static int split_large_page(pte_t *kpte, unsigned long address)
         for (i = 0; i < PTRS_PER_PTE; i++, pfn += pfninc)
                 set_pte(&pbase[i], pfn_pte(pfn, ref_prot));
 
+        if (address >= (unsigned long)__va(0) &&
+                address < (unsigned long)__va(max_pfn_mapped << PAGE_SHIFT))
+                split_page_count(level);
+
         /*
          * Install the new, split up pagetable. Important details here:
          *