diff options
| author | Chao Qin <chao.qin@intel.com> | 2021-07-19 10:26:50 +0800 |
|---|---|---|
| committer | Luis Claudio R. Goncalves <lgoncalv@redhat.com> | 2023-02-18 22:05:25 -0300 |
| commit | 487c3b34a8ce80b3de6c8e134907975bcdf54608 (patch) | |
| tree | f123b0b73f938a3d9467901d6e422c844b3d5354 /kernel | |
| parent | a7fa961d74f158a26076892f6eedd75ac4e0db03 (diff) | |
| download | linux-rt-487c3b34a8ce80b3de6c8e134907975bcdf54608.tar.gz | |
printk: Enhance the condition check of msleep in pr_flush()
[ Upstream commit 83e9288d9c4295d1195e9d780fcbc42c72ba4a83 ]
There is msleep in pr_flush(). If call WARN() in the early boot
stage such as in early_initcall, pr_flush() will run into msleep
when process scheduler is not ready yet. And then the system will
sleep forever.
Before the system_state is SYSTEM_RUNNING, make sure DO NOT sleep
in pr_flush().
Fixes: c0b395bd0fe3("printk: add pr_flush()")
Signed-off-by: Chao Qin <chao.qin@intel.com>
Signed-off-by: Lili Li <lili.li@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: John Ogness <john.ogness@linutronix.de>
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/lkml/20210719022649.3444072-1-chao.qin@intel.com
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk/printk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 14cb111fe9f0..d2205872304d 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -3554,7 +3554,9 @@ bool pr_flush(int timeout_ms, bool reset_on_progress) u64 diff; u64 seq; - may_sleep = (preemptible() && !in_softirq()); + may_sleep = (preemptible() && + !in_softirq() && + system_state >= SYSTEM_RUNNING); seq = prb_next_seq(prb); |