From patchwork Fri Jan 13 13:15:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Mladek X-Patchwork-Id: 9515639 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2CB7560762 for ; Fri, 13 Jan 2017 13:16:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FE7B285A1 for ; Fri, 13 Jan 2017 13:16:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14BCB28679; Fri, 13 Jan 2017 13:16:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83856285A1 for ; Fri, 13 Jan 2017 13:16:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751712AbdAMNP5 (ORCPT ); Fri, 13 Jan 2017 08:15:57 -0500 Received: from mx2.suse.de ([195.135.220.15]:41395 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751630AbdAMNP5 (ORCPT ); Fri, 13 Jan 2017 08:15:57 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 253EEACA1; Fri, 13 Jan 2017 13:15:54 +0000 (UTC) From: Petr Mladek To: Sergey Senozhatsky Cc: Tetsuo Handa , Steven Rostedt , Peter Zijlstra , Andrew Morton , Greg Kroah-Hartman , Jiri Slaby , linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Petr Mladek Subject: [PATCH] printk: Correctly handle preemption in console_unlock() Date: Fri, 13 Jan 2017 14:15:21 +0100 Message-Id: <1484313321-17196-1-git-send-email-pmladek@suse.com> X-Mailer: git-send-email 1.8.5.6 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some console drivers code calls console_conditional_schedule() that looks at @console_may_schedule. The value must be cleared when the drivers are called from console_unlock() with interrupts disabled. But rescheduling is fine when the same code is called, for example, from tty operations where the console semaphore is taken via console_lock(). This is why @console_may_schedule is cleared before calling console drivers. The original value is stored to decide if we could sleep between lines. Now, @console_may_schedule is not cleared when we call console_trylock() and jump back to the "again" goto label. This has become a problem, since the commit 6b97a20d3a7909daa066 ("printk: set may_schedule for some of console_trylock() callers"). @console_may_schedule might get enabled now. There is also the opposite problem. console_lock() can be called only from preemptive context. It can always enable scheduling in the console code. But console_trylock() is not able to detect it when CONFIG_PREEMPT_COUNT is disabled. Therefore we should use the original @console_may_schedule value after re-acquiring the console semaphore in console_unlock(). This patch solves both problems by clearing and restoring the very original @may_schedule setting only around call_console_drivers(). Reported-by: Tetsuo Handa Signed-off-by: Petr Mladek --- This is related to the thread https://lkml.kernel.org/r/201612261954.FJE69201.OFLVtFJSQFOHMO@I-love.SAKURA.ne.jp kernel/printk/printk.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 7180088cbb23..2ac54291230d 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2150,7 +2150,7 @@ void console_unlock(void) static u64 seen_seq; unsigned long flags; bool wake_klogd = false; - bool do_cond_resched, retry; + bool may_schedule_orig, retry; if (console_suspended) { up_console_sem(); @@ -2158,17 +2158,15 @@ void console_unlock(void) } /* - * Console drivers are called under logbuf_lock, so - * @console_may_schedule should be cleared before; however, we may - * end up dumping a lot of lines, for example, if called from - * console registration path, and should invoke cond_resched() - * between lines if allowable. Not doing so can cause a very long - * scheduling stall on a slow console leading to RCU stall and - * softlockup warnings which exacerbate the issue with more - * messages practically incapacitating the system. + * Console drivers are called with interrupts disabled, so + * @console_may_schedule must be cleared before. The original + * value must be restored so that we could schedule between lines. + * + * console_trylock() is not able to detect the preemptive context when + * CONFIG_PREEMPT_COUNT is disabled. Therefore the value must be + * stored before the "again" goto label. */ - do_cond_resched = console_may_schedule; - console_may_schedule = 0; + may_schedule_orig = console_may_schedule; again: /* @@ -2235,12 +2233,13 @@ void console_unlock(void) raw_spin_unlock(&logbuf_lock); stop_critical_timings(); /* don't trace print latency */ + console_may_schedule = 0; call_console_drivers(ext_text, ext_len, text, len); + console_may_schedule = may_schedule_orig; start_critical_timings(); printk_safe_exit_irqrestore(flags); - if (do_cond_resched) - cond_resched(); + console_conditional_schedule(); } console_locked = 0;