From: John Ogness <john.ogness@linutronix.de>
To: Mukesh Ojha <quic_mojha@quicinc.com>,
pmladek@suse.com, rostedt@goodmis.org, senozhatsky@chromium.org
Cc: linux-kernel@vger.kernel.org, Mukesh Ojha <quic_mojha@quicinc.com>
Subject: Re: [PATCH] printk: Add atomic context check inside console_unlock()
Date: Thu, 22 Feb 2024 15:59:31 +0106 [thread overview]
Message-ID: <87plwo5z4k.fsf@jogness.linutronix.de> (raw)
In-Reply-To: <20240222090538.23017-1-quic_mojha@quicinc.com>
On 2024-02-22, Mukesh Ojha <quic_mojha@quicinc.com> wrote:
> Situation of schedule while atomic context can happen in a
> scenario if CPU-Y executing a async probe of ufs and while
> printing a line it is started spinning for console lock
> after preemption disable on CPU-Y and later it got the handover
> of console lock from CPU-X and in console_unlock() it get
> schedule with preempt disable as console_may_schedule was one
> and due to which do_cond_resched was one.
Nice catch. But I think the below patch is the appropriate fix:
John Ogness
-------8<--------
Subject: [PATCH] printk: Update @console_may_schedule in
console_trylock_spinning()
console_trylock_spinning() may takeover the console lock from a
scheduable context. Update @console_may_schedule to make sure it
reflects a trylock acquire.
Reported-by: Mukesh Ojha <quic_mojha@quicinc.com>
Link: https://lore.kernel.org/lkml/20240222090538.23017-1-quic_mojha@quicinc.com
Signed-off-by: John Ogness <john.ogness@linutronix.de>
---
kernel/printk/printk.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 1685a71f3f71..1612b50b2374 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2020,6 +2020,12 @@ static int console_trylock_spinning(void)
*/
mutex_acquire(&console_lock_dep_map, 0, 1, _THIS_IP_);
+ /*
+ * Update @console_may_schedule for trylock because the previous
+ * owner may have been scheduable.
+ */
+ console_may_schedule = 0;
+
return 1;
}
base-commit: e7081d5a9d976b84f61f497316d7c940a4a2e67a
--
2.30.2
next prev parent reply other threads:[~2024-02-22 14:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 9:05 [PATCH] printk: Add atomic context check inside console_unlock() Mukesh Ojha
2024-02-22 14:53 ` John Ogness [this message]
2024-02-26 10:17 ` Mukesh Ojha
2024-02-26 12:01 ` [PATCH] printk: Update @console_may_schedule in console_trylock_spinning() John Ogness
2024-02-26 12:17 ` Mukesh Ojha
2024-02-26 13:02 ` John Ogness
2024-02-27 16:37 ` Mukesh Ojha
2024-03-15 16:10 ` Petr Mladek
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=87plwo5z4k.fsf@jogness.linutronix.de \
--to=john.ogness@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=quic_mojha@quicinc.com \
--cc=rostedt@goodmis.org \
--cc=senozhatsky@chromium.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).