From patchwork Fri Nov 7 12:01:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 40394 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f72.google.com (mail-ee0-f72.google.com [74.125.83.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 28040240F7 for ; Fri, 7 Nov 2014 12:01:43 +0000 (UTC) Received: by mail-ee0-f72.google.com with SMTP id d17sf3270776eek.11 for ; Fri, 07 Nov 2014 04:01:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Q780ZbNG8TGQvUX1+X1HFFC/dPLkzD/SACQlMLdvTHM=; b=VJt+KOXla1CsEQxQNpbBeEGgSn696tgsDXs5WEuTii1yjX0AC7G2+ae2gjBAFzbhHK tQXEmtaLfaYwlbeI+GuOHRK3rSwCxpTaw7L/MsFnidxBLWHdR1w8RN0M3fSvoY+Vuiqw ns/dqXHZt92I97LwnF45E0sNMUaYLpdwUcDOo4o+WsE15HBQYc2tIQcw5101ev8vl9+w 9N8QgJRAc9+A8GmuW+ALo5umheoSsKthjHcwmgmxo42zD8Jq9WwP42iM3VfmFuDdbq5C woJRGrA6MmoDXr5K7mUBJY8zq1JSHFCedRFSHvstpzK+PhLCH6SEigl3adp/Mowvt6iu EhUg== X-Gm-Message-State: ALoCoQmZmoMO2HvRwyhgRHNCX9kNinX2MFWljg3879KBG8HdHXxoFQFkqqAgKDIyaMQof+V7unbB X-Received: by 10.194.176.106 with SMTP id ch10mr345817wjc.6.1415361702391; Fri, 07 Nov 2014 04:01:42 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.177 with SMTP id k17ls182031laa.56.gmail; Fri, 07 Nov 2014 04:01:42 -0800 (PST) X-Received: by 10.112.159.229 with SMTP id xf5mr10799798lbb.64.1415361702014; Fri, 07 Nov 2014 04:01:42 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id d3si14988115lbc.14.2014.11.07.04.01.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 04:01:41 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id w7so2530199lbi.31 for ; Fri, 07 Nov 2014 04:01:41 -0800 (PST) X-Received: by 10.152.120.199 with SMTP id le7mr10604544lab.67.1415361701884; Fri, 07 Nov 2014 04:01:41 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp185738lbc; Fri, 7 Nov 2014 04:01:41 -0800 (PST) X-Received: by 10.180.21.163 with SMTP id w3mr4451393wie.48.1415361700386; Fri, 07 Nov 2014 04:01:40 -0800 (PST) Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com. [74.125.82.41]) by mx.google.com with ESMTPS id mc20si2522182wic.30.2014.11.07.04.01.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 04:01:39 -0800 (PST) Received-SPF: pass (google.com: domain of daniel.thompson@linaro.org designates 74.125.82.41 as permitted sender) client-ip=74.125.82.41; Received: by mail-wg0-f41.google.com with SMTP id k14so3545610wgh.0 for ; Fri, 07 Nov 2014 04:01:39 -0800 (PST) X-Received: by 10.180.81.134 with SMTP id a6mr4288739wiy.11.1415361698030; Fri, 07 Nov 2014 04:01:38 -0800 (PST) Received: from sundance.lan (cpc4-aztw19-0-0-cust157.18-1.cable.virginm.net. [82.33.25.158]) by mx.google.com with ESMTPSA id mu4sm1796935wib.2.2014.11.07.04.01.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Nov 2014 04:01:37 -0800 (PST) From: Daniel Thompson To: Jason Wessel Cc: Daniel Thompson , linux-kernel@vger.kernel.org, kgdb-bugreport@lists.sourceforge.net, Andrew Morton , Ingo Molnar , patches@linaro.org, linaro-kernel@lists.linaro.org, John Stultz , Sumit Semwal , Joe Perches , stable@vger.kernel.org Subject: [PATCH v2 3.18-rc3] kdb: Avoid printing KERN_ levels to consoles Date: Fri, 7 Nov 2014 12:01:26 +0000 Message-Id: <1415361686-3797-1-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1415287626-25802-1-git-send-email-daniel.thompson@linaro.org> References: <1415287626-25802-1-git-send-email-daniel.thompson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Currently when kdb traps printk messages then the raw log level prefix (consisting of '\001' followed by a numeral) does not get stripped off before the message is issued to the various I/O handlers supported by kdb. This causes annoying visual noise as well as causing problems grepping for ^. It is also a change of behaviour compared to normal usage of printk() usage. For example -h ends up with different output to that of kdb's "sr h". This patch addresses the problem by stripping log levels from messages before they are issued to the I/O handlers. printk() which can also act as an i/o handler in some cases is special cased; if the caller provided a log level then this will be preserved when sent to printk(). The addition of non-printable characters to the output of kdb commands is a regression, albeit and extremely elderly one, introduced by commit 04d2c8c83d0e ("printk: convert the format for KERN_ to a 2 byte pattern"). Note also that this patch does *not* restore the original behaviour from v3.5. Instead it makes printk() from within a kdb command display the message without any prefix (i.e. like printk() normally does). Signed-off-by: Daniel Thompson Cc: Jason Wessel Cc: Joe Perches Cc: stable@vger.kernel.org --- Notes: This patch is tested both on arm (kgdboc=ttyAMA0) and x86_64 (kgdboc=kdb,ttyS0). v2: * Adopt printk_skip_level() to skip the header characters (Joe Perches). * Update patch description to describe the addition of non-printable characters to kdb output as a regression and Cc: stable@ (Joe Perches). kernel/debug/kdb/kdb_io.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) -- 1.9.3 diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c index 7c70812caea5..f3982adf8695 100644 --- a/kernel/debug/kdb/kdb_io.c +++ b/kernel/debug/kdb/kdb_io.c @@ -691,19 +691,20 @@ kdb_printit: * Write to all consoles. */ retlen = strlen(kdb_buffer); + cp = printk_skip_level(kdb_buffer); if (!dbg_kdb_mode && kgdb_connected) { - gdbstub_msg_write(kdb_buffer, retlen); + gdbstub_msg_write(cp, retlen - (cp - kdb_buffer)); } else { if (dbg_io_ops && !dbg_io_ops->is_console) { - len = retlen; - cp = kdb_buffer; + len = retlen - (cp - kdb_buffer); + cp2 = cp; while (len--) { - dbg_io_ops->write_char(*cp); - cp++; + dbg_io_ops->write_char(*cp2); + cp2++; } } while (c) { - c->write(c, kdb_buffer, retlen); + c->write(c, cp, retlen - (cp - kdb_buffer)); touch_nmi_watchdog(); c = c->next; } @@ -711,7 +712,10 @@ kdb_printit: if (logging) { saved_loglevel = console_loglevel; console_loglevel = CONSOLE_LOGLEVEL_SILENT; - printk(KERN_INFO "%s", kdb_buffer); + if (cp == kdb_buffer) + printk(KERN_INFO "%s", kdb_buffer); + else + printk("%s", kdb_buffer); } if (KDB_STATE(PAGER)) {