Skip to content

Commit

Permalink
locking/lockdep: Remove more raw_cpu_read() usage
Browse files Browse the repository at this point in the history
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:

  baffd72 ("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
  • Loading branch information
Peter Zijlstra committed Oct 30, 2020
1 parent 921c7eb commit d48e385
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/locking/lockdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d48e385

Please sign in to comment.