Skip to content

Commit 4afb651

Browse files
committed
Merge tag 'locking-urgent-2022-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull lockdep fix from Thomas Gleixner: "A RT fix for lockdep. lockdep invokes prandom_u32() to create cookies. This worked until prandom_u32() was switched to the real random generator, which takes a spinlock for extraction, which does not work on RT when invoked from atomic contexts. lockdep has no requirement for real random numbers and it turns out sched_clock() is good enough to create the cookie. That works everywhere and is faster" * tag 'locking-urgent-2022-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: locking/lockdep: Use sched_clock() for random numbers
2 parents 36da9f5 + 4051a81 commit 4afb651

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/locking/lockdep.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5432,7 +5432,7 @@ static struct pin_cookie __lock_pin_lock(struct lockdep_map *lock)
54325432
* be guessable and still allows some pin nesting in
54335433
* our u32 pin_count.
54345434
*/
5435-
cookie.val = 1 + (prandom_u32() >> 16);
5435+
cookie.val = 1 + (sched_clock() & 0xffff);
54365436
hlock->pin_count += cookie.val;
54375437
return cookie;
54385438
}

0 commit comments

Comments
 (0)