From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752042AbdKHK4l (ORCPT ); Wed, 8 Nov 2017 05:56:41 -0500 Received: from terminus.zytor.com ([65.50.211.136]:57487 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751980AbdKHK4h (ORCPT ); Wed, 8 Nov 2017 05:56:37 -0500 Date: Wed, 8 Nov 2017 02:51:59 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: davem@davemloft.net, peterz@infradead.org, jiangshanlai@gmail.com, tj@kernel.org, frederic@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org, paulmck@linux.vnet.ibm.com Reply-To: jiangshanlai@gmail.com, tj@kernel.org, peterz@infradead.org, davem@davemloft.net, paulmck@linux.vnet.ibm.com, torvalds@linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, frederic@kernel.org In-Reply-To: <1509980490-4285-2-git-send-email-frederic@kernel.org> References: <1509980490-4285-2-git-send-email-frederic@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] locking/lockdep: Add IRQs disabled/enabled assertion APIs: lockdep_assert_irqs_enabled()/disabled() Git-Commit-ID: f54bb2ec02c839f6bfe3e8d438cd93d30b4809dd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f54bb2ec02c839f6bfe3e8d438cd93d30b4809dd Gitweb: https://git.kernel.org/tip/f54bb2ec02c839f6bfe3e8d438cd93d30b4809dd Author: Frederic Weisbecker AuthorDate: Mon, 6 Nov 2017 16:01:17 +0100 Committer: Ingo Molnar CommitDate: Wed, 8 Nov 2017 11:13:47 +0100 locking/lockdep: Add IRQs disabled/enabled assertion APIs: lockdep_assert_irqs_enabled()/disabled() Checking whether IRQs are enabled or disabled is a very common sanity check, however not free of overhead especially on fastpath where such assertion is very common. Lockdep is a good host for such concurrency correctness check and it even already tracks down IRQs disablement state. Just reuse its machinery. This will allow us to get rid of the flags pop and check overhead from fast path when kernel is built for production. Suggested-by: Peter Zijlstra Signed-off-by: Frederic Weisbecker Acked-by: Thomas Gleixner Cc: David S . Miller Cc: Lai Jiangshan Cc: Linus Torvalds Cc: Paul E. McKenney Cc: Tejun Heo Link: http://lkml.kernel.org/r/1509980490-4285-2-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar --- include/linux/lockdep.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 0272076..a842551 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -725,9 +725,24 @@ do { \ lock_acquire(&(lock)->dep_map, 0, 0, 1, 1, NULL, _THIS_IP_); \ lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ } while (0) + +#define lockdep_assert_irqs_enabled() do { \ + WARN_ONCE(debug_locks && !current->lockdep_recursion && \ + !current->hardirqs_enabled, \ + "IRQs not enabled as expected\n"); \ + } while (0) + +#define lockdep_assert_irqs_disabled() do { \ + WARN_ONCE(debug_locks && !current->lockdep_recursion && \ + current->hardirqs_enabled, \ + "IRQs not disabled as expected\n"); \ + } while (0) + #else # define might_lock(lock) do { } while (0) # define might_lock_read(lock) do { } while (0) +# define lockdep_assert_irqs_enabled() do { } while (0) +# define lockdep_assert_irqs_disabled() do { } while (0) #endif #ifdef CONFIG_LOCKDEP