Commit 37de2dbc authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

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: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://patch.msgid.link/20251127153652.291697-3-bigeasy@linutronix.de
parent 06e0ae98

lib/debugobjects.c

+2 −2
Original line number Diff line number Diff line
@@ -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);