Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755196AbdDDXDS (ORCPT ); Tue, 4 Apr 2017 19:03:18 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:51453 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754251AbdDDXDQ (ORCPT ); Tue, 4 Apr 2017 19:03:16 -0400 Smtp-Origin-Hostprefix: devbig From: Calvin Owens Smtp-Origin-Hostname: devbig337.prn1.facebook.com To: Petr Mladek , Sergey Senozhatsky , Steven Rostedt CC: Greg Kroah-Hartman , Jiri Slaby , Andrew Morton , Calvin Owens , =?UTF-8?q?Manuel=20Sch=C3=B6lling?= , Hans de Goede , Paul Burton , , Smtp-Origin-Cluster: prn1c29 Subject: [RFC][PATCH 1/2] printk: Introduce per-console filtering of messages by loglevel Date: Tue, 4 Apr 2017 16:02:48 -0700 Message-ID: X-Mailer: git-send-email 2.9.3 X-FB-Internal: Safe MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-04-04_21:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3778 Lines: 96 Not all consoles are created equal: depending on the actual hardware, the latency of a printk() call can vary dramatically. The worst examples are serial consoles, where it can spin for tens of milliseconds banging the UART to emit a message, which can cause application-level problems when the kernel spews onto the console. At Facebook we use netconsole to monitor our fleet, but we still have serial consoles attached on each host for live debugging, and the latter has caused problems. An obvious solution is to disable the kernel console output to ttyS0, but this makes live debugging frustrating, since crashes become silent and opaque to the ttyS0 user. Enabling it on the fly when needed isn't feasible, since boxes you need to debug via serial are likely to be borked in ways that make this impossible. This puts us between a rock and a hard place: we'd love to set kernel.printk to KERN_INFO and get all the logs. But while netconsole is fast enough to permit that without perturbing userspace, ttyS0 is not, and we're forced to limit console logging to KERN_WARNING and higher. This patch lets us have our cake and eat it too: instead of being forced to limit all consoles verbosity based on the speed of the slowest one, we can limit each based on its own speed. A subsequent patch will introduce a simple sysfs interface for changing this setting. Signed-off-by: Calvin Owens --- include/linux/console.h | 1 + kernel/printk/printk.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/linux/console.h b/include/linux/console.h index 5949d18..764a2c0 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -147,6 +147,7 @@ struct console { int cflag; void *data; struct console *next; + int maxlevel; }; /* diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 2984fb0..5393928 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1562,7 +1562,7 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) * The console_lock must be held. */ static void call_console_drivers(const char *ext_text, size_t ext_len, - const char *text, size_t len) + const char *text, size_t len, int level) { struct console *con; @@ -1581,6 +1581,8 @@ static void call_console_drivers(const char *ext_text, size_t ext_len, if (!cpu_online(smp_processor_id()) && !(con->flags & CON_ANYTIME)) continue; + if (level > con->maxlevel) + continue; if (con->flags & CON_EXTENDED) con->write(con, ext_text, ext_len); else @@ -1869,7 +1871,7 @@ static ssize_t msg_print_ext_body(char *buf, size_t size, char *dict, size_t dict_len, char *text, size_t text_len) { return 0; } static void call_console_drivers(const char *ext_text, size_t ext_len, - const char *text, size_t len) {} + const char *text, size_t len, int level) {} static size_t msg_print_text(const struct printk_log *msg, bool syslog, char *buf, size_t size) { return 0; } static bool suppress_message_printing(int level) { return false; } @@ -2238,7 +2240,7 @@ void console_unlock(void) raw_spin_unlock(&logbuf_lock); stop_critical_timings(); /* don't trace print latency */ - call_console_drivers(ext_text, ext_len, text, len); + call_console_drivers(ext_text, ext_len, text, len, msg->level); start_critical_timings(); printk_safe_exit_irqrestore(flags); @@ -2504,6 +2506,11 @@ void register_console(struct console *newcon) newcon->flags &= ~CON_PRINTBUFFER; /* + * By default, the per-console loglevel filter permits all messages. + */ + newcon->maxlevel = LOGLEVEL_DEBUG; + + /* * Put this console in the list - keep the * preferred driver at the head of the list. */ -- 2.9.3