85 lines
2.3 KiB
Diff
85 lines
2.3 KiB
Diff
|
From 81d025b3d82fe088bc97095d089fdf275ffd630d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||
|
|
Date: Thu, 21 Mar 2013 19:01:05 +0100
|
||
|
|
Subject: [PATCH 247/365] printk: Drop the logbuf_lock more often
|
||
|
|
|
||
|
|
The lock is hold with irgs off. The latency drops 500us+ on my arm bugs
|
||
|
|
with a "full" buffer after executing "dmesg" on the shell.
|
||
|
|
|
||
|
|
Change-Id: Ie465d7ef0ce5bac6a26c5c77f37904990fd811c0
|
||
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||
|
|
---
|
||
|
|
kernel/printk/printk.c | 27 ++++++++++++++++++++++++++-
|
||
|
|
1 file changed, 26 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
|
||
|
|
index 5be16920da43..23b352f2d725 100644
|
||
|
|
--- a/kernel/printk/printk.c
|
||
|
|
+++ b/kernel/printk/printk.c
|
||
|
|
@@ -1420,6 +1420,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
|
||
|
|
{
|
||
|
|
char *text;
|
||
|
|
int len = 0;
|
||
|
|
+ int attempts = 0;
|
||
|
|
|
||
|
|
text = kmalloc(LOG_LINE_MAX + PREFIX_MAX, GFP_KERNEL);
|
||
|
|
if (!text)
|
||
|
|
@@ -1430,6 +1431,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
|
||
|
|
u64 next_seq;
|
||
|
|
u64 seq;
|
||
|
|
u32 idx;
|
||
|
|
+ int num_msg;
|
||
|
|
+try_again:
|
||
|
|
+ attempts++;
|
||
|
|
+ if (attempts > 10) {
|
||
|
|
+ len = -EBUSY;
|
||
|
|
+ goto out;
|
||
|
|
+ }
|
||
|
|
+ num_msg = 0;
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Find first record that fits, including all following records,
|
||
|
|
@@ -1443,6 +1452,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
|
||
|
|
len += msg_print_text(msg, true, NULL, 0);
|
||
|
|
idx = log_next(idx);
|
||
|
|
seq++;
|
||
|
|
+ num_msg++;
|
||
|
|
+ if (num_msg > 5) {
|
||
|
|
+ num_msg = 0;
|
||
|
|
+ raw_spin_unlock_irq(&logbuf_lock);
|
||
|
|
+ raw_spin_lock_irq(&logbuf_lock);
|
||
|
|
+ if (clear_seq < log_first_seq)
|
||
|
|
+ goto try_again;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
/* move first record forward until length fits into the buffer */
|
||
|
|
@@ -1454,6 +1471,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
|
||
|
|
len -= msg_print_text(msg, true, NULL, 0);
|
||
|
|
idx = log_next(idx);
|
||
|
|
seq++;
|
||
|
|
+ num_msg++;
|
||
|
|
+ if (num_msg > 5) {
|
||
|
|
+ num_msg = 0;
|
||
|
|
+ raw_spin_unlock_irq(&logbuf_lock);
|
||
|
|
+ raw_spin_lock_irq(&logbuf_lock);
|
||
|
|
+ if (clear_seq < log_first_seq)
|
||
|
|
+ goto try_again;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
/* last message fitting into this dump */
|
||
|
|
@@ -1492,8 +1517,8 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
|
||
|
|
clear_seq = log_next_seq;
|
||
|
|
clear_idx = log_next_idx;
|
||
|
|
}
|
||
|
|
+out:
|
||
|
|
logbuf_unlock_irq();
|
||
|
|
-
|
||
|
|
kfree(text);
|
||
|
|
return len;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|