]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
debugobjects: Use LD_WAIT_CONFIG instead of LD_WAIT_SLEEP
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Thu, 27 Nov 2025 15:36:52 +0000 (16:36 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 27 Nov 2025 15:55:34 +0000 (16:55 +0100)
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
lib/debugobjects.c

index 7017e5c8f32ddd3c884b8b1cac4400f77281c788..ecf8e7f978e30c6180f69909b3f5ca4837d1fd85 100644 (file)
@@ -717,10 +717,10 @@ static void debug_objects_fill_pool(void)
        if (!IS_ENABLED(CONFIG_PREEMPT_RT) || preemptible() || system_state < SYSTEM_SCHEDULING) {
                /*
                 * Annotate away the spinlock_t inside raw_spinlock_t warning
-                * by temporarily raising the wait-type to WAIT_SLEEP, matching
+                * by temporarily raising the wait-type to LD_WAIT_CONFIG, matching
                 * the preemptible() condition above.
                 */
-               static DEFINE_WAIT_OVERRIDE_MAP(fill_pool_map, LD_WAIT_SLEEP);
+               static DEFINE_WAIT_OVERRIDE_MAP(fill_pool_map, LD_WAIT_CONFIG);
                lock_map_acquire_try(&fill_pool_map);
                fill_pool();
                lock_map_release(&fill_pool_map);