Skip to content

Commit 1be5d4f

Browse files
KAGA-KOKOingomolnar
authored andcommitted
locking/rtmutex: Use READ_ONCE() in rt_mutex_owner()
While debugging the rtmutex unlock vs. dequeue race Will suggested to use READ_ONCE() in rt_mutex_owner() as it might race against the cmpxchg_release() in unlock_rt_mutex_safe(). Will: "It's a minor thing which will most likely not matter in practice" Careful search did not unearth an actual problem in todays code, but it's better to be safe than surprised. Suggested-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: David Daney <ddaney@caviumnetworks.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sebastian Siewior <bigeasy@linutronix.de> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/20161130210030.431379999@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent dbb2605 commit 1be5d4f

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

kernel/locking/rtmutex_common.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ task_top_pi_waiter(struct task_struct *p)
7575

7676
static inline struct task_struct *rt_mutex_owner(struct rt_mutex *lock)
7777
{
78-
return (struct task_struct *)
79-
((unsigned long)lock->owner & ~RT_MUTEX_OWNER_MASKALL);
78+
unsigned long owner = (unsigned long) READ_ONCE(lock->owner);
79+
80+
return (struct task_struct *) (owner & ~RT_MUTEX_OWNER_MASKALL);
8081
}
8182

8283
/*

0 commit comments

Comments
 (0)