[4.4,v1,14/17] mm/vmscan: Adjust system_state checks

Message ID	1739170545-25011-15-git-send-email-kazuhiro3.hayashi@toshiba.co.jp
State	New
Headers	show Received: from mo-csw.securemx.jp (mo-csw1122.securemx.jp [210.130.202.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 985C01ADC79; Mon, 10 Feb 2025 06:56:50 +0000 (UTC) From: Kazuhiro Hayashi <kazuhiro3.hayashi@toshiba.co.jp> To: linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, cip-dev@lists.cip-project.org Cc: bigeasy@linutronix.de, tglx@linutronix.de, rostedt@goodmis.org, linux-rt-users@vger.kernel.org, pavel@denx.de Subject: [PATCH 4.4 v1 14/17] mm/vmscan: Adjust system_state checks Date: Mon, 10 Feb 2025 15:55:42 +0900 Message-Id: <1739170545-25011-15-git-send-email-kazuhiro3.hayashi@toshiba.co.jp> In-Reply-To: <1739170545-25011-1-git-send-email-kazuhiro3.hayashi@toshiba.co.jp> References: <1739170545-25011-1-git-send-email-kazuhiro3.hayashi@toshiba.co.jp> Precedence: bulk
Series	Backport fixes that depends on SYSTEM_SCHEDULING \| expand [4.4,v1,00/17] Backport fixes that depends on SYSTEM_SCHEDULING [4.4,v1,01/17] init: Pin init task to the boot CPU, initially [4.4,v1,02/17] arm: Adjust system_state check [4.4,v1,03/17] arm64: Adjust system_state check [4.4,v1,04/17] x86/smp: Adjust system_state check [4.4,v1,05/17] metag: Adjust system_state check [4.4,v1,06/17] powerpc: Adjust system_state check [4.4,v1,07/17] ACPI: Adjust system_state check [4.4,v1,08/17] mm: Adjust system_state check [4.4,v1,09/17] cpufreq/pasemi: Adjust system_state check [4.4,v1,10/17] iommu/vt-d: Adjust system_state checks [4.4,v1,11/17] async: Adjust system_state checks [4.4,v1,12/17] extable: Adjust system_state checks [4.4,v1,13/17] printk: Adjust system_state checks [4.4,v1,14/17] mm/vmscan: Adjust system_state checks [4.4,v1,15/17] init: Introduce SYSTEM_SCHEDULING state [4.4,v1,16/17] sched/core: Enable might_sleep() and smp_processor_id() checks early [4.4,v1,17/17] mm: slub: allocate_slab() enables IRQ right after scheduler starts

Message ID

1739170545-25011-15-git-send-email-kazuhiro3.hayashi@toshiba.co.jp

State

New

Headers

From: Kazuhiro Hayashi <kazuhiro3.hayashi@toshiba.co.jp>
To: linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev,
        cip-dev@lists.cip-project.org
Cc: bigeasy@linutronix.de, tglx@linutronix.de, rostedt@goodmis.org,
        linux-rt-users@vger.kernel.org, pavel@denx.de
Subject: [PATCH 4.4 v1 14/17] mm/vmscan: Adjust system_state checks
Date: Mon, 10 Feb 2025 15:55:42 +0900
Message-Id: 
 <1739170545-25011-15-git-send-email-kazuhiro3.hayashi@toshiba.co.jp>
In-Reply-To: 
 <1739170545-25011-1-git-send-email-kazuhiro3.hayashi@toshiba.co.jp>
References: 
 <1739170545-25011-1-git-send-email-kazuhiro3.hayashi@toshiba.co.jp>
Precedence: bulk

Series

Backport fixes that depends on SYSTEM_SCHEDULING | expand

Commit Message

Kazuhiro Hayashi Feb. 10, 2025, 6:55 a.m. UTC

From: Thomas Gleixner <tglx@linutronix.de>

commit c6202adf3a0969514299cf10ff07376a84ad09bb upstream.

To enable smp_processor_id() and might_sleep() debug checks earlier, it's
required to add system states between SYSTEM_BOOTING and SYSTEM_RUNNING.

Adjust the system_state check in kswapd_run() to handle the extra states.

Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170516184736.119158930@linutronix.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Kazuhiro Hayashi <kazuhiro3.hayashi@toshiba.co.jp>
---
 mm/vmscan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 76853088f66b..9cd702320375 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3620,7 +3620,7 @@  int kswapd_run(int nid)
 	pgdat->kswapd = kthread_run(kswapd, pgdat, "kswapd%d", nid);
 	if (IS_ERR(pgdat->kswapd)) {
 		/* failure at boot is fatal */
-		BUG_ON(system_state == SYSTEM_BOOTING);
+		BUG_ON(system_state < SYSTEM_RUNNING);
 		pr_err("Failed to start kswapd on node %d\n", nid);
 		ret = PTR_ERR(pgdat->kswapd);
 		pgdat->kswapd = NULL;

[4.4,v1,14/17] mm/vmscan: Adjust system_state checks

Commit Message

Patch