Skip to content

Commit 312f5b1

Browse files
committed
Merge tag 'core-debugobjects-2025-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull debugobjects update from Thomas Gleixner: "Two small updates for debugobjects: - Allow pool refill on RT enabled kernels before the scheduler is up and running to prevent pool exhaustion - Correct the lockdep override to prevent false positives" * tag 'core-debugobjects-2025-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: debugobjects: Use LD_WAIT_CONFIG instead of LD_WAIT_SLEEP debugobjects: Allow to refill the pool before SYSTEM_SCHEDULING
2 parents 2b09f48 + 37de2db commit 312f5b1

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

lib/debugobjects.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -714,13 +714,13 @@ static void debug_objects_fill_pool(void)
714714
* raw_spinlock_t are basically the same type and this lock-type
715715
* inversion works just fine.
716716
*/
717-
if (!IS_ENABLED(CONFIG_PREEMPT_RT) || preemptible()) {
717+
if (!IS_ENABLED(CONFIG_PREEMPT_RT) || preemptible() || system_state < SYSTEM_SCHEDULING) {
718718
/*
719719
* Annotate away the spinlock_t inside raw_spinlock_t warning
720-
* by temporarily raising the wait-type to WAIT_SLEEP, matching
720+
* by temporarily raising the wait-type to LD_WAIT_CONFIG, matching
721721
* the preemptible() condition above.
722722
*/
723-
static DEFINE_WAIT_OVERRIDE_MAP(fill_pool_map, LD_WAIT_SLEEP);
723+
static DEFINE_WAIT_OVERRIDE_MAP(fill_pool_map, LD_WAIT_CONFIG);
724724
lock_map_acquire_try(&fill_pool_map);
725725
fill_pool();
726726
lock_map_release(&fill_pool_map);

0 commit comments

Comments
 (0)