All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Zijlstra <peterz@infradead.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
	linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
	efault@gmx.de
Subject: Re: [PATCH 0/4] printk: Remove lockdep_off() and wakeups -v3
Date: Wed, 22 Jun 2011 11:20:09 +0200	[thread overview]
Message-ID: <1308734409.1022.14.camel@twins> (raw)
In-Reply-To: <20110621151725.705140475@chello.nl>

On Tue, 2011-06-21 at 17:17 +0200, Peter Zijlstra wrote:
> Patch 0b5e1c5255 from -tip needs to be reverted (or better dropped), due
> us discovering why doing up() under logbuf_lock was important -- thanks 
> Andrew, Ingo! 

Or we can do the below delta to fix things up..

---
Subject: printk: Fix-up console_sem vs logbuf_lock unlock race
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri Jun 10 12:05:38 CEST 2011

Fix up the fallout from commit 0b5e1c5255 (printk: Release console_sem
after logbuf_lock).

The reason for unlocking the console_sem under the logbuf_lock is that
a concurrent printk() might full up the buffer but fail to acquire the
console sem, resulting in a missed write to the console until a
subsequent console_sem acquire/release cycle.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
 kernel/printk.c |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

Index: linux-2.6/kernel/printk.c
===================================================================
--- linux-2.6.orig/kernel/printk.c
+++ linux-2.6/kernel/printk.c
@@ -1244,7 +1244,7 @@ void console_unlock(void)
 {
 	unsigned long flags;
 	unsigned _con_start, _log_end;
-	unsigned wake_klogd = 0;
+	unsigned wake_klogd = 0, retry = 0;
 
 	if (console_suspended) {
 		up(&console_sem);
@@ -1253,6 +1253,7 @@ void console_unlock(void)
 
 	console_may_schedule = 0;
 
+again:
 	for ( ; ; ) {
 		spin_lock_irqsave(&logbuf_lock, flags);
 		wake_klogd |= log_start - log_end;
@@ -1273,8 +1274,23 @@ void console_unlock(void)
 	if (unlikely(exclusive_console))
 		exclusive_console = NULL;
 
-	spin_unlock_irqrestore(&logbuf_lock, flags);
+	spin_unlock(&logbuf_lock);
+
 	up(&console_sem);
+
+	/*
+	 * Someone could have filled up the buffer again, so re-check if there's
+	 * something to flush. In case we cannot trylock the console_sem again,
+	 * there's a new owner and the console_unlock() from them will do the
+	 * flush, no worries.
+	 */
+	spin_lock(&logbuf_lock);
+	if (con_start != log_end)
+		retry = 1;
+	spin_unlock_irqrestore(&logbuf_lock, flags);
+	if (retry && console_trylock())
+		goto again;
+
 	if (wake_klogd)
 		wake_up_klogd();
 }


  parent reply	other threads:[~2011-06-22  9:20 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-21 15:17 Peter Zijlstra
2011-06-21 15:17 ` [PATCH 1/4] printk: Release console_sem after logbuf_lock Peter Zijlstra
2011-06-21 15:17 ` [PATCH 2/4] lockdep: Fix trace_{soft,hard}irqs_{on,off}() recursion Peter Zijlstra
2011-06-22 15:13   ` [tip:core/printk] lockdep: Fix trace_[soft,hard]irqs_[on,off]() recursion tip-bot for Peter Zijlstra
2011-06-21 15:17 ` [PATCH 3/4] printk, lockdep: Remove lockdep_off() usage Peter Zijlstra
2011-06-21 15:17 ` [PATCH 4/4] printk: Avoid all wakeups from printk Peter Zijlstra
2011-06-22  9:20 ` Peter Zijlstra [this message]
2011-06-22 11:50   ` [PATCH 0/4] printk: Remove lockdep_off() and wakeups -v3 Ingo Molnar
2011-06-22 13:44     ` Peter Zijlstra
2011-06-22 14:22   ` [tip:core/printk] printk: Fix console_sem vs logbuf_lock unlock race tip-bot for Peter Zijlstra

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=1308734409.1022.14.camel@twins \
    --to=peterz@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=efault@gmx.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: [PATCH 0/4] printk: Remove lockdep_off() and wakeups -v3' \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.