aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>2016-03-17 17:17:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-17 18:09:34 -0400
commit832fc1de01aea28255cb11d270679b7f1273f0d7 (patch)
treeef020cb2a44d1fee4df1359fbb3fc11a08de733b /mm
parent12580e4b54ba8a1b22ec977c200be0174ca42348 (diff)
/proc/kpageflags: return KPF_BUDDY for "tail" buddy pages
Currently /proc/kpageflags returns nothing for "tail" buddy pages, which is inconvenient when grasping how free pages are distributed. This patch sets KPF_BUDDY for such pages. With this patch: $ grep MemFree /proc/meminfo ; tools/vm/page-types -b buddy MemFree: 3134992 kB flags page-count MB symbolic-flags long-symbolic-flags 0x0000000000000400 779272 3044 __________B_______________________________ buddy 0x0000000000000c00 4385 17 __________BM______________________________ buddy,mmap total 783657 3061 783657 pages is 3134628 kB (roughly consistent with the global counter,) so it's OK. [akpm@linux-foundation.org: update comment, per Naoya] Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com> Reviewed-by: Vladimir Davydov <vdavydov@virtuozzo.com>> 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>
Diffstat (limited to 'mm')
-rw-r--r--mm/internal.h3
-rw-r--r--mm/page_alloc.c2
2 files changed, 0 insertions, 5 deletions
diff --git a/mm/internal.h b/mm/internal.h
index ad9400d759c8..b95952c2faec 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -148,9 +148,6 @@ extern int __isolate_free_page(struct page *page, unsigned int order);
148extern void __free_pages_bootmem(struct page *page, unsigned long pfn, 148extern void __free_pages_bootmem(struct page *page, unsigned long pfn,
149 unsigned int order); 149 unsigned int order);
150extern void prep_compound_page(struct page *page, unsigned int order); 150extern void prep_compound_page(struct page *page, unsigned int order);
151#ifdef CONFIG_MEMORY_FAILURE
152extern bool is_free_buddy_page(struct page *page);
153#endif
154extern int user_min_free_kbytes; 151extern int user_min_free_kbytes;
155 152
156#if defined CONFIG_COMPACTION || defined CONFIG_CMA 153#if defined CONFIG_COMPACTION || defined CONFIG_CMA
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index c46b75d14b6f..c7332a4bc8db 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7152,7 +7152,6 @@ __offline_isolated_pages(unsigned long start_pfn, unsigned long end_pfn)
7152} 7152}
7153#endif 7153#endif
7154 7154
7155#ifdef CONFIG_MEMORY_FAILURE
7156bool is_free_buddy_page(struct page *page) 7155bool is_free_buddy_page(struct page *page)
7157{ 7156{
7158 struct zone *zone = page_zone(page); 7157 struct zone *zone = page_zone(page);
@@ -7171,4 +7170,3 @@ bool is_free_buddy_page(struct page *page)
7171 7170
7172 return order < MAX_ORDER; 7171 return order < MAX_ORDER;
7173} 7172}
7174#endif