mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-22 10:31:08 +00:00
f9f3f02db9
Rather than storing the iterator information in the registered kmsg_dumper structure, create a separate iterator structure. The kmsg_dump_iter structure can reside on the stack of the caller, thus allowing lockless use of the kmsg_dump functions. Update code that accesses the kernel logs using the kmsg_dumper structure to use the new kmsg_dump_iter structure. For kmsg_dumpers, this also means adding a call to kmsg_dump_rewind() to initialize the iterator. All this is in preparation for removal of @logbuf_lock. Signed-off-by: John Ogness <john.ogness@linutronix.de> Reviewed-by: Kees Cook <keescook@chromium.org> # pstore Reviewed-by: Petr Mladek <pmladek@suse.com> Signed-off-by: Petr Mladek <pmladek@suse.com> Link: https://lore.kernel.org/r/20210303101528.29901-13-john.ogness@linutronix.de
59 lines
1.2 KiB
C
59 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/kmsg_dump.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/console.h>
|
|
#include <linux/string.h>
|
|
#include <shared/init.h>
|
|
#include <shared/kern.h>
|
|
#include <os.h>
|
|
|
|
static void kmsg_dumper_stdout(struct kmsg_dumper *dumper,
|
|
enum kmsg_dump_reason reason)
|
|
{
|
|
static struct kmsg_dump_iter iter;
|
|
static DEFINE_SPINLOCK(lock);
|
|
static char line[1024];
|
|
struct console *con;
|
|
unsigned long flags;
|
|
size_t len = 0;
|
|
|
|
/* only dump kmsg when no console is available */
|
|
if (!console_trylock())
|
|
return;
|
|
|
|
for_each_console(con) {
|
|
if(strcmp(con->name, "tty") == 0 &&
|
|
(con->flags & (CON_ENABLED | CON_CONSDEV)) != 0) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
console_unlock();
|
|
|
|
if (con)
|
|
return;
|
|
|
|
if (!spin_trylock_irqsave(&lock, flags))
|
|
return;
|
|
|
|
kmsg_dump_rewind(&iter);
|
|
|
|
printf("kmsg_dump:\n");
|
|
while (kmsg_dump_get_line(&iter, true, line, sizeof(line), &len)) {
|
|
line[len] = '\0';
|
|
printf("%s", line);
|
|
}
|
|
|
|
spin_unlock_irqrestore(&lock, flags);
|
|
}
|
|
|
|
static struct kmsg_dumper kmsg_dumper = {
|
|
.dump = kmsg_dumper_stdout
|
|
};
|
|
|
|
int __init kmsg_dumper_stdout_init(void)
|
|
{
|
|
return kmsg_dump_register(&kmsg_dumper);
|
|
}
|
|
|
|
__uml_postsetup(kmsg_dumper_stdout_init);
|