asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

printk: Do not miss new messages when replaying the log

Browse source 
[ Upstream commit f92b070f2dc89a8ff1a0cc8b608e20abef894c7d ]

The variable "exclusive_console" is used to reply all existing messages
on a newly registered console. It is cleared when all messages are out.

The problem is that new messages might appear in the meantime. These
are then visible only on the exclusive console.

The obvious solution is to clear "exclusive_console" after we replay
all messages that were already proceed before we started the reply.

Reported-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Link: http://lkml.kernel.org/r/20180913123406.14378-1-pmladek@suse.com
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: linux-kernel@vger.kernel.org
Acked-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Petr Mladek 2018-09-13 14:34:06 +02:00 committed by Greg Kroah-Hartman
parent 5a6f7274e6
commit cd120df118
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kernel/printk/printk.c
View file

@ -423,6 +423,7 @@ static u32 log_next_idx;
/* the next printk record to write to the console */ /* the next printk record to write to the console */
static u64 console_seq; static u64 console_seq;
static u32 console_idx; static u32 console_idx;
static u64 exclusive_console_stop_seq;
/* the next printk record to read after the last 'clear' command */ /* the next printk record to read after the last 'clear' command */
static u64 clear_seq; static u64 clear_seq;
@ -2014,6 +2015,7 @@ static u64 syslog_seq;
static u32 syslog_idx; static u32 syslog_idx;
static u64 console_seq; static u64 console_seq;
static u32 console_idx; static u32 console_idx;
static u64 exclusive_console_stop_seq;
static u64 log_first_seq; static u64 log_first_seq;
static u32 log_first_idx; static u32 log_first_idx;
static u64 log_next_seq; static u64 log_next_seq;
@ -2381,6 +2383,12 @@ skip:
goto skip; goto skip;
} }
/* Output to all consoles once old messages replayed. */
if (unlikely(exclusive_console &&
console_seq >= exclusive_console_stop_seq)) {
exclusive_console = NULL;
}
len += msg_print_text(msg, len += msg_print_text(msg,
console_msg_format & MSG_FORMAT_SYSLOG, console_msg_format & MSG_FORMAT_SYSLOG,
text + len, text + len,
@ -2423,10 +2431,6 @@ skip:
console_locked = 0; console_locked = 0;
/* Release the exclusive_console once it is used */
if (unlikely(exclusive_console))
exclusive_console = NULL;
raw_spin_unlock(&logbuf_lock); raw_spin_unlock(&logbuf_lock);
up_console_sem(); up_console_sem();
@ -2711,6 +2715,7 @@ void register_console(struct console *newcon)
* the already-registered consoles. * the already-registered consoles.
*/ */
exclusive_console = newcon; exclusive_console = newcon;
exclusive_console_stop_seq = console_seq;
} }
console_unlock(); console_unlock();
console_sysfs_notify(); console_sysfs_notify();