From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936808AbdEWI41 (ORCPT ); Tue, 23 May 2017 04:56:27 -0400 Received: from terminus.zytor.com ([65.50.211.136]:43627 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936793AbdEWI4W (ORCPT ); Tue, 23 May 2017 04:56:22 -0400 Date: Tue, 23 May 2017 01:51:45 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: linux-kernel@vger.kernel.org, mark.rutland@arm.com, hpa@zytor.com, gregkh@linuxfoundation.org, tglx@linutronix.de, torvalds@linux-foundation.org, peterz@infradead.org, mgorman@techsingularity.net, mingo@kernel.org, rostedt@goodmis.org Reply-To: tglx@linutronix.de, gregkh@linuxfoundation.org, mark.rutland@arm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, torvalds@linux-foundation.org, peterz@infradead.org, mgorman@techsingularity.net, mingo@kernel.org In-Reply-To: <20170516184735.528279534@linutronix.de> References: <20170516184735.528279534@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] mm: Adjust system_state check Git-Commit-ID: 8cdde385c7a33afbe13fd71351da0968540fa566 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8cdde385c7a33afbe13fd71351da0968540fa566 Gitweb: http://git.kernel.org/tip/8cdde385c7a33afbe13fd71351da0968540fa566 Author: Thomas Gleixner AuthorDate: Tue, 16 May 2017 20:42:39 +0200 Committer: Ingo Molnar CommitDate: Tue, 23 May 2017 10:01:36 +0200 mm: Adjust system_state check To enable smp_processor_id() and might_sleep() debug checks earlier, it's required to add system states between SYSTEM_BOOTING and SYSTEM_RUNNING. get_nid_for_pfn() checks for system_state == BOOTING to decide whether to use early_pfn_to_nid() when CONFIG_DEFERRED_STRUCT_PAGE_INIT=y. That check is dubious, because the switch to state RUNNING happes way after page_alloc_init_late() has been invoked. Change the check to less than RUNNING state so it covers the new intermediate states as well. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Acked-by: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Mark Rutland Cc: Mel Gorman Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/20170516184735.528279534@linutronix.de Signed-off-by: Ingo Molnar --- drivers/base/node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 5548f96..0440d95 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -377,7 +377,7 @@ static int __ref get_nid_for_pfn(unsigned long pfn) if (!pfn_valid_within(pfn)) return -1; #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT - if (system_state == SYSTEM_BOOTING) + if (system_state < SYSTEM_RUNNING) return early_pfn_to_nid(pfn); #endif page = pfn_to_page(pfn);