x86: fix /proc/meminfo DirectMap

Do we actually want these DirectMap lines in the x86 /proc/meminfo?
I can see they're interesting to CPA developers and TLB optimizers,
but they don't fit its usual "where has all my memory gone?" usage.
If they are to stay, here are some fixes.

1. On x86_32 without PAE, they're not 2M but 4M pages: no need to
   mess with the internal enum, but show the right name to users.

2. Many machines can never show anything but 0 for DirectMap1G,
   so suppress that line unless direct_gbpages are really enabled.

3. The unit in /proc/meminfo is kB not number of pages: HugePages
   messed that up, but they're an example to regret not to follow.

4. Once we use kB, it's easy to see that 1GB has gone missing (which
   explains why CONFIG_CPA_DEBUG=y soon wraps DirectMap2M negative):
   because head_64.S's level2_ident_pgt entries were not counted.
   My fix is not ideal, but works for more and for less than 1G,
   and avoids interfering with early bootup pagetable contortions.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 17 insertions, 7 deletions

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 129618ca0ea2..b3e6c3075acc 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -60,7 +60,7 @@ static unsigned long dma_reserve __initdata;
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
-int direct_gbpages __meminitdata
+int direct_gbpages
 #ifdef CONFIG_DIRECT_GBPAGES
                                 = 1
 #endif
@@ -314,6 +314,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,
 {
         unsigned long pages = 0;
         unsigned long last_map_addr = end;
+        unsigned long start = address;
 
         int i = pmd_index(address);
 
@@ -334,6 +335,9 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,
                         if (!pmd_large(*pmd))
                                 last_map_addr = phys_pte_update(pmd, address,
                                                                  end);
+                        /* Count entries we're using from level2_ident_pgt */
+                        if (start == 0)
+                                pages++;
                         continue;
                 }
 
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index ba24537d69dd..f5f5154ea11e 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -55,13 +55,19 @@ static void split_page_count(int level)
 
 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]);
+        int n = sprintf(page, "DirectMap4k:  %8lu kB\n",
+                        direct_pages_count[PG_LEVEL_4K] << 2);
+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
+        n += sprintf(page + n, "DirectMap2M:  %8lu kB\n",
+                        direct_pages_count[PG_LEVEL_2M] << 11);
+#else
+        n += sprintf(page + n, "DirectMap4M:  %8lu kB\n",
+                        direct_pages_count[PG_LEVEL_2M] << 12);
+#endif
 #ifdef CONFIG_X86_64
-        n += sprintf(page + n, "DirectMap1G:  %8lu\n",
-                     direct_pages_count[PG_LEVEL_1G]);
+        if (direct_gbpages)
+                n += sprintf(page + n, "DirectMap1G:  %8lu kB\n",
+                        direct_pages_count[PG_LEVEL_1G] << 20);
 #endif
         return n;
 }