Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49795757 authored by Petr Mladek's avatar Petr Mladek Committed by Linus Torvalds
Browse files

printk/kdb: handle more message headers 

Commit 4bcc595c ("printk: reinstate KERN_CONT for printing
continuation lines") allows to define more message headers for a single
message.  The motivation is that continuous lines might get mixed.
Therefore it make sense to define the right log level for every piece of
a cont line.

This patch introduces printk_skip_headers() that will skip all headers
and uses it in the kdb code instead of printk_skip_level().

This approach helps to fix other printk_skip_level() users
independently.

Link: http://lkml.kernel.org/r/1478695291-12169-3-git-send-email-pmladek@suse.com


Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Cc: Joe Perches <joe@perches.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Chris Mason <clm@fb.com>
Cc: Josef Bacik <jbacik@fb.com>
Cc: David Sterba <dsterba@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 22c2c7b2

include/linux/printk.h

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,14 @@ static inline const char *printk_skip_level(const char *buffer) 
	return buffer;

}



static inline const char *printk_skip_headers(const char *buffer)

{

	while (printk_get_level(buffer))

		buffer = printk_skip_level(buffer);



	return buffer;

}



#define CONSOLE_EXT_LOG_MAX	8192



/* printk's without a loglevel use this.. */

kernel/debug/kdb/kdb_io.c

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap) 
	 * Write to all consoles.

	 */

	retlen = strlen(kdb_buffer);

	cp = (char *) printk_skip_level(kdb_buffer);

	cp = (char *) printk_skip_headers(kdb_buffer);

	if (!dbg_kdb_mode && kgdb_connected) {

		gdbstub_msg_write(cp, retlen - (cp - kdb_buffer));

	} else {