Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2100654ybl; Sun, 19 Jan 2020 19:06:03 -0800 (PST) X-Google-Smtp-Source: APXvYqxnke58r7JjKQZLmycEbgqmk4yc4U4Y+0XQfK71YY78LhKtMfdVWDhOe3KSp6j/M2xogdp3 X-Received: by 2002:a9d:588d:: with SMTP id x13mr13764064otg.6.1579489563302; Sun, 19 Jan 2020 19:06:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579489563; cv=none; d=google.com; s=arc-20160816; b=CdhyZ6uZUL8t85NhGzIm4/USokBtjYLUcmctnAsyP+0WmQ8pT4V7NjnndUVGRh3lNZ Fw2JXFSU2gfenXhGKnOQcoDYMVU3b6gkgZPQ5MB6ISkBt44ou7QuKzytSvdXzCYC4nbt r04flTt//Ln+p7b4gDjnwb8vFyQjksJMxxl3UwOEvQ486Ma0EFBfl1rzze6D+AbiDPlQ k/SafYK3pnPHTrFpXrfNHWh4Quv6eZ3mzY9WPczYD4FixKuoBZeEm63HCygRZiqhp/+q j4oV0XFKMi5pOfDzUUH3rGq7/QMuq5zyXakkcagw9POWwuBZ7jfy2V3q7O7lPSKcZJ+o NhkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=lL1zI5ScBpR95/+frNMR7vBV2wYe8oEnMCMtPhtwcP8=; b=wjDCGU5MoewigT08acAzYUF+P0EPu4IumY0MhvSCr73pj5qQcuCuAm0F7bwYW1txQF j7LqNVTLDaClePtwHvF6Vaiwk/ZNICXVbVLm7k3VpMXmIX8NwZQvTRVcFJtFmZshxw/Y 3L7Fnm4+VNy3WQdc5nnNsxw1Z8qvvSVKfZM1JWmztczNGy7ZCOwG429TKkVylsvHqaF5 fBgWVy3/Duu8k1SAR1n46T8JKvvxC9nS/Obdia/lKghtuYh9s5g3kWBgPgP3Cy9IoD6W 8hDNctI7PUrwrI68Tyuu/HUnRODrZq0+ST1NdalAK3JGHu/KyzkqqRlVHsXekyARIbwr o5Ew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v76si17262164oif.207.2020.01.19.19.05.51; Sun, 19 Jan 2020 19:06:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729154AbgATDEb (ORCPT + 99 others); Sun, 19 Jan 2020 22:04:31 -0500 Received: from mga04.intel.com ([192.55.52.120]:51507 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729142AbgATDE2 (ORCPT ); Sun, 19 Jan 2020 22:04:28 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Jan 2020 19:04:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,340,1574150400"; d="scan'208";a="306802521" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga001.jf.intel.com with ESMTP; 19 Jan 2020 19:04:26 -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 3/4] mm/page_alloc.c: pass all bad reasons to bad_page() Date: Mon, 20 Jan 2020 11:04:14 +0800 Message-Id: <20200120030415.15925-4-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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now we can pass all bad reasons to __dump_page(). Signed-off-by: Wei Yang --- mm/page_alloc.c | 52 ++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a43b9d2482f2..a7b793c739fc 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -609,7 +609,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, +static void bad_page(struct page *page, int nr, const char **reason, unsigned long bad_flags) { static unsigned long resume; @@ -638,7 +638,7 @@ 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, 1, &reason); + __dump_page(page, nr, reason); bad_flags &= page->flags; if (bad_flags) pr_alert("bad because of flags: %#lx(%pGp)\n", @@ -1027,27 +1027,25 @@ 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[5]; + unsigned long bad_flags = 0; + int nr = 0; if (unlikely(atomic_read(&page->_mapcount) != -1)) - bad_reason = "nonzero mapcount"; + bad_reason[nr++] = "nonzero mapcount"; if (unlikely(page->mapping != NULL)) - bad_reason = "non-NULL mapping"; + bad_reason[nr++] = "non-NULL mapping"; if (unlikely(page_ref_count(page) != 0)) - bad_reason = "nonzero _refcount"; + bad_reason[nr++] = "nonzero _refcount"; if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_FREE)) { - bad_reason = "PAGE_FLAGS_CHECK_AT_FREE flag(s) set"; + 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 = "page still charged to cgroup"; + bad_reason[nr++] = "page still charged to cgroup"; #endif - bad_page(page, bad_reason, bad_flags); + bad_page(page, nr, bad_reason, bad_flags); } static inline int free_pages_check(struct page *page) @@ -1062,6 +1060,7 @@ static inline int free_pages_check(struct page *page) static int free_tail_pages_check(struct page *head_page, struct page *page) { + const char *reason; int ret = 1; /* @@ -1078,7 +1077,8 @@ 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); + reason = "nonzero compound_mapcount"; + bad_page(page, 1, &reason, 0); goto out; } break; @@ -1090,17 +1090,20 @@ 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); + reason = "corrupted mapping in tail page"; + bad_page(page, 1, &reason, 0); goto out; } break; } if (unlikely(!PageTail(page))) { - bad_page(page, "PageTail not set", 0); + reason = "PageTail not set"; + bad_page(page, 1, &reason, 0); goto out; } if (unlikely(compound_head(page) != head_page)) { - bad_page(page, "compound_head not consistent", 0); + reason = "compound_head not consistent"; + bad_page(page, 1, &reason, 0); goto out; } ret = 0; @@ -2041,29 +2044,30 @@ static inline void expand(struct zone *zone, struct page *page, static void check_new_page_bad(struct page *page) { - const char *bad_reason = NULL; + const char *bad_reason[5]; unsigned long bad_flags = 0; + int nr = 0; if (unlikely(atomic_read(&page->_mapcount) != -1)) - bad_reason = "nonzero mapcount"; + bad_reason[nr++] = "nonzero mapcount"; if (unlikely(page->mapping != NULL)) - bad_reason = "non-NULL mapping"; + bad_reason[nr++] = "non-NULL mapping"; if (unlikely(page_ref_count(page) != 0)) - bad_reason = "nonzero _refcount"; + bad_reason[nr++] = "nonzero _refcount"; if (unlikely(page->flags & __PG_HWPOISON)) { /* Don't complain about hwpoisoned pages */ page_mapcount_reset(page); /* remove PageBuddy */ return; } if (unlikely(page->flags & PAGE_FLAGS_CHECK_AT_PREP)) { - bad_reason = "PAGE_FLAGS_CHECK_AT_PREP flag set"; + 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 = "page still charged to cgroup"; + bad_reason[nr++] = "page still charged to cgroup"; #endif - bad_page(page, bad_reason, bad_flags); + bad_page(page, 1, bad_reason, bad_flags); } /* -- 2.17.1