Commit 312f5b18 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2b09f480 37de2dbc

lib/debugobjects.c

+3 −3
Original line number Diff line number Diff line
@@ -714,13 +714,13 @@ static void debug_objects_fill_pool(void) 
	 * raw_spinlock_t are basically the same type and this lock-type

	 * inversion works just fine.

	 */

	if (!IS_ENABLED(CONFIG_PREEMPT_RT) || preemptible()) {

	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);