From: Chris Wilson <chris@chris-wilson.co.uk>
To: linux-kernel@vger.kernel.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>,
Peter Zijlstra <peterz@infradead.org>,
Waiman Long <Waiman.Long@hpe.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
"Paul E . McKenney" <paulmck@linux.vnet.ibm.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH] locking/mutex: Clear mutex-handoff flag on interrupt
Date: Mon, 9 Jan 2017 11:52:03 +0000 [thread overview]
Message-ID: <20170109115203.2750-1-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <20161007150211.196801561@infradead.org>
If we abort the mutex_lock() due to an interrupt, or other error from
ww_mutex, we need to relinquish the handoff flag if we applied it.
Otherwise, we may cause missed wakeups as the current owner may try to
handoff to a new thread that is not expecting the handoff and so sleep
thinking the lock is already claimed (and since the owner unlocked there
may never be a new wakeup).
Fixes: 9d659ae14b54 ("locking/mutex: Add lock handoff to avoid starvation")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Waiman Long <Waiman.Long@hpe.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
---
kernel/locking/mutex.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
index 9b349619f431..087bbc082ad7 100644
--- a/kernel/locking/mutex.c
+++ b/kernel/locking/mutex.c
@@ -738,6 +738,8 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
err:
__set_task_state(task, TASK_RUNNING);
mutex_remove_waiter(lock, &waiter, task);
+ if (first)
+ __mutex_clear_flag(lock, MUTEX_FLAG_HANDOFF);
spin_unlock_mutex(&lock->wait_lock, flags);
debug_mutex_free_waiter(&waiter);
mutex_release(&lock->dep_map, 1, ip);
--
2.11.0
next prev parent reply other threads:[~2017-01-09 11:52 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 14:52 [PATCH -v4 0/8] locking/mutex: Rewrite basic mutex Peter Zijlstra
2016-10-07 14:52 ` [PATCH -v4 1/8] locking/drm: Kill mutex trickery Peter Zijlstra
2016-10-07 15:43 ` Peter Zijlstra
2016-10-07 15:58 ` Linus Torvalds
2016-10-07 16:13 ` Peter Zijlstra
2016-10-07 21:58 ` Waiman Long
2016-10-08 11:58 ` Thomas Gleixner
2016-10-08 14:01 ` Peter Zijlstra
2016-10-08 14:11 ` Thomas Gleixner
2016-10-08 16:42 ` Peter Zijlstra
2016-11-09 10:38 ` Peter Zijlstra
2016-10-18 12:48 ` Peter Zijlstra
2016-10-18 12:57 ` Peter Zijlstra
2016-11-11 11:22 ` Daniel Vetter
2016-11-11 11:38 ` Peter Zijlstra
2016-11-12 10:58 ` Ingo Molnar
2016-11-14 14:04 ` Peter Zijlstra
2016-11-14 14:27 ` Ingo Molnar
2016-10-18 12:57 ` Chris Wilson
2016-10-07 14:52 ` [PATCH -v4 2/8] locking/mutex: Rework mutex::owner Peter Zijlstra
2016-10-12 17:59 ` Davidlohr Bueso
2016-10-12 19:52 ` Jason Low
2016-10-13 15:18 ` Will Deacon
2016-10-07 14:52 ` [PATCH -v4 3/8] locking/mutex: Kill arch specific code Peter Zijlstra
2016-10-07 14:52 ` [PATCH -v4 4/8] locking/mutex: Allow MUTEX_SPIN_ON_OWNER when DEBUG_MUTEXES Peter Zijlstra
2016-10-07 14:52 ` [PATCH -v4 5/8] locking/mutex: Add lock handoff to avoid starvation Peter Zijlstra
2016-10-13 15:14 ` Will Deacon
2016-10-17 9:22 ` Peter Zijlstra
2016-10-17 18:45 ` Waiman Long
2016-10-17 19:07 ` Waiman Long
2016-10-18 13:02 ` Peter Zijlstra
2016-10-18 12:36 ` Peter Zijlstra
2016-12-27 13:55 ` Chris Wilson
2017-01-09 11:52 ` Chris Wilson [this message]
2017-01-11 16:43 ` [PATCH] locking/mutex: Clear mutex-handoff flag on interrupt Peter Zijlstra
2017-01-11 16:57 ` Chris Wilson
2017-01-12 20:58 ` Chris Wilson
2016-10-07 14:52 ` [PATCH -v4 6/8] locking/mutex: Restructure wait loop Peter Zijlstra
2016-10-13 15:17 ` Will Deacon
2016-10-17 10:44 ` Peter Zijlstra
2016-10-17 13:24 ` Peter Zijlstra
2016-10-17 13:45 ` Boqun Feng
2016-10-17 15:49 ` Peter Zijlstra
2016-10-19 17:34 ` Peter Zijlstra
2016-10-24 1:57 ` ciao set_task_state() (was Re: [PATCH -v4 6/8] locking/mutex: Restructure wait loop) Davidlohr Bueso
2016-10-24 13:26 ` Kent Overstreet
2016-10-24 14:27 ` Kent Overstreet
2016-10-25 16:55 ` Eric Wheeler
2016-10-25 17:45 ` Kent Overstreet
2016-10-17 23:16 ` [PATCH -v4 6/8] locking/mutex: Restructure wait loop Waiman Long
2016-10-18 13:14 ` Peter Zijlstra
2016-10-07 14:52 ` [PATCH -v4 7/8] locking/mutex: Simplify some ww_mutex code in __mutex_lock_common() Peter Zijlstra
2016-10-07 14:52 ` [PATCH -v4 8/8] locking/mutex: Enable optimistic spinning of woken waiter Peter Zijlstra
2016-10-13 15:28 ` Will Deacon
2016-10-17 9:32 ` Peter Zijlstra
2016-10-17 23:21 ` Waiman Long
2016-10-18 12:19 ` Peter Zijlstra
2016-10-07 15:20 ` [PATCH -v4 0/8] locking/mutex: Rewrite basic mutex Linus Torvalds
2016-10-11 18:42 ` Jason Low
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170109115203.2750-1-chris@chris-wilson.co.uk \
--to=chris@chris-wilson.co.uk \
--cc=Waiman.Long@hpe.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).