Skip to content

Commit 1c0908d

Browse files
gormanmKAGA-KOKO
authored andcommitted
rtmutex: Add acquire semantics for rtmutex lock acquisition slow path
Jan Kara reported the following bug triggering on 6.0.5-rt14 running dbench on XFS on arm64. kernel BUG at fs/inode.c:625! Internal error: Oops - BUG: 0 [#1] PREEMPT_RT SMP CPU: 11 PID: 6611 Comm: dbench Tainted: G E 6.0.0-rt14-rt+ #1 pc : clear_inode+0xa0/0xc0 lr : clear_inode+0x38/0xc0 Call trace: clear_inode+0xa0/0xc0 evict+0x160/0x180 iput+0x154/0x240 do_unlinkat+0x184/0x300 __arm64_sys_unlinkat+0x48/0xc0 el0_svc_common.constprop.4+0xe4/0x2c0 do_el0_svc+0xac/0x100 el0_svc+0x78/0x200 el0t_64_sync_handler+0x9c/0xc0 el0t_64_sync+0x19c/0x1a0 It also affects 6.1-rc7-rt5 and affects a preempt-rt fork of 5.14 so this is likely a bug that existed forever and only became visible when ARM support was added to preempt-rt. The same problem does not occur on x86-64 and he also reported that converting sb->s_inode_wblist_lock to raw_spinlock_t makes the problem disappear indicating that the RT spinlock variant is the problem. Which in turn means that RT mutexes on ARM64 and any other weakly ordered architecture are affected by this independent of RT. Will Deacon observed: "I'd be more inclined to be suspicious of the slowpath tbh, as we need to make sure that we have acquire semantics on all paths where the lock can be taken. Looking at the rtmutex code, this really isn't obvious to me -- for example, try_to_take_rt_mutex() appears to be able to return via the 'takeit' label without acquire semantics and it looks like we might be relying on the caller's subsequent _unlock_ of the wait_lock for ordering, but that will give us release semantics which aren't correct." Sebastian Andrzej Siewior prototyped a fix that does work based on that comment but it was a little bit overkill and added some fences that should not be necessary. The lock owner is updated with an IRQ-safe raw spinlock held, but the spin_unlock does not provide acquire semantics which are needed when acquiring a mutex. Adds the necessary acquire semantics for lock owner updates in the slow path acquisition and the waiter bit logic. It successfully completed 10 iterations of the dbench workload while the vanilla kernel fails on the first iteration. [ bigeasy@linutronix.de: Initial prototype fix ] Fixes: 700318d ("locking/rtmutex: Use acquire/release semantics") Fixes: 23f78d4 ("[PATCH] pi-futex: rt mutex core") Reported-by: Jan Kara <jack@suse.cz> Signed-off-by: Mel Gorman <mgorman@techsingularity.net> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20221202100223.6mevpbl7i6x5udfd@techsingularity.net
1 parent 830b3c6 commit 1c0908d

File tree

2 files changed

+49
-12
lines changed

2 files changed

+49
-12
lines changed

kernel/locking/rtmutex.c

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,31 @@ static inline int __ww_mutex_check_kill(struct rt_mutex *lock,
8989
* set this bit before looking at the lock.
9090
*/
9191

92-
static __always_inline void
93-
rt_mutex_set_owner(struct rt_mutex_base *lock, struct task_struct *owner)
92+
static __always_inline struct task_struct *
93+
rt_mutex_owner_encode(struct rt_mutex_base *lock, struct task_struct *owner)
9494
{
9595
unsigned long val = (unsigned long)owner;
9696

9797
if (rt_mutex_has_waiters(lock))
9898
val |= RT_MUTEX_HAS_WAITERS;
9999

100-
WRITE_ONCE(lock->owner, (struct task_struct *)val);
100+
return (struct task_struct *)val;
101+
}
102+
103+
static __always_inline void
104+
rt_mutex_set_owner(struct rt_mutex_base *lock, struct task_struct *owner)
105+
{
106+
/*
107+
* lock->wait_lock is held but explicit acquire semantics are needed
108+
* for a new lock owner so WRITE_ONCE is insufficient.
109+
*/
110+
xchg_acquire(&lock->owner, rt_mutex_owner_encode(lock, owner));
111+
}
112+
113+
static __always_inline void rt_mutex_clear_owner(struct rt_mutex_base *lock)
114+
{
115+
/* lock->wait_lock is held so the unlock provides release semantics. */
116+
WRITE_ONCE(lock->owner, rt_mutex_owner_encode(lock, NULL));
101117
}
102118

103119
static __always_inline void clear_rt_mutex_waiters(struct rt_mutex_base *lock)
@@ -106,7 +122,8 @@ static __always_inline void clear_rt_mutex_waiters(struct rt_mutex_base *lock)
106122
((unsigned long)lock->owner & ~RT_MUTEX_HAS_WAITERS);
107123
}
108124

109-
static __always_inline void fixup_rt_mutex_waiters(struct rt_mutex_base *lock)
125+
static __always_inline void
126+
fixup_rt_mutex_waiters(struct rt_mutex_base *lock, bool acquire_lock)
110127
{
111128
unsigned long owner, *p = (unsigned long *) &lock->owner;
112129

@@ -172,8 +189,21 @@ static __always_inline void fixup_rt_mutex_waiters(struct rt_mutex_base *lock)
172189
* still set.
173190
*/
174191
owner = READ_ONCE(*p);
175-
if (owner & RT_MUTEX_HAS_WAITERS)
176-
WRITE_ONCE(*p, owner & ~RT_MUTEX_HAS_WAITERS);
192+
if (owner & RT_MUTEX_HAS_WAITERS) {
193+
/*
194+
* See rt_mutex_set_owner() and rt_mutex_clear_owner() on
195+
* why xchg_acquire() is used for updating owner for
196+
* locking and WRITE_ONCE() for unlocking.
197+
*
198+
* WRITE_ONCE() would work for the acquire case too, but
199+
* in case that the lock acquisition failed it might
200+
* force other lockers into the slow path unnecessarily.
201+
*/
202+
if (acquire_lock)
203+
xchg_acquire(p, owner & ~RT_MUTEX_HAS_WAITERS);
204+
else
205+
WRITE_ONCE(*p, owner & ~RT_MUTEX_HAS_WAITERS);
206+
}
177207
}
178208

179209
/*
@@ -208,6 +238,13 @@ static __always_inline void mark_rt_mutex_waiters(struct rt_mutex_base *lock)
208238
owner = *p;
209239
} while (cmpxchg_relaxed(p, owner,
210240
owner | RT_MUTEX_HAS_WAITERS) != owner);
241+
242+
/*
243+
* The cmpxchg loop above is relaxed to avoid back-to-back ACQUIRE
244+
* operations in the event of contention. Ensure the successful
245+
* cmpxchg is visible.
246+
*/
247+
smp_mb__after_atomic();
211248
}
212249

