Skip to contentSkip to conversation

ratelimit: Fix/allow use in atomic contexts

tip:core/printk tip-bot for Ingo Molnar 2 participants 2 messages Sep 22, 2009 Library code

lore
Share & tools
lore
#0 lore raw
Commit-ID:  edaac8e3167501cda336231d00611bf59c164346
Gitweb:     http://git.kernel.org/tip/edaac8e3167501cda336231d00611bf59c164346
Author:     Ingo Molnar <[email protected]>
AuthorDate: Tue, 22 Sep 2009 14:44:11 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 22 Sep 2009 14:05:48 +0200

ratelimit: Fix/allow use in atomic contexts

I'd like to use printk_ratelimit() in NMI context, but it's not robust right now due to spinlock usage in lib/ratelimit.c. If an NMI is unlucky enough to hit just that spot we might lock up trying to take the spinlock again.

Fix that by using a trylock variant. If we contend on that lock we can genuinely skip the message because the state is just being accessed by another CPU (or by this CPU).

( We could use atomics for the suppressed messages field, but
i doubt it matters in practice and it makes the code heavier. )

Cc: Peter Zijlstra <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: David S. Miller <[email protected]>
LKML-Reference: <new-submission>

---
 lib/ratelimit.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
lib/ratelimit.c +9 -1
index 0e2c28e..69bfcac 100644
@@ -28,7 +28,15 @@ int __ratelimit(struct ratelimit_state *rs)
 	if (!rs->interval)
 		return 1;
 
-	spin_lock_irqsave(&rs->lock, flags);
+	/*
+	 * If we contend on this state's lock then almost
+	 * by definition we are too busy to print a message,
+	 * in addition to the one that will be printed by
+	 * the entity that is holding the lock already:
+	 */
+	if (!spin_trylock_irqsave(&rs->lock, flags))
+		return 1;
+
 	if (!rs->begin)
 		rs->begin = jiffies;
 
#1 lore raw
Quoted 11 lines · tip-bot for Ingo Molnar

ratelimit: Fix/allow use in atomic contexts

I'd like to use printk_ratelimit() in NMI context, but it's not robust right now due to spinlock usage in lib/ratelimit.c. If an NMI is unlucky enough to hit just that spot we might lock up trying to take the spinlock again.

Fix that by using a trylock variant. If we contend on that lock we can genuinely skip the message because the state is just being accessed by another CPU (or by this CPU).

Ack to both this and the patch leading up to it. Looks sane and simple.

Linus