From patchwork Fri Nov 7 18:47:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Thompson X-Patchwork-Id: 40448 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5823D20D85 for ; Fri, 7 Nov 2014 18:48:10 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id 10sf2238547lbg.1 for ; Fri, 07 Nov 2014 10:48:09 -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=ROrS1euJQo2mTxEJa6bFd+Mah+9Ve9d5g8gcjtr0f2o=; b=CcsPXCcv15ftebD15OBm6qxsQAxFBYiZqXko9IePxlpO4uf/1daMBijvi3bqof2YO3 nDXtIaqqigQAc/dtbwUrRNfZadYbjHlNa9E1YYt9+O+u3mrOdUjGeH3c2rOnZ70MBsTd lnPUUuEQV9nI3jeb6jz2pBnn4ZP7jst+qtJ7fsMgX/u3DYlBnUsKkuPdHOu04TwScfq9 4A+qD511qtoeG4fhh8H8L+UMxWnFRPiEivUEq9bKH6P59RB1xQBzgLjU3wtsvvQBadQ2 2SBBv3IsdDuouxCtQO3VXHIAa1uul+QgMc6VWbgkIf/TuZj1lbZVYf9QoMmSQ1gB8wC4 BTRw== X-Gm-Message-State: ALoCoQkcdfyEDIUnd5Czc+5LG8K/Nd8EZwZtJgWh2j2MOOIarwH8GW0RlklHTgxkZJzdedJvzuUz X-Received: by 10.112.254.226 with SMTP id al2mr2238016lbd.1.1415386089202; Fri, 07 Nov 2014 10:48:09 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.169 with SMTP id r9ls196969laj.57.gmail; Fri, 07 Nov 2014 10:48:08 -0800 (PST) X-Received: by 10.152.21.135 with SMTP id v7mr13072255lae.65.1415386088767; Fri, 07 Nov 2014 10:48:08 -0800 (PST) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id az8si12492899lbc.132.2014.11.07.10.48.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 10:48:08 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by mail-lb0-f173.google.com with SMTP id n15so3171112lbi.32 for ; Fri, 07 Nov 2014 10:48:08 -0800 (PST) X-Received: by 10.152.29.8 with SMTP id f8mr12940183lah.56.1415386088410; Fri, 07 Nov 2014 10:48:08 -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 ew9csp252838lbc; Fri, 7 Nov 2014 10:48:07 -0800 (PST) X-Received: by 10.180.9.103 with SMTP id y7mr7848880wia.5.1415386087694; Fri, 07 Nov 2014 10:48:07 -0800 (PST) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com. [209.85.212.170]) by mx.google.com with ESMTPS id ez14si4400612wid.57.2014.11.07.10.48.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 07 Nov 2014 10:48:05 -0800 (PST) Received-SPF: temperror (google.com: error in processing during lookup of daniel.thompson@linaro.org: DNS timeout) client-ip=209.85.212.170; Received: by mail-wi0-f170.google.com with SMTP id r20so5224541wiv.5 for ; Fri, 07 Nov 2014 10:48:05 -0800 (PST) X-Received: by 10.180.12.136 with SMTP id y8mr7666097wib.73.1415386085471; Fri, 07 Nov 2014 10:48:05 -0800 (PST) Received: from sundance.lan ([82.33.25.158]) by mx.google.com with ESMTPSA id fi9sm3043402wib.6.2014.11.07.10.48.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Nov 2014 10:48:04 -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 v3 3.18-rc3] kdb: Avoid printing KERN_ levels to consoles Date: Fri, 7 Nov 2014 18:47:50 +0000 Message-Id: <1415386070-18850-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.173 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 the prefix 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). v3: * Introduce enum kdb_msgsrc to further improve the fidelity of messages that hit the log (Joe Perches). The output of "sr h" benefits a lot from this change. 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). include/linux/kdb.h | 8 +++++++- kernel/debug/kdb/kdb_io.c | 22 +++++++++++++--------- kernel/printk/printk.c | 2 +- 3 files changed, 21 insertions(+), 11 deletions(-) -- 1.9.3 diff --git a/include/linux/kdb.h b/include/linux/kdb.h index 290db1269c4c..204901ae003a 100644 --- a/include/linux/kdb.h +++ b/include/linux/kdb.h @@ -112,8 +112,14 @@ typedef enum { KDB_REASON_SYSTEM_NMI, /* In NMI due to SYSTEM cmd; regs valid */ } kdb_reason_t; +enum kdb_msgsrc { + KDB_MSGSRC_INTERNAL, /* direct call to kdb_printf() */ + KDB_MSGSRC_PRINTK, /* trapped from printk() */ +}; + extern int kdb_trap_printk; -extern __printf(1, 0) int vkdb_printf(const char *fmt, va_list args); +extern __printf(2, 0) int vkdb_printf(enum kdb_msgsrc src, const char *fmt, + va_list args); extern __printf(1, 2) int kdb_printf(const char *, ...); typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...); diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c index 7c70812caea5..a550afb99ebe 100644 --- a/kernel/debug/kdb/kdb_io.c +++ b/kernel/debug/kdb/kdb_io.c @@ -548,7 +548,7 @@ static int kdb_search_string(char *searched, char *searchfor) return 0; } -int vkdb_printf(const char *fmt, va_list ap) +int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap) { int diag; int linecount; @@ -691,19 +691,20 @@ kdb_printit: * Write to all consoles. */ retlen = strlen(kdb_buffer); + cp = (char *) 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 (printk_get_level(kdb_buffer) || src == KDB_MSGSRC_PRINTK) + printk("%s", kdb_buffer); + else + pr_info("%s", kdb_buffer); } if (KDB_STATE(PAGER)) { @@ -844,7 +848,7 @@ int kdb_printf(const char *fmt, ...) int r; va_start(ap, fmt); - r = vkdb_printf(fmt, ap); + r = vkdb_printf(KDB_MSGSRC_INTERNAL, fmt, ap); va_end(ap); return r; diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index ced2b84b1cb7..3a884ab1b9cb 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1836,7 +1836,7 @@ asmlinkage __visible int printk(const char *fmt, ...) #ifdef CONFIG_KGDB_KDB if (unlikely(kdb_trap_printk)) { va_start(args, fmt); - r = vkdb_printf(fmt, args); + r = vkdb_printf(KDB_MSGSRC_PRINTK, fmt, args); va_end(args); return r; }