From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: locking/urgent] locking/lockdep: Remove more raw_cpu_read() usage
Date: Sat, 31 Oct 2020 11:30:32 -0000 [thread overview]
Message-ID: <160414383224.397.2729117464840782339.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201026152256.GB2651@hirez.programming.kicks-ass.net>
The following commit has been merged into the locking/urgent branch of tip:
Commit-ID: d48e3850030623e1c20785bceaaf78f916d0b1a3
Gitweb: https://git.kernel.org/tip/d48e3850030623e1c20785bceaaf78f916d0b1a3
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Mon, 26 Oct 2020 16:22:56 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 30 Oct 2020 17:07:18 +01:00
locking/lockdep: Remove more raw_cpu_read() usage
I initially thought raw_cpu_read() was OK, since if it is !0 we have
IRQs disabled and can't get migrated, so if we get migrated both CPUs
must have 0 and it doesn't matter which 0 we read.
And while that is true; it isn't the whole store, on pretty much all
architectures (except x86) this can result in computing the address for
one CPU, getting migrated, the old CPU continuing execution with another
task (possibly setting recursion) and then the new CPU reading the value
of the old CPU, which is no longer 0.
Similer to:
baffd723e44d ("lockdep: Revert "lockdep: Use raw_cpu_*() for per-cpu variables"")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20201026152256.GB2651@hirez.programming.kicks-ass.net
---
kernel/locking/lockdep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index fc206ae..1102849 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -84,7 +84,7 @@ static inline bool lockdep_enabled(void)
if (!debug_locks)
return false;
- if (raw_cpu_read(lockdep_recursion))
+ if (this_cpu_read(lockdep_recursion))
return false;
if (current->lockdep_recursion)
next prev parent reply other threads:[~2020-10-31 11:30 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 11:26 possible lockdep regression introduced by 4d004099a668 ("lockdep: Fix lockdep recursion") Filipe Manana
2020-10-26 11:40 ` Peter Zijlstra
2020-10-26 11:55 ` Jan Kara
2020-10-26 11:59 ` Filipe Manana
2020-10-26 12:30 ` Peter Zijlstra
2020-10-26 11:56 ` Filipe Manana
2020-10-26 12:55 ` Peter Zijlstra
2020-10-26 13:06 ` Filipe Manana
2020-10-26 15:22 ` Peter Zijlstra
2020-10-27 9:49 ` Anatoly Pugachev
2020-10-31 11:30 ` tip-bot2 for Peter Zijlstra [this message]
2020-11-02 17:58 ` Filipe Manana
2020-11-03 10:15 ` Jan Kara
2020-11-03 10:22 ` Filipe Manana
2020-10-26 20:35 ` David Sterba
2020-11-03 14:08 ` Boqun Feng
2020-11-03 14:24 ` Filipe Manana
2020-11-03 19:44 ` Filipe Manana
2020-11-04 2:22 ` Boqun Feng
2020-11-04 3:44 ` Boqun Feng
2020-11-04 9:49 ` Filipe Manana
2020-11-04 19:54 ` Filipe Manana
2020-11-05 1:10 ` Boqun Feng
2020-11-09 8:44 ` Boqun Feng
2020-11-09 9:57 ` Filipe Manana
2020-11-10 1:41 ` Boqun Feng
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=160414383224.397.2729117464840782339.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=x86@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).