From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752184AbdKHLBS (ORCPT ); Wed, 8 Nov 2017 06:01:18 -0500 Received: from terminus.zytor.com ([65.50.211.136]:43717 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751534AbdKHLBQ (ORCPT ); Wed, 8 Nov 2017 06:01:16 -0500 Date: Wed, 8 Nov 2017 02:56:37 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: paulmck@linux.vnet.ibm.com, jiangshanlai@gmail.com, hpa@zytor.com, tglx@linutronix.de, torvalds@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, tj@kernel.org, frederic@kernel.org, davem@davemloft.net, peterz@infradead.org Reply-To: paulmck@linux.vnet.ibm.com, tglx@linutronix.de, jiangshanlai@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, mingo@kernel.org, tj@kernel.org, frederic@kernel.org, peterz@infradead.org, davem@davemloft.net In-Reply-To: <1509980490-4285-13-git-send-email-frederic@kernel.org> References: <1509980490-4285-13-git-send-email-frederic@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] timers/posix-cpu-timers: Use lockdep to assert IRQs are disabled/enabled Git-Commit-ID: a69682200db9c2c26594188f81dd2df560af4683 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: a69682200db9c2c26594188f81dd2df560af4683 Gitweb: https://git.kernel.org/tip/a69682200db9c2c26594188f81dd2df560af4683 Author: Frederic Weisbecker AuthorDate: Mon, 6 Nov 2017 16:01:28 +0100 Committer: Ingo Molnar CommitDate: Wed, 8 Nov 2017 11:13:54 +0100 timers/posix-cpu-timers: 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-13-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar --- kernel/time/posix-cpu-timers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c index 5b11711..1f27887 100644 --- a/kernel/time/posix-cpu-timers.c +++ b/kernel/time/posix-cpu-timers.c @@ -603,7 +603,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, /* * Disarm any old timer after extracting its expiry time. */ - WARN_ON_ONCE(!irqs_disabled()); + lockdep_assert_irqs_disabled(); ret = 0; old_incr = timer->it.cpu.incr; @@ -1034,7 +1034,7 @@ static void posix_cpu_timer_rearm(struct k_itimer *timer) /* * Now re-arm for the new expiry time. */ - WARN_ON_ONCE(!irqs_disabled()); + lockdep_assert_irqs_disabled(); arm_timer(timer); unlock: unlock_task_sighand(p, &flags); @@ -1125,7 +1125,7 @@ void run_posix_cpu_timers(struct task_struct *tsk) struct k_itimer *timer, *next; unsigned long flags; - WARN_ON_ONCE(!irqs_disabled()); + lockdep_assert_irqs_disabled(); /* * The fast path checks that there are no expired thread or thread