From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753145AbdI1M0M (ORCPT ); Thu, 28 Sep 2017 08:26:12 -0400 Received: from merlin.infradead.org ([205.233.59.134]:53304 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753094AbdI1M0I (ORCPT ); Thu, 28 Sep 2017 08:26:08 -0400 Message-Id: <20170928122513.328354788@infradead.org> User-Agent: quilt/0.63-1 Date: Thu, 28 Sep 2017 14:18:24 +0200 From: Peter Zijlstra To: pmladek@suse.com, sergey.senozhatsky@gmail.com Cc: linux-kernel@vger.kernel.org, rostedt@goodmis.org, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, Jason Wessel Subject: [PATCH 1/3] printk: Fix kdb_trap_printk placement References: <20170928121823.430053219@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=peterz-printk-kdb.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some people figured vprintk_emit() makes for a nice API and exported it, bypassing the kdb trap. This still leaves vprintk_nmi() outside of the kbd reach, should that be fixed too? Cc: Jason Wessel Signed-off-by: Peter Zijlstra (Intel) --- kernel/printk/printk.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -1811,6 +1811,11 @@ asmlinkage int vprintk_emit(int facility int printed_len; bool in_sched = false; +#ifdef CONFIG_KGDB_KDB + if (unlikely(kdb_trap_printk && kdb_printf_cpu < 0)) + return vkdb_printf(KDB_MSGSRC_PRINTK, fmt, args); +#endif + if (level == LOGLEVEL_SCHED) { level = LOGLEVEL_DEFAULT; in_sched = true; @@ -1903,18 +1908,7 @@ EXPORT_SYMBOL(printk_emit); int vprintk_default(const char *fmt, va_list args) { - int r; - -#ifdef CONFIG_KGDB_KDB - /* Allow to pass printk() to kdb but avoid a recursion. */ - if (unlikely(kdb_trap_printk && kdb_printf_cpu < 0)) { - r = vkdb_printf(KDB_MSGSRC_PRINTK, fmt, args); - return r; - } -#endif - r = vprintk_emit(0, LOGLEVEL_DEFAULT, NULL, 0, fmt, args); - - return r; + return vprintk_emit(0, LOGLEVEL_DEFAULT, NULL, 0, fmt, args); } EXPORT_SYMBOL_GPL(vprintk_default);