From patchwork Mon Jan 20 03:04:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 11340937 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE26E14B4 for ; Mon, 20 Jan 2020 03:04:34 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B1DD920684 for ; Mon, 20 Jan 2020 03:04:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1DD920684 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D306F6B05A0; Sun, 19 Jan 2020 22:04:31 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C6D8D6B05A2; Sun, 19 Jan 2020 22:04:31 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC05F6B05A3; Sun, 19 Jan 2020 22:04:31 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0210.hostedemail.com [216.40.44.210]) by kanga.kvack.org (Postfix) with ESMTP id 8F3DD6B05A0 for ; Sun, 19 Jan 2020 22:04:31 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with SMTP id 345E92DFC for ; Mon, 20 Jan 2020 03:04:31 +0000 (UTC) X-FDA: 76396519542.06.wash59_447f90edc4810 X-Spam-Summary: 1,0,0,,d41d8cd98f00b204,richardw.yang@linux.intel.com,:akpm@linux-foundation.org:richardw.yang@linux.intel.com:linux-kernel@vger.kernel.org::rientjes@google.com,RULES_HIT:30029:30046:30054:30070,0,RBL:192.55.52.93:@linux.intel.com:.lbl8.mailshell.net-62.18.0.100 64.95.201.95,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: wash59_447f90edc4810 X-Filterd-Recvd-Size: 5565 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Mon, 20 Jan 2020 03:04:30 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Jan 2020 19:04:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,340,1574150400"; d="scan'208";a="306802525" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga001.jf.intel.com with ESMTP; 19 Jan 2020 19:04:28 -0800 From: Wei Yang To: akpm@linux-foundation.org, richardw.yang@linux.intel.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, rientjes@google.com Subject: [Patch v2 4/4] mm/page_alloc.c: extract commom part to check page Date: Mon, 20 Jan 2020 11:04:15 +0800 Message-Id: <20200120030415.15925-5-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200120030415.15925-1-richardw.yang@linux.intel.com> References: <20200120030415.15925-1-richardw.yang@linux.intel.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: During free and new page, we did some check on the status of page struct. There is some common part, just extract them. Besides this, this patch also rename two functions to keep the name convention, since free_pages_check_bad/free_pages_check are counterparts of check_new_page_bad/check_new_page. Signed-off-by: Wei Yang --- mm/page_alloc.c | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a7b793c739fc..7f23cc836f90 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1025,36 +1025,44 @@ static inline bool page_expected_state(struct page *page, return true; } -static void free_pages_check_bad(struct page *page) +static inline int __check_page(struct page *page, int nr, + const char **bad_reason) { - const char *bad_reason[5]; - unsigned long bad_flags = 0; - int nr = 0; - if (unlikely(atomic_read(&page->_mapcount) != -1)) bad_reason[nr++] = "nonzero mapcount"; if (unlikely(page->mapping != NULL)) bad_reason[nr++] = "non-NULL mapping"; if (unlikely(page_ref_count(page) != 0)) bad_reason[nr++] = "nonzero _refcount"; - if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_FREE)) { - bad_reason[nr++] = "PAGE_FLAGS_CHECK_AT_FREE flag(s) set"; - bad_flags = PAGE_FLAGS_CHECK_AT_FREE; - } #ifdef CONFIG_MEMCG if (unlikely(page->mem_cgroup)) bad_reason[nr++] = "page still charged to cgroup"; #endif + + return nr; +} + +static void check_free_page_bad(struct page *page) +{ + const char *bad_reason[5]; + unsigned long bad_flags = 0; + int nr = 0; + + nr = __check_page(page, nr, bad_reason); + if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_FREE)) { + bad_reason[nr++] = "PAGE_FLAGS_CHECK_AT_FREE flag(s) set"; + bad_flags = PAGE_FLAGS_CHECK_AT_FREE; + } bad_page(page, nr, bad_reason, bad_flags); } -static inline int free_pages_check(struct page *page) +static inline int check_free_page(struct page *page) { if (likely(page_expected_state(page, PAGE_FLAGS_CHECK_AT_FREE))) return 0; /* Something has gone sideways, find it */ - free_pages_check_bad(page); + check_free_page_bad(page); return 1; } @@ -1145,7 +1153,7 @@ static __always_inline bool free_pages_prepare(struct page *page, for (i = 1; i < (1 << order); i++) { if (compound) bad += free_tail_pages_check(page, page + i); - if (unlikely(free_pages_check(page + i))) { + if (unlikely(check_free_page(page + i))) { bad++; continue; } @@ -1157,7 +1165,7 @@ static __always_inline bool free_pages_prepare(struct page *page, if (memcg_kmem_enabled() && PageKmemcg(page)) __memcg_kmem_uncharge(page, order); if (check_free) - bad += free_pages_check(page); + bad += check_free_page(page); if (bad) return false; @@ -1204,7 +1212,7 @@ static bool free_pcp_prepare(struct page *page) static bool bulkfree_pcp_prepare(struct page *page) { if (debug_pagealloc_enabled_static()) - return free_pages_check(page); + return check_free_page(page); else return false; } @@ -1225,7 +1233,7 @@ static bool free_pcp_prepare(struct page *page) static bool bulkfree_pcp_prepare(struct page *page) { - return free_pages_check(page); + return check_free_page(page); } #endif /* CONFIG_DEBUG_VM */ @@ -2048,12 +2056,7 @@ static void check_new_page_bad(struct page *page) unsigned long bad_flags = 0; int nr = 0; - if (unlikely(atomic_read(&page->_mapcount) != -1)) - bad_reason[nr++] = "nonzero mapcount"; - if (unlikely(page->mapping != NULL)) - bad_reason[nr++] = "non-NULL mapping"; - if (unlikely(page_ref_count(page) != 0)) - bad_reason[nr++] = "nonzero _refcount"; + nr = __check_page(page, nr, bad_reason); if (unlikely(page->flags & __PG_HWPOISON)) { /* Don't complain about hwpoisoned pages */ page_mapcount_reset(page); /* remove PageBuddy */ @@ -2063,10 +2066,6 @@ static void check_new_page_bad(struct page *page) bad_reason[nr++] = "PAGE_FLAGS_CHECK_AT_PREP flag set"; bad_flags = PAGE_FLAGS_CHECK_AT_PREP; } -#ifdef CONFIG_MEMCG - if (unlikely(page->mem_cgroup)) - bad_reason[nr++] = "page still charged to cgroup"; -#endif bad_page(page, 1, bad_reason, bad_flags); }