]> git.baikalelectronics.ru Git - kernel.git/commitdiff
locking/lockdep: Use sched_clock() for random numbers
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Tue, 17 May 2022 09:16:14 +0000 (11:16 +0200)
committerPeter Zijlstra <peterz@infradead.org>
Mon, 13 Jun 2022 08:29:57 +0000 (10:29 +0200)
Since the rewrote of prandom_u32(), in the commit mentioned below, the
function uses sleeping locks which extracing random numbers and filling
the batch.
This breaks lockdep on PREEMPT_RT because lock_pin_lock() disables
interrupts while calling __lock_pin_lock(). This can't be moved earlier
because the main user of the function (rq_pin_lock()) invokes that
function after disabling interrupts in order to acquire the lock.

The cookie does not require random numbers as its goal is to provide a
random value in order to notice unexpected "unlock + lock" sites.

Use sched_clock() to provide random numbers.

Fixes: a0103f4d86f88 ("random32: use real rng for non-deterministic randomness")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/YoNn3pTkm5+QzE5k@linutronix.de
kernel/locking/lockdep.c

index 81e87280513ea21d064f4d7e20f9f9b6b74192ba..f06b91ca6482d36777d42e0af52c82f2b6ba6bb0 100644 (file)
@@ -5432,7 +5432,7 @@ static struct pin_cookie __lock_pin_lock(struct lockdep_map *lock)
                         * be guessable and still allows some pin nesting in
                         * our u32 pin_count.
                         */
-                       cookie.val = 1 + (prandom_u32() >> 16);
+                       cookie.val = 1 + (sched_clock() & 0xffff);
                        hlock->pin_count += cookie.val;
                        return cookie;
                }