From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA1F3C433E0 for ; Fri, 26 Mar 2021 16:02:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C10361A2A for ; Fri, 26 Mar 2021 16:02:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231156AbhCZQC1 (ORCPT ); Fri, 26 Mar 2021 12:02:27 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:55950 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230448AbhCZQBr (ORCPT ); Fri, 26 Mar 2021 12:01:47 -0400 Message-Id: <20210326153944.436565064@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1616774506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=rg0JLjNio0dVe90ujrNoLdJyZBkzsyjiIK7iaxSDvCA=; b=oVZ3tpvOjOgOd0aOPBp6GoZVRD9y4gywvCcKfFY+p/e0MvTvuoqE62wDtFJ0m6VLD5vwLn GwP60Vb+mFfKxZABbNhLCcof/0QKXoc7SH/0IQnZxOjSm1xCsPiodry/Ke4wov7u7FBWp4 1OoRQheeG+PBeVTlBCmdAEV7tEGocA1Rp2a+wSCu686lVdGMrQzpccvSX2fM5v8BOe3rlL ssqedGC1AQq52qP6gwGMhG1LpbnC8Ps0Yrq4Knjkng9tWJGO0Tu5prh8eMORhHK0CcK8/3 fiSE3x6pzIZfTlhniQ3/+VtnXeht0YRH7HU90XyZD7iDp9bgELYtZ15gGuFuRw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1616774506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=rg0JLjNio0dVe90ujrNoLdJyZBkzsyjiIK7iaxSDvCA=; b=g3hcpOYlV6b7WsER8cfguFg3+YSlAbnbWeO+FInUayXqFGP/3XqOimCaOYYKCNR2aA3PY6 ewQjiyKGMfhA5fBQ== Date: Fri, 26 Mar 2021 16:29:43 +0100 From: Thomas Gleixner To: LKML Cc: Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Boqun Feng , Steven Rostedt , Sebastian Andrzej Siewior Subject: [patch V2 14/15] locking/rtmutex: Restrict the trylock WARN_ON() to debug References: <20210326152929.709289883@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-transfer-encoding: 8-bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The warning as written is expensive and not really required for a production kernel. Make it depend on rt mutex debugging and use !in_task() for the condition which generates far better code and gives the same answer. Signed-off-by: Thomas Gleixner --- kernel/locking/rtmutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/locking/rtmutex.c +++ b/kernel/locking/rtmutex.c @@ -1456,7 +1456,7 @@ int __sched rt_mutex_trylock(struct rt_m { int ret; - if (WARN_ON_ONCE(in_irq() || in_nmi() || in_serving_softirq())) + if (IS_ENABLED(CONFIG_DEBUG_RT_MUTEXES) && WARN_ON_ONCE(!in_task())) return 0; /*