From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752188AbdKHLAr (ORCPT ); Wed, 8 Nov 2017 06:00:47 -0500 Received: from terminus.zytor.com ([65.50.211.136]:47631 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752023AbdKHLAp (ORCPT ); Wed, 8 Nov 2017 06:00:45 -0500 Date: Wed, 8 Nov 2017 02:56:12 -0800 From: tip-bot for Frederic Weisbecker Message-ID: Cc: mingo@kernel.org, davem@davemloft.net, paulmck@linux.vnet.ibm.com, peterz@infradead.org, frederic@kernel.org, jiangshanlai@gmail.com, tj@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, tglx@linutronix.de Reply-To: frederic@kernel.org, peterz@infradead.org, mingo@kernel.org, davem@davemloft.net, paulmck@linux.vnet.ibm.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, tj@kernel.org, jiangshanlai@gmail.com In-Reply-To: <1509980490-4285-12-git-send-email-frederic@kernel.org> References: <1509980490-4285-12-git-send-email-frederic@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:locking/core] sched/clock, sched/cputime: Use lockdep to assert IRQs are disabled/enabled Git-Commit-ID: 2c11dba00a39007b457c7607c1b1a4db95ca04bc 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: 2c11dba00a39007b457c7607c1b1a4db95ca04bc Gitweb: https://git.kernel.org/tip/2c11dba00a39007b457c7607c1b1a4db95ca04bc Author: Frederic Weisbecker AuthorDate: Mon, 6 Nov 2017 16:01:27 +0100 Committer: Ingo Molnar CommitDate: Wed, 8 Nov 2017 11:13:53 +0100 sched/clock, sched/cputime: 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-12-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar --- kernel/sched/clock.c | 2 +- kernel/sched/cputime.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c index ca0f8fc..e086bab 100644 --- a/kernel/sched/clock.c +++ b/kernel/sched/clock.c @@ -388,7 +388,7 @@ void sched_clock_tick(void) if (unlikely(!sched_clock_running)) return; - WARN_ON_ONCE(!irqs_disabled()); + lockdep_assert_irqs_disabled(); scd = this_scd(); __scd_stamp(scd); diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 14d2dbf..9be8b68 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -259,8 +259,7 @@ static inline u64 account_other_time(u64 max) { u64 accounted; - /* Shall be converted to a lockdep-enabled lightweight check */ - WARN_ON_ONCE(!irqs_disabled()); + lockdep_assert_irqs_disabled(); accounted = steal_account_process_time(max);