1 files changed, 41 insertions, 14 deletions

diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index bab66cbe3b37..7d63bc5dd9b2 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1488,15 +1488,23 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
 
 /*
  * Futex variant with full deadlock detection.
+ * Futex variants must not use the fast-path, see __rt_mutex_futex_unlock().
  */
-int rt_mutex_timed_futex_lock(struct rt_mutex *lock,
+int __sched rt_mutex_timed_futex_lock(struct rt_mutex *lock,
                               struct hrtimer_sleeper *timeout)
 {
         might_sleep();
 
-        return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
-                                       RT_MUTEX_FULL_CHAINWALK,
-                                       rt_mutex_slowlock);
+        return rt_mutex_slowlock(lock, TASK_INTERRUPTIBLE,
+                                 timeout, RT_MUTEX_FULL_CHAINWALK);
+}
+
+/*
+ * Futex variant, must not use fastpath.
+ */
+int __sched rt_mutex_futex_trylock(struct rt_mutex *lock)
+{
+        return rt_mutex_slowtrylock(lock);
 }
 
 /**
@@ -1555,19 +1563,38 @@ void __sched rt_mutex_unlock(struct rt_mutex *lock)
 EXPORT_SYMBOL_GPL(rt_mutex_unlock);
 
 /**
- * rt_mutex_futex_unlock - Futex variant of rt_mutex_unlock
- * @lock: the rt_mutex to be unlocked
- *
- * Returns: true/false indicating whether priority adjustment is
- * required or not.
+ * Futex variant, that since futex variants do not use the fast-path, can be
+ * simple and will not need to retry.
  */
-bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock,
-                                   struct wake_q_head *wqh)
+bool __sched __rt_mutex_futex_unlock(struct rt_mutex *lock,
+                                    struct wake_q_head *wake_q)
 {
-        if (likely(rt_mutex_cmpxchg_release(lock, current, NULL)))
-                return false;
+        lockdep_assert_held(&lock->wait_lock);
+
+        debug_rt_mutex_unlock(lock);
+
+        if (!rt_mutex_has_waiters(lock)) {
+                lock->owner = NULL;
+                return false; /* done */
+        }
+
+        mark_wakeup_next_waiter(wake_q, lock);
+        return true; /* deboost and wakeups */
+}
 
-        return rt_mutex_slowunlock(lock, wqh);
+void __sched rt_mutex_futex_unlock(struct rt_mutex *lock)
+{
+        DEFINE_WAKE_Q(wake_q);
+        bool deboost;
+
+        raw_spin_lock_irq(&lock->wait_lock);
+        deboost = __rt_mutex_futex_unlock(lock, &wake_q);
+        raw_spin_unlock_irq(&lock->wait_lock);
+
+        if (deboost) {
+                wake_up_q(&wake_q);
+                rt_mutex_adjust_prio(current);
+        }
 }
 
 /**