From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753566AbcD0MB2 (ORCPT ); Wed, 27 Apr 2016 08:01:28 -0400 Received: from mx2.suse.de ([195.135.220.15]:51461 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752440AbcD0MB0 (ORCPT ); Wed, 27 Apr 2016 08:01:26 -0400 From: Vlastimil Babka To: Mel Gorman , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Jesper Dangaard Brouer , Vlastimil Babka Subject: [PATCH 1/3] mm, page_alloc: un-inline the bad part of free_pages_check Date: Wed, 27 Apr 2016 14:01:14 +0200 Message-Id: <1461758476-450-1-git-send-email-vbabka@suse.cz> X-Mailer: git-send-email 2.8.1 In-Reply-To: <5720A987.7060507@suse.cz> References: <5720A987.7060507@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org !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 --- 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