From patchwork Thu May 2 14:16:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10926929 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B99A313AD for ; Thu, 2 May 2019 14:16:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A69A222A6F for ; Thu, 2 May 2019 14:16:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96B2A24B44; Thu, 2 May 2019 14:16:54 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 033EE22A6F for ; Thu, 2 May 2019 14:16:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 77BB38952F; Thu, 2 May 2019 14:16:53 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1F96D8952F for ; Thu, 2 May 2019 14:16:52 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id n17so2287700edb.0 for ; Thu, 02 May 2019 07:16:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=j6jUhArYSkidgJUMQ6b0WS+/knU0557UDozCsjweJWs=; b=F8hY7cjR2hvuGBNQGZd6lzsOVXzmEdd27wipSFelyJ5vAhK3PSer855OiTtgUbhPh5 ZjeeIeXX56jw3+XWIZrU6oRM/KN4ZoZnX9M218QKi0HDRxP8yekXtWitxYQR8H6QBHj0 k5wKMpMOdizYSCU3XuKg4rR5uVot/QwEJLAmmhOg+Bauvkk1FmOwyUF0Ev2iVHTpEYFE I/6lMiqeUdSpLA95zWLYOs4WT1GD69sPrepdZss/9ShBgMoPqNg+rFEcxj06tU8aPxGP ZVSJWvX6DZJ4oJeaw1ugPs+rSlxY1tPSSQ9LfUIQ8YA7D2JrsV2ukW11mhiNv+QuJX6M 01jg== X-Gm-Message-State: APjAAAVQJKO4DjKPgSuL8/gQb1DciwZUN5mFHIxeRvMZhNdB9v42lBB3 oVve8nOnuR9sYEfRu7/TKa7/kQ== X-Google-Smtp-Source: APXvYqwzjvqcm5mLeQ58eJqQE74D+fxLzITraKbx389wNBvLg+qlVeqNsgPzBKf/xRqh3fnu5xr+Sw== X-Received: by 2002:a17:906:65d4:: with SMTP id z20mr1979407ejn.38.1556806610779; Thu, 02 May 2019 07:16:50 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id r24sm5339705ejo.84.2019.05.02.07.16.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 07:16:49 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 2 May 2019 16:16:43 +0200 Message-Id: <20190502141643.21080-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=j6jUhArYSkidgJUMQ6b0WS+/knU0557UDozCsjweJWs=; b=UFHGOIH302CnF6JpJHIaEB1nf04/eQzLwfnVDas8dsLvkpH29rOZVhgNglnFzzidu+ M+Q97vTxbRGNzagU9B9kO8u/k0UXJmpNv9q5YEker0ICoHosdbgAOU9MzI71il1E6+BL mkIqvJeR+HAAxcxDhaXSmlYAMDuR0qNgj5CFs= Subject: [Intel-gfx] [PATCH] RFC: console: hack up console_trylock more X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Petr Mladek , John Ogness , Peter Zijlstra , Daniel Vetter , Intel Graphics Development , Will Deacon , linux-kernel@vger.kernel.org, Steven Rostedt , Sergey Senozhatsky , Ingo Molnar , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP console_trylock, called from within printk, can be called from pretty much anywhere. Including try_to_wake_up. Note that this isn't common, usually the box is in pretty bad shape at that point already. But it really doesn't help when then lockdep jumps in and spams the logs, potentially obscuring the real backtrace we're really interested in. One case I've seen (slightly simplified backtrace): Call Trace: console_trylock+0xe/0x60 vprintk_emit+0xf1/0x320 printk+0x4d/0x69 __warn_printk+0x46/0x90 native_smp_send_reschedule+0x2f/0x40 check_preempt_curr+0x81/0xa0 ttwu_do_wakeup+0x14/0x220 try_to_wake_up+0x218/0x5f0 pollwake+0x6f/0x90 credit_entropy_bits+0x204/0x310 add_interrupt_randomness+0x18f/0x210 handle_irq+0x67/0x160 do_IRQ+0x5e/0x130 common_interrupt+0xf/0xf This alone isn't a problem, but the spinlock in the semaphore is also still held while waking up waiters (up() -> __up() -> try_to_wake_up() callchain), which then closes the runqueue vs. semaphore.lock loop, and upsets lockdep, which issues a circular locking splat to dmesg. Worse it upsets developers, since we don't want to spam dmesg with clutter when the machine is dying already. Fix this by creating a __down_trylock which only trylocks the semaphore.lock. This isn't correct in full generality, but good enough for console_lock: - there's only ever one console_lock holder, we won't fail spuriously because someone is doing a down() or up() while there's still room (unlike other semaphores with count > 1). - console_unlock() has one massive retry loop, which will catch anyone who races the trylock against the up(). This makes sure that no printk lines will get lost. Making the trylock more racy therefore has no further impact. Also cc'ing John Ogness since perhaps his printk rework fixes this all properly. Signed-off-by: Daniel Vetter Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Will Deacon Cc: Petr Mladek Cc: Sergey Senozhatsky Cc: Steven Rostedt Cc: Daniel Vetter Cc: John Ogness Cc: linux-kernel@vger.kernel.org --- include/linux/semaphore.h | 1 + kernel/locking/semaphore.c | 33 +++++++++++++++++++++++++++++++++ kernel/printk/printk.c | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h index 11c86fbfeb98..82f6db6121c3 100644 --- a/include/linux/semaphore.h +++ b/include/linux/semaphore.h @@ -40,6 +40,7 @@ extern void down(struct semaphore *sem); extern int __must_check down_interruptible(struct semaphore *sem); extern int __must_check down_killable(struct semaphore *sem); extern int __must_check down_trylock(struct semaphore *sem); +extern int __must_check __down_trylock(struct semaphore *sem); extern int __must_check down_timeout(struct semaphore *sem, long jiffies); extern void up(struct semaphore *sem); diff --git a/kernel/locking/semaphore.c b/kernel/locking/semaphore.c index 561acdd39960..345123336019 100644 --- a/kernel/locking/semaphore.c +++ b/kernel/locking/semaphore.c @@ -143,6 +143,39 @@ int down_trylock(struct semaphore *sem) } EXPORT_SYMBOL(down_trylock); +/** + * __down_trylock - try to acquire the semaphore, without any locking + * @sem: the semaphore to be acquired + * + * Try to acquire the semaphore atomically. Returns 0 if the semaphore has + * been acquired successfully or 1 if it it cannot be acquired. + * + * NOTE: This return value is inverted from both spin_trylock and + * mutex_trylock! Be careful about this when converting code. + * + * Unlike mutex_trylock, this function can be used from interrupt context, + * and the semaphore can be released by any task or interrupt. + * + * WARNING: Unlike down_trylock this function doesn't guarantee that that the + * semaphore will be acquired if it could, it's best effort only. Use for + * down_trylock_console_sem only. + */ +int __down_trylock(struct semaphore *sem) +{ + unsigned long flags; + int count; + + if (!raw_spin_trylock_irqsave(&sem->lock, flags)) + return 1; + count = sem->count - 1; + if (likely(count >= 0)) + sem->count = count; + raw_spin_unlock_irqrestore(&sem->lock, flags); + + return (count < 0); +} +EXPORT_SYMBOL(__down_trylock); + /** * down_timeout - acquire the semaphore within a specified time * @sem: the semaphore to be acquired diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 02ca827b8fac..5293803eec1f 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -217,7 +217,7 @@ static int __down_trylock_console_sem(unsigned long ip) * deadlock in printk()->down_trylock_console_sem() otherwise. */ printk_safe_enter_irqsave(flags); - lock_failed = down_trylock(&console_sem); + lock_failed = __down_trylock(&console_sem); printk_safe_exit_irqrestore(flags); if (lock_failed)