From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752111AbdKHK5A (ORCPT ); Wed, 8 Nov 2017 05:57:00 -0500 Received: from terminus.zytor.com ([65.50.211.136]:54543 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751872AbdKHK46 (ORCPT ); Wed, 8 Nov 2017 05:56:58 -0500 Date: Wed, 8 Nov 2017 02:52:25 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: tj@kernel.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, davem@davemloft.net, frederic@kernel.org, jiangshanlai@gmail.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, paulmck@linux.vnet.ibm.com, peterz@infradead.org Reply-To: paulmck@linux.vnet.ibm.com, peterz@infradead.org, frederic@kernel.org, linux-kernel@vger.kernel.org, jiangshanlai@gmail.com, torvalds@linux-foundation.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, davem@davemloft.net, tj@kernel.org In-Reply-To: <1509980490-4285-3-git-send-email-frederic@kernel.org> References: <1509980490-4285-3-git-send-email-frederic@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] irq/softirqs: Use lockdep to assert IRQs are disabled/enabled Git-Commit-ID: f71b74bca637fca7de78f1d44eaefde5bc900f9f 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: f71b74bca637fca7de78f1d44eaefde5bc900f9f Gitweb: https://git.kernel.org/tip/f71b74bca637fca7de78f1d44eaefde5bc900f9f Author: Frederic Weisbecker AuthorDate: Mon, 6 Nov 2017 16:01:18 +0100 Committer: Ingo Molnar CommitDate: Wed, 8 Nov 2017 11:13:48 +0100 irq/softirqs: Use lockdep to assert IRQs are disabled/enabled Use lockdep to check that IRQs are enabled or disabled as expected. This way the sanity check only shows overhead when concurrency correctness debug code is enabled. Signed-off-by: Frederic Weisbecker Acked-by: Thomas Gleixner Cc: David S . Miller Cc: Lai Jiangshan Cc: Linus Torvalds Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Tejun Heo Link: http://lkml.kernel.org/r/1509980490-4285-3-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar --- kernel/softirq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernel/softirq.c b/kernel/softirq.c index 4e09821..662f7b1b 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -137,7 +137,7 @@ EXPORT_SYMBOL(__local_bh_disable_ip); static void __local_bh_enable(unsigned int cnt) { - WARN_ON_ONCE(!irqs_disabled()); + lockdep_assert_irqs_disabled(); if (softirq_count() == (cnt & SOFTIRQ_MASK)) trace_softirqs_on(_RET_IP_); @@ -158,7 +158,8 @@ EXPORT_SYMBOL(_local_bh_enable); void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) { - WARN_ON_ONCE(in_irq() || irqs_disabled()); + WARN_ON_ONCE(in_irq()); + lockdep_assert_irqs_enabled(); #ifdef CONFIG_TRACE_IRQFLAGS local_irq_disable(); #endif @@ -396,9 +397,8 @@ void irq_exit(void) #ifndef __ARCH_IRQ_EXIT_IRQS_DISABLED local_irq_disable(); #else - WARN_ON_ONCE(!irqs_disabled()); + lockdep_assert_irqs_disabled(); #endif - account_irq_exit_time(current); preempt_count_sub(HARDIRQ_OFFSET); if (!in_interrupt() && local_softirq_pending()) @@ -488,7 +488,7 @@ EXPORT_SYMBOL(__tasklet_hi_schedule); void __tasklet_hi_schedule_first(struct tasklet_struct *t) { - BUG_ON(!irqs_disabled()); + lockdep_assert_irqs_disabled(); t->next = __this_cpu_read(tasklet_hi_vec.head); __this_cpu_write(tasklet_hi_vec.head, t);