[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200927161130.33172-2-zhouchengming@bytedance.com>
Date: Mon, 28 Sep 2020 00:11:30 +0800
From: Chengming Zhou <zhouchengming@...edance.com>
To: linux-kernel@...r.kernel.org, pmladek@...e.com,
sergey.senozhatsky@...il.com, rostedt@...dmis.org,
mingo@...hat.com, peterz@...radead.org, juri.lelli@...hat.com,
vincent.guittot@...aro.org, dietmar.eggemann@....com,
bsegall@...gle.com, mgorman@...e.de
Cc: zhouchengming@...edance.com, songmuchun@...edance.com
Subject: [PATCH 2/2] sched: mark PRINTK_DEFERRED_CONTEXT_MASK in __schedule()
The WARN_ON/WARN_ON_ONCE with rq lock held in __schedule() should be
deferred by marking the PRINTK_DEFERRED_CONTEXT_MASK, or will cause
deadlock on rq lock in the printk path.
Signed-off-by: Chengming Zhou <zhouchengming@...edance.com>
Signed-off-by: Muchun Song <songmuchun@...edance.com>
---
kernel/sched/core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2d95dc3f4644..81d8bf614225 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4444,6 +4444,7 @@ static void __sched notrace __schedule(bool preempt)
*/
rq_lock(rq, &rf);
smp_mb__after_spinlock();
+ printk_deferred_enter();
/* Promote REQ to ACT */
rq->clock_update_flags <<= 1;
@@ -4530,6 +4531,7 @@ static void __sched notrace __schedule(bool preempt)
rq_unlock_irq(rq, &rf);
}
+ printk_deferred_exit();
balance_callback(rq);
}
--
2.11.0
Powered by blists - more mailing lists