From: Frederic Weisbecker <frederic@kernel.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Frederic Weisbecker <frederic@kernel.org>,
Tejun Heo <tj@kernel.org>, Peter Zijlstra <peterz@infradead.org>,
"David S . Miller" <davem@davemloft.net>,
Lai Jiangshan <jiangshanlai@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
"Paul E . McKenney" <paulmck@linux.vnet.ibm.com>,
Ingo Molnar <mingo@kernel.org>
Subject: [PATCH 07/14] x86: Use lockdep to assert IRQs are disabled/enabled
Date: Fri, 20 Oct 2017 02:56:04 +0200 [thread overview]
Message-ID: <1508460971-8731-8-git-send-email-frederic@kernel.org> (raw)
In-Reply-To: <1508460971-8731-1-git-send-email-frederic@kernel.org>
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 <frederic@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
---
arch/x86/entry/common.c | 2 +-
arch/x86/kernel/smpboot.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 03505ff..b4f3a55 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -186,7 +186,7 @@ __visible inline void prepare_exit_to_usermode(struct pt_regs *regs)
addr_limit_user_check();
- if (IS_ENABLED(CONFIG_PROVE_LOCKING) && WARN_ON(!irqs_disabled()))
+ if (!lockdep_assert_irqs_disabled())
local_irq_disable();
lockdep_sys_exit();
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index aed1460..aee08a4 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1095,7 +1095,7 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
unsigned long flags;
int err, ret = 0;
- WARN_ON(irqs_disabled());
+ lockdep_assert_irqs_enabled();
pr_debug("++++++++++++++++++++=_---CPU UP %u\n", cpu);
--
2.7.4
next prev parent reply other threads:[~2017-10-20 0:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-20 0:55 [PATCH 00/14] lockdep: Add lightweight IRQs disabled/enabled check Frederic Weisbecker
2017-10-20 0:55 ` [PATCH 01/14] lockdep: Add IRQs disabled/enabled assertion Frederic Weisbecker
2017-10-20 0:55 ` [PATCH 02/14] irq: Use lockdep to assert IRQs are disabled/enabled Frederic Weisbecker
2017-10-20 0:56 ` [PATCH 03/14] workqueue: " Frederic Weisbecker
2017-10-21 15:39 ` Tejun Heo
2017-10-20 0:56 ` [PATCH 04/14] nohz: " Frederic Weisbecker
2017-10-20 0:56 ` [PATCH 05/14] hrtimer: " Frederic Weisbecker
2017-10-20 0:56 ` [PATCH 06/14] smp: " Frederic Weisbecker
2017-10-20 0:56 ` Frederic Weisbecker [this message]
2017-10-22 9:20 ` [PATCH 07/14] x86: " Peter Zijlstra
2017-11-03 14:25 ` Frederic Weisbecker
2017-10-20 0:56 ` [PATCH 08/14] perf: " Frederic Weisbecker
2017-10-20 0:56 ` [PATCH 09/14] irq/timings: " Frederic Weisbecker
2017-10-20 0:56 ` [PATCH 10/14] irq_work: " Frederic Weisbecker
2017-10-20 0:56 ` [PATCH 11/14] sched: " Frederic Weisbecker
2017-10-20 0:56 ` [PATCH 12/14] posix-cpu-timers: " Frederic Weisbecker
2017-10-20 0:56 ` [PATCH 13/14] netpoll: " Frederic Weisbecker
2017-10-20 0:56 ` [PATCH 14/14] rcu: " Frederic Weisbecker
2017-10-21 21:36 ` Paul E. McKenney
2017-11-06 15:01 [GIT PULL] lockdep: Add lightweight IRQs disabled/enabled check v2 Frederic Weisbecker
2017-11-06 15:01 ` [PATCH 07/14] x86: Use lockdep to assert IRQs are disabled/enabled Frederic Weisbecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1508460971-8731-8-git-send-email-frederic@kernel.org \
--to=frederic@kernel.org \
--cc=davem@davemloft.net \
--cc=jiangshanlai@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).