summaryrefslogtreecommitdiffstats
path: root/kernel/printk/printk.c
diff options
context:
space:
mode:
authorSergey Senozhatsky <sergey.senozhatsky@gmail.com>2018-10-02 04:38:36 +0200
committerPetr Mladek <pmladek@suse.com>2018-10-12 10:03:39 +0200
commit0e96a19c4450253c3ddcff69140b1096f2c2adaf (patch)
tree34c8f6ef6c27265137829d293e5f36e3480a2232 /kernel/printk/printk.c
parentprintk: lock/unlock console only for new logbuf entries (diff)
downloadlinux-0e96a19c4450253c3ddcff69140b1096f2c2adaf.tar.xz
linux-0e96a19c4450253c3ddcff69140b1096f2c2adaf.zip
printk: do not preliminary split up cont buffer
We have a proper 'overflow' check which tells us that we need to split up existing cont buffer in separate records: if (cont.len + len > sizeof(cont.buf)) cont_flush(); At the same time we also have one extra flush: "if cont buffer is 80% full then split it up" in cont_add(): if (cont.len > (sizeof(cont.buf) * 80) / 100) cont_flush(); This looks to be redundant, since the existing "overflow" check should work just fine, so remove this 80% check and wait for either a normal cont termination \n, for preliminary flush due to possible buffer overflow or for preliminary flush due to cont race. Link: http://lkml.kernel.org/r/20181002023836.4487-4-sergey.senozhatsky@gmail.com To: Steven Rostedt <rostedt@goodmis.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Dmitriy Vyukov <dvyukov@google.com> Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> Cc: Tejun Heo <tj@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: LKML <linux-kernel@vger.kernel.org> Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Petr Mladek <pmladek@suse.com>
Diffstat (limited to 'kernel/printk/printk.c')
-rw-r--r--kernel/printk/printk.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index e9a7e50ed60a..505663bb4f1f 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -1796,9 +1796,6 @@ static bool cont_add(int facility, int level, enum log_flags flags, const char *
cont_flush();
}
- if (cont.len > (sizeof(cont.buf) * 80) / 100)
- cont_flush();
-
return true;
}