From patchwork Sat Apr 11 22:03:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 11484243 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 7B96514DD for ; Sat, 11 Apr 2020 22:04:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 38B8A2051A for ; Sat, 11 Apr 2020 22:04:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KX7MafkC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 38B8A2051A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id F27688E00B5; Sat, 11 Apr 2020 18:04:26 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id ED9288E0007; Sat, 11 Apr 2020 18:04:26 -0400 (EDT) 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 DC5C58E00B5; Sat, 11 Apr 2020 18:04:26 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0144.hostedemail.com [216.40.44.144]) by kanga.kvack.org (Postfix) with ESMTP id C44CF8E0007 for ; Sat, 11 Apr 2020 18:04:26 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 759C08248068 for ; Sat, 11 Apr 2020 22:04:26 +0000 (UTC) X-FDA: 76696953732.06.jelly38_60f0995346c60 X-Spam-Summary: 2,0,0,df4ad210702f7b64,d41d8cd98f00b204,richard.weiyang@gmail.com,,RULES_HIT:41:69:355:379:541:800:960:966:973:988:989:1260:1345:1359:1431:1437:1535:1544:1711:1730:1747:1777:1792:1963:2196:2199:2393:2553:2559:2562:3138:3139:3140:3141:3142:3355:3865:3866:3867:3870:3871:3872:4118:4321:4385:5007:6261:6653:7514:8634:8957:9413:9592:10004:11026:11473:11658:11914:12043:12296:12297:12438:12517:12519:12555:12683:12895:12986:14093:14096:14110:14181:14687:14721:21080:21444:21451:21611:21627:21666:30045:30054:30056:30090,0,RBL:209.85.128.67:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: jelly38_60f0995346c60 X-Filterd-Recvd-Size: 7097 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Sat, 11 Apr 2020 22:04:26 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id h2so5878997wmb.4 for ; Sat, 11 Apr 2020 15:04:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KKsXg0f3NdD1RgFQXGmR3Fbu1r4vifzR97uuZQ5qjxM=; b=KX7MafkC1W+C1oiAguRgAmmQ/8zUrKPK8XaJYVtkuGY17lbmlcE4iAmUjCzZDT4n/o 2bGqKBG4tHWUW1Sa0yU7by6nwTLUANieKuSHg2cGwaK3IQtfGIJ+Bpp0+abAMVrnJV5N idBxWJjRzEtxFcah/mq72O5dOLy++kAoLkKQeLfLYmSk/1bNhu+yJ/arzcob8PU63M6u 6TquNrmu0HmB5RNuuBfe+jUnfin8pZHZ6vWX7BqCMqEvSWDd7xjtyHQrEq/l28tZAl4q m+rxIBjcvVHZV7t/eGvRoCbD603Gz7+baSnBdQu5q3FdcYqrgkxwFfV83KZSozY+btW5 zVbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KKsXg0f3NdD1RgFQXGmR3Fbu1r4vifzR97uuZQ5qjxM=; b=AAyFW1L9ghsvmcWnMPREBrMU9KP9JUJZL1d6RwnuyGrkw6rnRvs0A1J3X9IujeYwu6 Yv8rPCVUyWy0064RLoICEKOcx/3AhzZHUg/6/WB2xy/++ViqHNwD+eNyby6Z/ELOdmqa KXCed801QnQyxYTcwgZSNijyRwVioKUPZMohLIDNA+co7MxJ40d9g7LCHs54ghqFztRk 0kCgSyI/9Kyk+tNw4rTokUBIQX7AG8KsN4LIAPrGCQv2CNWSEMdlEumN+g9r6g+LOww+ vqaBcM6aUUJudTY/z6IFaKDCT5Reols5FGtSHw3yKxNCwl8Mw9RVs+awo0oZTb9b0PTa hZtQ== X-Gm-Message-State: AGi0PuZKyVPJT+VoNaI40zpCjh4yv6P7t/2bCAn0HNNfpdhXk3ihrUam CvSQy+T/FIfdihykhbcRcDo= X-Google-Smtp-Source: APiQypKDq4zw21MwouB45kwsXuN8oJITstl2Ai6k0dSWqFCNwuWm6Q/U39+UCda6DFzIsZlamMpr7Q== X-Received: by 2002:a1c:2b06:: with SMTP id r6mr12167201wmr.25.1586642665117; Sat, 11 Apr 2020 15:04:25 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id a15sm7944996wme.17.2020.04.11.15.04.24 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 11 Apr 2020 15:04:24 -0700 (PDT) From: Wei Yang To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, rientjes@google.com, anshuman.khandual@arm.com, david@redhat.com, Wei Yang Subject: [Patch v3 2/5] mm/page_alloc.c: bad_flags is not necessary for bad_page() Date: Sat, 11 Apr 2020 22:03:54 +0000 Message-Id: <20200411220357.9636-3-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200411220357.9636-1-richard.weiyang@gmail.com> References: <20200411220357.9636-1-richard.weiyang@gmail.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: After commit 5b57b8f22709 ("mm/debug.c: always print flags in dump_page()"), page->flags is always printed for a bad page. It is not necessary to have bad_flags any more. Signed-off-by: Wei Yang Suggested-by: Anshuman Khandual --- mm/page_alloc.c | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7327dc039069..0648127af872 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -602,8 +602,7 @@ static inline int __maybe_unused bad_range(struct zone *zone, struct page *page) } #endif -static void bad_page(struct page *page, const char *reason, - unsigned long bad_flags) +static void bad_page(struct page *page, const char *reason) { static unsigned long resume; static unsigned long nr_shown; @@ -632,10 +631,6 @@ static void bad_page(struct page *page, const char *reason, pr_alert("BUG: Bad page state in process %s pfn:%05lx\n", current->comm, page_to_pfn(page)); __dump_page(page, reason); - bad_flags &= page->flags; - if (bad_flags) - pr_alert("bad because of flags: %#lx(%pGp)\n", - bad_flags, &bad_flags); dump_page_owner(page); print_modules(); @@ -1020,11 +1015,7 @@ static inline bool page_expected_state(struct page *page, static void free_pages_check_bad(struct page *page) { - const char *bad_reason; - unsigned long bad_flags; - - bad_reason = NULL; - bad_flags = 0; + const char *bad_reason = NULL; if (unlikely(atomic_read(&page->_mapcount) != -1)) bad_reason = "nonzero mapcount"; @@ -1032,15 +1023,13 @@ static void free_pages_check_bad(struct page *page) bad_reason = "non-NULL mapping"; if (unlikely(page_ref_count(page) != 0)) bad_reason = "nonzero _refcount"; - if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_FREE)) { + if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_FREE)) bad_reason = "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 = "page still charged to cgroup"; #endif - bad_page(page, bad_reason, bad_flags); + bad_page(page, bad_reason); } static inline int free_pages_check(struct page *page) @@ -1071,7 +1060,7 @@ static int free_tail_pages_check(struct page *head_page, struct page *page) case 1: /* the first tail page: ->mapping may be compound_mapcount() */ if (unlikely(compound_mapcount(page))) { - bad_page(page, "nonzero compound_mapcount", 0); + bad_page(page, "nonzero compound_mapcount"); goto out; } break; @@ -1083,17 +1072,17 @@ static int free_tail_pages_check(struct page *head_page, struct page *page) break; default: if (page->mapping != TAIL_MAPPING) { - bad_page(page, "corrupted mapping in tail page", 0); + bad_page(page, "corrupted mapping in tail page"); goto out; } break; } if (unlikely(!PageTail(page))) { - bad_page(page, "PageTail not set", 0); + bad_page(page, "PageTail not set"); goto out; } if (unlikely(compound_head(page) != head_page)) { - bad_page(page, "compound_head not consistent", 0); + bad_page(page, "compound_head not consistent"); goto out; } ret = 0; @@ -2035,7 +2024,6 @@ static inline void expand(struct zone *zone, struct page *page, static void check_new_page_bad(struct page *page) { const char *bad_reason = NULL; - unsigned long bad_flags = 0; if (unlikely(page->flags & __PG_HWPOISON)) { /* Don't complain about hwpoisoned pages */ @@ -2048,15 +2036,13 @@ static void check_new_page_bad(struct page *page) bad_reason = "non-NULL mapping"; if (unlikely(page_ref_count(page) != 0)) bad_reason = "nonzero _refcount"; - if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_PREP)) { + if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_PREP)) bad_reason = "PAGE_FLAGS_CHECK_AT_PREP flag set"; - bad_flags = PAGE_FLAGS_CHECK_AT_PREP; - } #ifdef CONFIG_MEMCG if (unlikely(page->mem_cgroup)) bad_reason = "page still charged to cgroup"; #endif - bad_page(page, bad_reason, bad_flags); + bad_page(page, bad_reason); } /*