Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (02bf0ef0) · Commits · 戴 / test

Pull locking fix from Thomas Gleixner: "rt_mutex_futex_unlock() grew a new irq-off call site, but the function assumes that its always called from irq enabled context. Use (un)lock_irqsafe() to handle the new call site correctly" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: rtmutex: Make rt_mutex_futex_unlock() safe for irq-off callsites

kernel/locking/rtmutex.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1616,11 +1616,12 @@ bool __sched __rt_mutex_futex_unlock(struct rt_mutex *lock,
	void __sched rt_mutex_futex_unlock(struct rt_mutex *lock)		void __sched rt_mutex_futex_unlock(struct rt_mutex *lock)
	{		{
	DEFINE_WAKE_Q(wake_q);		DEFINE_WAKE_Q(wake_q);
			unsigned long flags;
	bool postunlock;		bool postunlock;

	raw_spin_lock_irq(&lock->wait_lock);		raw_spin_lock_irqsave(&lock->wait_lock, flags);
	postunlock = __rt_mutex_futex_unlock(lock, &wake_q);		postunlock = __rt_mutex_futex_unlock(lock, &wake_q);
	raw_spin_unlock_irq(&lock->wait_lock);		raw_spin_unlock_irqrestore(&lock->wait_lock, flags);

	if (postunlock)		if (postunlock)
	rt_mutex_postunlock(&wake_q);		rt_mutex_postunlock(&wake_q);

Admin message