From: Liming Wu <liming.wu@jaguarmicro.com>
Date: Fri, 25 Aug 2023 02:35:00 +0000 (+0800)
Subject: sched/debug: Avoid checking in_atomic_preempt_off() twice in schedule_debug()
X-Git-Tag: v6.7-rc1~192^2~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc461c48deda8a2d243fbaf49e276d555eb833d8;p=thirdparty%2Flinux.git

sched/debug: Avoid checking in_atomic_preempt_off() twice in schedule_debug()

in_atomic_preempt_off() already gets called in schedule_debug() once,
which is the only caller of __schedule_bug().

Skip the second call within __schedule_bug(), it should always be true
at this point.

[ mingo: Clarified the changelog. ]

Signed-off-by: Liming Wu <liming.wu@jaguarmicro.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230825023501.1848-1-liming.wu@jaguarmicro.com
---

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 52ceb85b64211..107493469b4e1 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5899,8 +5899,7 @@ static noinline void __schedule_bug(struct task_struct *prev)
 	print_modules();
 	if (irqs_disabled())
 		print_irqtrace_events(prev);
-	if (IS_ENABLED(CONFIG_DEBUG_PREEMPT)
-	    && in_atomic_preempt_off()) {
+	if (IS_ENABLED(CONFIG_DEBUG_PREEMPT)) {
 		pr_err("Preemption disabled at:");
 		print_ip_sym(KERN_ERR, preempt_disable_ip);
 	}