Skip to content

Commit 92e250c

Browse files
Sebastian Andrzej SiewiorKAGA-KOKO
authored andcommitted
timekeeping: Add a lockdep override in tick_freeze()
tick_freeze() acquires a raw spinlock (tick_freeze_lock). Later in the callchain (timekeeping_suspend() -> mc146818_avoid_UIP()) the RTC driver acquires a spinlock which becomes a sleeping lock on PREEMPT_RT. Lockdep complains about this lock nesting. Add a lockdep override for this special case and a comment explaining why it is okay. Reported-by: Borislav Petkov <bp@alien8.de> Reported-by: Chris Bainbridge <chris.bainbridge@gmail.com> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/all/20250404133429.pnAzf-eF@linutronix.de Closes: https://lore.kernel.org/all/20250330113202.GAZ-krsjAnurOlTcp-@fat_crate.local/ Closes: https://lore.kernel.org/all/CAP-bSRZ0CWyZZsMtx046YV8L28LhY0fson2g4EqcwRAVN1Jk+Q@mail.gmail.com/
1 parent 2424e14 commit 92e250c

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

kernel/time/tick-common.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@ void tick_resume(void)
509509

510510
#ifdef CONFIG_SUSPEND
511511
static DEFINE_RAW_SPINLOCK(tick_freeze_lock);
512+
static DEFINE_WAIT_OVERRIDE_MAP(tick_freeze_map, LD_WAIT_SLEEP);
512513
static unsigned int tick_freeze_depth;
513514

514515
/**
@@ -528,9 +529,22 @@ void tick_freeze(void)
528529
if (tick_freeze_depth == num_online_cpus()) {
529530
trace_suspend_resume(TPS("timekeeping_freeze"),
530531
smp_processor_id(), true);
532+
/*
533+
* All other CPUs have their interrupts disabled and are
534+
* suspended to idle. Other tasks have been frozen so there
535+
* is no scheduling happening. This means that there is no
536+
* concurrency in the system at this point. Therefore it is
537+
* okay to acquire a sleeping lock on PREEMPT_RT, such as a
538+
* spinlock, because the lock cannot be held by other CPUs
539+
* or threads and acquiring it cannot block.
540+
*
541+
* Inform lockdep about the situation.
542+
*/
543+
lock_map_acquire_try(&tick_freeze_map);
531544
system_state = SYSTEM_SUSPEND;
532545
sched_clock_suspend();
533546
timekeeping_suspend();
547+
lock_map_release(&tick_freeze_map);
534548
} else {
535549
tick_suspend_local();
536550
}
@@ -552,8 +566,16 @@ void tick_unfreeze(void)
552566
raw_spin_lock(&tick_freeze_lock);
553567

554568
if (tick_freeze_depth == num_online_cpus()) {
569+
/*
570+
* Similar to tick_freeze(). On resumption the first CPU may
571+
* acquire uncontended sleeping locks while other CPUs block on
572+
* tick_freeze_lock.
573+
*/
574+
lock_map_acquire_try(&tick_freeze_map);
555575
timekeeping_resume();
556576
sched_clock_resume();
577+
lock_map_release(&tick_freeze_map);
578+
557579
system_state = SYSTEM_RUNNING;
558580
trace_suspend_resume(TPS("timekeeping_freeze"),
559581
smp_processor_id(), false);

0 commit comments

Comments
 (0)