Skip to content

Commit 51339d9

Browse files
Alexei Starovoitovakpm00
authored andcommitted
locking/local_lock, mm: replace localtry_ helpers with local_trylock_t type
Partially revert commit 0aaddfb ("locking/local_lock: Introduce localtry_lock_t"). Remove localtry_*() helpers, since localtry_lock() name might be misinterpreted as "try lock". Introduce local_trylock[_irqsave]() helpers that only work with newly introduced local_trylock_t type. Note that attempt to use local_trylock[_irqsave]() with local_lock_t will cause compilation failure. Usage and behavior in !PREEMPT_RT: local_lock_t lock; // sizeof(lock) == 0 local_lock(&lock); // preempt disable local_lock_irqsave(&lock, ...); // irq save if (local_trylock_irqsave(&lock, ...)) // compilation error local_trylock_t lock; // sizeof(lock) == 4 local_lock(&lock); // preempt disable, acquired = 1 local_lock_irqsave(&lock, ...); // irq save, acquired = 1 if (local_trylock(&lock)) // if (!acquired) preempt disable, acquired = 1 if (local_trylock_irqsave(&lock, ...)) // if (!acquired) irq save, acquired = 1 The existing local_lock_*() macros can be used either with local_lock_t or local_trylock_t. With local_trylock_t they set acquired = 1 while local_unlock_*() clears it. In !PREEMPT_RT local_lock_irqsave(local_lock_t *) disables interrupts to protect critical section, but it doesn't prevent NMI, so the fully reentrant code cannot use local_lock_irqsave(local_lock_t *) for exclusive access. The local_lock_irqsave(local_trylock_t *) helper disables interrupts and sets acquired=1, so local_trylock_irqsave(local_trylock_t *) from NMI attempting to acquire the same lock will return false. In PREEMPT_RT local_lock_irqsave() maps to preemptible spin_lock(). Map local_trylock_irqsave() to preemptible spin_trylock(). When in hard IRQ or NMI return false right away, since spin_trylock() is not safe due to explicit locking in the underneath rt_spin_trylock() implementation. Removing this explicit locking and attempting only "trylock" is undesired due to PI implications. The local_trylock() without _irqsave can be used to avoid the cost of disabling/enabling interrupts by only disabling preemption, so local_trylock() in an interrupt attempting to acquire the same lock will return false. Note there is no need to use local_inc for acquired variable, since it's a percpu variable with strict nesting scopes. Note that guard(local_lock)(&lock) works only for "local_lock_t lock". The patch also makes sure that local_lock_release(l) is called before WRITE_ONCE(l->acquired, 0). Though IRQs are disabled at this point the local_trylock() from NMI will succeed and local_lock_acquire(l) will warn. Link: https://lkml.kernel.org/r/[email protected] Fixes: 0aaddfb ("locking/local_lock: Introduce localtry_lock_t") Signed-off-by: Alexei Starovoitov <[email protected]> Acked-by: Vlastimil Babka <[email protected]> Acked-by: Sebastian Andrzej Siewior <[email protected]> Reviewed-by: Shakeel Butt <[email protected]> Cc: Daniel Borkman <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Martin KaFai Lau <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Steven Rostedt <[email protected]> Cc: Vlastimil Babka <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent a30951d commit 51339d9

File tree

3 files changed

+114
-190
lines changed

3 files changed

+114
-190
lines changed

include/linux/local_lock.h

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -52,74 +52,32 @@
5252
__local_unlock_irqrestore(lock, flags)
5353

5454
/**
55-
* localtry_lock_init - Runtime initialize a lock instance
56-
*/
57-
#define localtry_lock_init(lock) __localtry_lock_init(lock)
58-
59-
/**
60-
* localtry_lock - Acquire a per CPU local lock
61-
* @lock: The lock variable
62-
*/
63-
#define localtry_lock(lock) __localtry_lock(lock)
64-
65-
/**
66-
* localtry_lock_irq - Acquire a per CPU local lock and disable interrupts
67-
* @lock: The lock variable
68-
*/
69-
#define localtry_lock_irq(lock) __localtry_lock_irq(lock)
70-
71-
/**
72-
* localtry_lock_irqsave - Acquire a per CPU local lock, save and disable
73-
* interrupts
74-
* @lock: The lock variable
75-
* @flags: Storage for interrupt flags
55+
* local_lock_init - Runtime initialize a lock instance
7656
*/
77-
#define localtry_lock_irqsave(lock, flags) \
78-
__localtry_lock_irqsave(lock, flags)
57+
#define local_trylock_init(lock) __local_trylock_init(lock)
7958

8059
/**
81-
* localtry_trylock - Try to acquire a per CPU local lock.
60+
* local_trylock - Try to acquire a per CPU local lock
8261
* @lock: The lock variable
8362
*
8463
* The function can be used in any context such as NMI or HARDIRQ. Due to
8564
* locking constrains it will _always_ fail to acquire the lock in NMI or
8665
* HARDIRQ context on PREEMPT_RT.
8766
*/
88-
#define localtry_trylock(lock) __localtry_trylock(lock)
67+
#define local_trylock(lock) __local_trylock(lock)
8968

9069
/**
91-
* localtry_trylock_irqsave - Try to acquire a per CPU local lock, save and disable
92-
* interrupts if acquired
70+
* local_trylock_irqsave - Try to acquire a per CPU local lock, save and disable
71+
* interrupts if acquired
9372
* @lock: The lock variable
9473
* @flags: Storage for interrupt flags
9574
*
9675
* The function can be used in any context such as NMI or HARDIRQ. Due to
9776
* locking constrains it will _always_ fail to acquire the lock in NMI or
9877
* HARDIRQ context on PREEMPT_RT.
9978
*/
100-
#define localtry_trylock_irqsave(lock, flags) \
101-
__localtry_trylock_irqsave(lock, flags)
102-
103-
/**
104-
* local_unlock - Release a per CPU local lock
105-
* @lock: The lock variable
106-
*/
107-
#define localtry_unlock(lock) __localtry_unlock(lock)
108-
109-
/**
110-
* local_unlock_irq - Release a per CPU local lock and enable interrupts
111-
* @lock: The lock variable
112-
*/
113-
#define localtry_unlock_irq(lock) __localtry_unlock_irq(lock)
114-
115-
/**
116-
* localtry_unlock_irqrestore - Release a per CPU local lock and restore
117-
* interrupt flags
118-
* @lock: The lock variable
119-
* @flags: Interrupt flags to restore
120-
*/
121-
#define localtry_unlock_irqrestore(lock, flags) \
122-
__localtry_unlock_irqrestore(lock, flags)
79+
#define local_trylock_irqsave(lock, flags) \
80+
__local_trylock_irqsave(lock, flags)
12381

12482
DEFINE_GUARD(local_lock, local_lock_t __percpu*,
12583
local_lock(_T),

0 commit comments

Comments
 (0)