213250
/*
@@ -1243,7 +1280,7 @@ static int __sched __rt_mutex_slowtrylock(struct rt_mutex_base *lock)
12431280
* try_to_take_rt_mutex() sets the lock waiters bit
12441281
* unconditionally. Clean this up.
12451282
*/
1246-
fixup_rt_mutex_waiters(lock);
1283+
fixup_rt_mutex_waiters(lock, true);
12471284

12481285
return ret;
12491286
}
@@ -1604,7 +1641,7 @@ static int __sched __rt_mutex_slowlock(struct rt_mutex_base *lock,
16041641
* try_to_take_rt_mutex() sets the waiter bit
16051642
* unconditionally. We might have to fix that up.
16061643
*/
1607-
fixup_rt_mutex_waiters(lock);
1644+
fixup_rt_mutex_waiters(lock, true);
16081645

16091646
trace_contention_end(lock, ret);
16101647

@@ -1719,7 +1756,7 @@ static void __sched rtlock_slowlock_locked(struct rt_mutex_base *lock)
17191756
* try_to_take_rt_mutex() sets the waiter bit unconditionally.
17201757
* We might have to fix that up:
17211758
*/
1722-
fixup_rt_mutex_waiters(lock);
1759+
fixup_rt_mutex_waiters(lock, true);
17231760
debug_rt_mutex_free_waiter(&waiter);
17241761

17251762
trace_contention_end(lock, 0);

kernel/locking/rtmutex_api.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ void __sched rt_mutex_init_proxy_locked(struct rt_mutex_base *lock,
267267
void __sched rt_mutex_proxy_unlock(struct rt_mutex_base *lock)
268268
{
269269
debug_rt_mutex_proxy_unlock(lock);
270-
rt_mutex_set_owner(lock, NULL);
270+
rt_mutex_clear_owner(lock);
271271
}
272272

273273
/**
@@ -382,7 +382,7 @@ int __sched rt_mutex_wait_proxy_lock(struct rt_mutex_base *lock,
382382
* try_to_take_rt_mutex() sets the waiter bit unconditionally. We might
383383
* have to fix that up.
384384
*/
385-
fixup_rt_mutex_waiters(lock);
385+
fixup_rt_mutex_waiters(lock, true);
386386
raw_spin_unlock_irq(&lock->wait_lock);
387387

388388
return ret;
@@ -438,7 +438,7 @@ bool __sched rt_mutex_cleanup_proxy_lock(struct rt_mutex_base *lock,
438438
* try_to_take_rt_mutex() sets the waiter bit unconditionally. We might
439439
* have to fix that up.
440440
*/
441-
fixup_rt_mutex_waiters(lock);
441+
fixup_rt_mutex_waiters(lock, false);
442442

443443
raw_spin_unlock_irq(&lock->wait_lock);
444444

0 commit comments

Comments
 (0)