2 files changed, 18 insertions, 0 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 73b864a32017..9b9aeef8e590 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -2121,6 +2121,21 @@ int hugetlb_report_node_meminfo(int nid, char *buf)
                 nid, h->surplus_huge_pages_node[nid]);
 }
 
+void hugetlb_show_meminfo(void)
+{
+        struct hstate *h;
+        int nid;
+
+        for_each_node_state(nid, N_MEMORY)
+                for_each_hstate(h)
+                        pr_info("Node %d hugepages_total=%u hugepages_free=%u hugepages_surp=%u hugepages_size=%lukB\n",
+                                nid,
+                                h->nr_huge_pages_node[nid],
+                                h->free_huge_pages_node[nid],
+                                h->surplus_huge_pages_node[nid],
+                                1UL << (huge_page_order(h) + PAGE_SHIFT - 10));
+}
+
 /* Return the number pages of memory we physically have, in PAGE_SIZE units. */
 unsigned long hugetlb_total_pages(void)
 {
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 72da11c6804d..7350986bbf99 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -58,6 +58,7 @@
 #include <linux/prefetch.h>
 #include <linux/migrate.h>
 #include <linux/page-debug-flags.h>
+#include <linux/hugetlb.h>
 #include <linux/sched/rt.h>
 
 #include <asm/tlbflush.h>
@@ -3113,6 +3114,8 @@ void show_free_areas(unsigned int filter)
                 printk("= %lukB\n", K(total));
         }
 
+        hugetlb_show_meminfo();
+
         printk("%ld total pagecache pages\n", global_page_state(NR_FILE_PAGES));
 
         show_swap_cache_info();