LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: John Ogness <john.ogness@linutronix.de>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: "Qin\, Chao" <chao.qin@intel.com>, Joe Perches <joe@perches.com>,
	"linux-kernel\@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-rt-users\@vger.kernel.org"
	<linux-rt-users@vger.kernel.org>,
	"bigeasy\@linutronix.de" <bigeasy@linutronix.de>,
	"tglx\@linutronix.de" <tglx@linutronix.de>,
	"mgross\@linux.intel.com" <mgross@linux.intel.com>, "Mei\,
	Paul" <paul.mei@intel.com>, "Li\, Lili" <lili.li@intel.com>,
	"Qin\, Chao" <chao.qin@intel.com>
Subject: RE: [PREEMPT_RT][PATCH] printk: Enhance the condition check of msleep in pr_flush()
Date: Thu, 05 Aug 2021 14:27:25 +0206	[thread overview]
Message-ID: <87eeb8w08q.fsf@jogness.linutronix.de> (raw)
In-Reply-To: <DM6PR11MB380275B5125531E8EB9D019B92F29@DM6PR11MB3802.namprd11.prod.outlook.com>

Hello Steven,

Could you please cherry-pick 83e9288d9c42("printk: Enhance the condition
check of msleep in pr_flush()") from linux-rt-devel.git (branch
linux-5.14.y-rt-rebase) for the next stable v5.10-rt release?

The commit is provided below as well.

Thanks.

John Ogness

On 2021-08-05, "Qin, Chao" <chao.qin@intel.com> wrote:
> Do you have plan to backport this fix into v5.10.y-rt kernel?


From 83e9288d9c4295d1195e9d780fcbc42c72ba4a83 Mon Sep 17 00:00:00 2001
From: Chao Qin <chao.qin@intel.com>
Date: Mon, 19 Jul 2021 10:26:50 +0800
Subject: [PATCH] printk: Enhance the condition check of msleep in pr_flush()

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
---
 kernel/printk/printk.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index e4085e2cafb5..500ae4b18864 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -3661,7 +3661,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);
 
-- 
2.20.1

  reply	other threads:[~2021-08-05 12:21 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-19  2:26 chao.qin
2021-07-19 14:55 ` John Ogness
2021-07-30 14:01   ` Sebastian Andrzej Siewior
2021-07-30 14:46     ` John Ogness
2021-08-02  6:08       ` Qin, Chao
2021-08-02  6:48       ` Sebastian Andrzej Siewior
2021-07-20 11:55 ` Joe Perches
2021-07-20 14:03   ` John Ogness
2021-07-21  1:42     ` Qin, Chao
2021-08-05  3:01     ` Qin, Chao
2021-08-05 12:21       ` John Ogness [this message]
2021-08-05 16:12         ` Steven Rostedt
2021-08-06 18:34           ` Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87eeb8w08q.fsf@jogness.linutronix.de \
    --to=john.ogness@linutronix.de \
    --cc=bigeasy@linutronix.de \
    --cc=chao.qin@intel.com \
    --cc=joe@perches.com \
    --cc=lili.li@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rt-users@vger.kernel.org \
    --cc=mgross@linux.intel.com \
    --cc=paul.mei@intel.com \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    --subject='RE: [PREEMPT_RT][PATCH] printk: Enhance the condition check of msleep in pr_flush()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).