From patchwork Thu Apr 16 23:03:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 461858 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 000C0140273 for ; Fri, 17 Apr 2015 09:05:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=D4G0PhQk; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753794AbbDPXFE (ORCPT ); Thu, 16 Apr 2015 19:05:04 -0400 Received: from mail-qk0-f171.google.com ([209.85.220.171]:35065 "EHLO mail-qk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753527AbbDPXEW (ORCPT ); Thu, 16 Apr 2015 19:04:22 -0400 Received: by qkhg7 with SMTP id g7so142778136qkh.2; Thu, 16 Apr 2015 16:04:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=6Vks37+V+v77qPlNsOvgWd5cn5qaGyf7cX6K86K+KZo=; b=D4G0PhQkWIHNNx7bDpAPM3HkCL0Yf8sIDQK3zX4KN/iuQO2JRvzqkngf2A5GtW+hXH h/+PQRGR8pxBoup43Ik9+N9nHuVaH1ckdu5Wr50s8cgBT+xGKJHXIQPoaRvi8RrjtD9J q4OB33onbXE+e1p1DHqVuPbOYzmMvAnHaKEwmKtWPVd6J1Yegof+tn8RCujbNK7mm7tc XKZeR/NmZ2caF9PWUVALAFTXm/c0TR3e6f8eob+jKePn3LuAKFN6lcBoBP3jU2Tac5Ct Xn1C/l6X76i+8JxCi/gJnuMpkY+5DJd9SHJX9cBAScW1JIOcqV6ghJ6UzyMp+aR2mgj8 zhOA== X-Received: by 10.140.27.162 with SMTP id 31mr175276qgx.64.1429225462033; Thu, 16 Apr 2015 16:04:22 -0700 (PDT) Received: from htj.duckdns.org.lan (207-38-238-8.c3-0.wsd-ubr1.qens-wsd.ny.cable.rcn.com. [207.38.238.8]) by mx.google.com with ESMTPSA id z77sm6677670qkg.44.2015.04.16.16.04.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Apr 2015 16:04:21 -0700 (PDT) From: Tejun Heo To: akpm@linux-foundation.org, davem@davemloft.net Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Tejun Heo , Kay Sievers , Petr Mladek Subject: [PATCH 03/16] printk: move LOG_NOCONS skipping into call_console_drivers() Date: Thu, 16 Apr 2015 19:03:40 -0400 Message-Id: <1429225433-11946-4-git-send-email-tj@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1429225433-11946-1-git-send-email-tj@kernel.org> References: <1429225433-11946-1-git-send-email-tj@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When a line is printed by multiple printk invocations, each chunk is directly sent out to console drivers so that they don't get lost. When the line is completed and stored in the log buffer, the line is suppressed from going out to consoles as that'd lead to duplicate outputs. This is tracked with LOG_NOCONS flag. The suppression is currently implemented in console_unlock() which skips invoking call_console_drivers() for LOG_NOCONS messages. This patch moves the filtering into call_console_drivers() in preparation of the planned extended console drivers which will deal with the duplicate messages themselves. While this makes call_console_drivers() iterate over LOG_NOCONS messages, this is extremely unlikely to matter especially given that continuation lines aren't that common and also simplifies console_unlock() a bit. Signed-off-by: Tejun Heo Cc: Kay Sievers Cc: Petr Mladek Reviewed-by: Petr Mladek --- kernel/printk/printk.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 5ea6709..0175c46 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1417,7 +1417,8 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) * log_buf[start] to log_buf[end - 1]. * The console_lock must be held. */ -static void call_console_drivers(int level, const char *text, size_t len) +static void call_console_drivers(int level, bool nocons, + const char *text, size_t len) { struct console *con; @@ -1438,6 +1439,13 @@ static void call_console_drivers(int level, const char *text, size_t len) if (!cpu_online(smp_processor_id()) && !(con->flags & CON_ANYTIME)) continue; + /* + * Skip record we have buffered and already printed + * directly to the console when we received it. + */ + if (nocons) + continue; + con->write(con, text, len); } } @@ -1919,7 +1927,8 @@ static struct cont { } cont; static struct printk_log *log_from_idx(u32 idx) { return NULL; } static u32 log_next(u32 idx) { return 0; } -static void call_console_drivers(int level, const char *text, size_t len) {} +static void call_console_drivers(int level, bool nocons, + const char *text, size_t len) {} static size_t msg_print_text(const struct printk_log *msg, enum log_flags prev, bool syslog, char *buf, size_t size) { return 0; } static size_t cont_print_text(char *text, size_t size) { return 0; } @@ -2190,7 +2199,7 @@ static void console_cont_flush(char *text, size_t size) len = cont_print_text(text, size); raw_spin_unlock(&logbuf_lock); stop_critical_timings(); - call_console_drivers(cont.level, text, len); + call_console_drivers(cont.level, false, text, len); start_critical_timings(); local_irq_restore(flags); return; @@ -2234,6 +2243,7 @@ again: struct printk_log *msg; size_t len; int level; + bool nocons; raw_spin_lock_irqsave(&logbuf_lock, flags); if (seen_seq != log_next_seq) { @@ -2252,38 +2262,30 @@ again: } else { len = 0; } -skip: + if (console_seq == log_next_seq) break; msg = log_from_idx(console_idx); - if (msg->flags & LOG_NOCONS) { - /* - * Skip record we have buffered and already printed - * directly to the console when we received it. - */ - console_idx = log_next(console_idx); - console_seq++; - /* - * We will get here again when we register a new - * CON_PRINTBUFFER console. Clear the flag so we - * will properly dump everything later. - */ - msg->flags &= ~LOG_NOCONS; - console_prev = msg->flags; - goto skip; - } - level = msg->level; + nocons = msg->flags & LOG_NOCONS; len += msg_print_text(msg, console_prev, false, text + len, sizeof(text) - len); console_idx = log_next(console_idx); console_seq++; console_prev = msg->flags; + + /* + * The log will be processed again when we register a new + * CON_PRINTBUFFER console. Clear the flag so we will + * properly dump everything later. + */ + msg->flags &= ~LOG_NOCONS; + raw_spin_unlock(&logbuf_lock); stop_critical_timings(); /* don't trace print latency */ - call_console_drivers(level, text, len); + call_console_drivers(level, nocons, text, len); start_critical_timings(); local_irq_restore(flags); }