[PATCH 1/3] mm, page_alloc: un-inline the bad part of free_pages_check

[Vlastimil Babka]

!DEBUG_VM bloat-o-meter:

add/remove: 1/0 grow/shrink: 0/2 up/down: 124/-383 (-259)
function                                     old     new   delta
free_pages_check_bad                           -     124    +124
free_pcppages_bulk                          1509    1403    -106
__free_pages_ok                             1025     748    -277

DEBUG_VM:

add/remove: 1/0 grow/shrink: 0/1 up/down: 124/-242 (-118)
function                                     old     new   delta
free_pages_check_bad                           -     124    +124
free_pages_prepare                          1048     806    -242

Signed-off-by: Vlastimil Babka <vba...@suse.cz>
---
 mm/page_alloc.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index fe78c4dbfa8d..12c03a8509a0 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -906,18 +906,11 @@ static inline bool page_expected_state(struct page *page,
        return true;
 }
 
-static inline int free_pages_check(struct page *page)
+static void free_pages_check_bad(struct page *page)
 {
        const char *bad_reason;
        unsigned long bad_flags;
 
-       if (page_expected_state(page, PAGE_FLAGS_CHECK_AT_FREE)) {
-               page_cpupid_reset_last(page);
-               page->flags &= ~PAGE_FLAGS_CHECK_AT_PREP;
-               return 0;
-       }
-
-       /* Something has gone sideways, find it */
        bad_reason = NULL;
        bad_flags = 0;
 
@@ -936,6 +929,17 @@ static inline int free_pages_check(struct page *page)
                bad_reason = "page still charged to cgroup";
 #endif
        bad_page(page, bad_reason, bad_flags);
+}
+static inline int free_pages_check(struct page *page)
+{
+       if (likely(page_expected_state(page, PAGE_FLAGS_CHECK_AT_FREE))) {
+               page_cpupid_reset_last(page);
+               page->flags &= ~PAGE_FLAGS_CHECK_AT_PREP;
+               return 0;
+       }
+
+       /* Something has gone sideways, find it */
+       free_pages_check_bad(page);
        return 1;
 }
 
-- 
2.8.1