Commit c0afb0ff authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

locking/ww_mutex: Gather mutex_waiter initialization 



Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210815211304.281927514@linutronix.de
parent cf702edd

kernel/locking/mutex-debug.c

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ void debug_mutex_lock_common(struct mutex *lock, struct mutex_waiter *waiter) 
	memset(waiter, MUTEX_DEBUG_INIT, sizeof(*waiter));

	waiter->magic = waiter;

	INIT_LIST_HEAD(&waiter->list);

	waiter->ww_ctx = MUTEX_POISON_WW_CTX;

}



void debug_mutex_wake_waiter(struct mutex *lock, struct mutex_waiter *waiter)

kernel/locking/mutex.c

+3 −9
Original line number Diff line number Diff line
@@ -982,17 +982,15 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas 
	}



	debug_mutex_lock_common(lock, &waiter);

	waiter.task = current;

	if (ww_ctx)

		waiter.ww_ctx = ww_ctx;



	lock_contended(&lock->dep_map, ip);



	if (!use_ww_ctx) {

		/* add waiting tasks to the end of the waitqueue (FIFO): */

		__mutex_add_waiter(lock, &waiter, &lock->wait_list);





#ifdef CONFIG_DEBUG_MUTEXES

		waiter.ww_ctx = MUTEX_POISON_WW_CTX;

#endif

	} else {

		/*

		 * Add in stamp order, waking up waiters that must kill
@@ -1001,12 +999,8 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas 
		ret = __ww_mutex_add_waiter(&waiter, lock, ww_ctx);

		if (ret)

			goto err_early_kill;



		waiter.ww_ctx = ww_ctx;

	}



	waiter.task = current;



	set_current_state(state);

	for (;;) {

		bool first;