Skip to content

Commit 37de2db

Browse files
Sebastian Andrzej SiewiorKAGA-KOKO
authored andcommitted
debugobjects: Use LD_WAIT_CONFIG instead of LD_WAIT_SLEEP
fill_pool_map is used to suppress nesting violations caused by acquiring a spinlock_t (from within the memory allocator) while holding a raw_spinlock_t. The used annotation is wrong. LD_WAIT_SLEEP is for always sleeping lock types such as mutex_t. LD_WAIT_CONFIG is for lock type which are sleeping while spinning on PREEMPT_RT such as spinlock_t. Use LD_WAIT_CONFIG as override. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://patch.msgid.link/20251127153652.291697-3-bigeasy@linutronix.de
1 parent 06e0ae9 commit 37de2db

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

lib/debugobjects.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,10 +717,10 @@ static void debug_objects_fill_pool(void)
717717
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)