Skip to content

Commit 9828ea9

Browse files
KAGA-KOKOKAGA-KOKO
committed
locking: Further name space cleanups
The name space hierarchy for the internal lock functions is now a bit backwards. raw_spin* functions map to _spin* which use __spin*, while we would like to have _raw_spin* and __raw_spin*. _raw_spin* is already used by lock debugging, so rename those funtions to do_raw_spin* to free up the _raw_spin* name space. No functional change. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Peter Zijlstra <[email protected]> Acked-by: Ingo Molnar <[email protected]>
1 parent 5f6384c commit 9828ea9

File tree

8 files changed

+81
-81
lines changed

8 files changed

+81
-81
lines changed

‎include/linux/rwlock.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@ do { \
2929
#endif
3030

3131
#ifdef CONFIG_DEBUG_SPINLOCK
32-
extern void _raw_read_lock(rwlock_t *lock);
33-
#define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock)
34-
extern int _raw_read_trylock(rwlock_t *lock);
35-
extern void _raw_read_unlock(rwlock_t *lock);
36-
extern void _raw_write_lock(rwlock_t *lock);
37-
#define _raw_write_lock_flags(lock, flags) _raw_write_lock(lock)
38-
extern int _raw_write_trylock(rwlock_t *lock);
39-
extern void _raw_write_unlock(rwlock_t *lock);
32+
extern void do_raw_read_lock(rwlock_t *lock);
33+
#define do_raw_read_lock_flags(lock, flags) do_raw_read_lock(lock)
34+
extern int do_raw_read_trylock(rwlock_t *lock);
35+
extern void do_raw_read_unlock(rwlock_t *lock);
36+
extern void do_raw_write_lock(rwlock_t *lock);
37+
#define do_raw_write_lock_flags(lock, flags) do_raw_write_lock(lock)
38+
extern int do_raw_write_trylock(rwlock_t *lock);
39+
extern void do_raw_write_unlock(rwlock_t *lock);
4040
#else
41-
# define _raw_read_lock(rwlock) arch_read_lock(&(rwlock)->raw_lock)
42-
# define _raw_read_lock_flags(lock, flags) \
41+
# define do_raw_read_lock(rwlock) arch_read_lock(&(rwlock)->raw_lock)
42+
# define do_raw_read_lock_flags(lock, flags) \
4343
arch_read_lock_flags(&(lock)->raw_lock, *(flags))
44-
# define _raw_read_trylock(rwlock) arch_read_trylock(&(rwlock)->raw_lock)
45-
# define _raw_read_unlock(rwlock) arch_read_unlock(&(rwlock)->raw_lock)
46-
# define _raw_write_lock(rwlock) arch_write_lock(&(rwlock)->raw_lock)
47-
# define _raw_write_lock_flags(lock, flags) \
44+
# define do_raw_read_trylock(rwlock) arch_read_trylock(&(rwlock)->raw_lock)
45+
# define do_raw_read_unlock(rwlock) arch_read_unlock(&(rwlock)->raw_lock)
46+
# define do_raw_write_lock(rwlock) arch_write_lock(&(rwlock)->raw_lock)
47+
# define do_raw_write_lock_flags(lock, flags) \
4848
arch_write_lock_flags(&(lock)->raw_lock, *(flags))
49-
# define _raw_write_trylock(rwlock) arch_write_trylock(&(rwlock)->raw_lock)
50-
# define _raw_write_unlock(rwlock) arch_write_unlock(&(rwlock)->raw_lock)
49+
# define do_raw_write_trylock(rwlock) arch_write_trylock(&(rwlock)->raw_lock)
50+
# define do_raw_write_unlock(rwlock) arch_write_unlock(&(rwlock)->raw_lock)
5151
#endif
5252

5353
#define read_can_lock(rwlock) arch_read_can_lock(&(rwlock)->raw_lock)

‎include/linux/rwlock_api_smp.h

+20-20
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
113113
static inline int __read_trylock(rwlock_t *lock)
114114
{
115115
preempt_disable();
116-
if (_raw_read_trylock(lock)) {
116+
if (do_raw_read_trylock(lock)) {
117117
rwlock_acquire_read(&lock->dep_map, 0, 1, _RET_IP_);
118118
return 1;
119119
}
@@ -124,7 +124,7 @@ static inline int __read_trylock(rwlock_t *lock)
124124
static inline int __write_trylock(rwlock_t *lock)
125125
{
126126
preempt_disable();
127-
if (_raw_write_trylock(lock)) {
127+
if (do_raw_write_trylock(lock)) {
128128
rwlock_acquire(&lock->dep_map, 0, 1, _RET_IP_);
129129
return 1;
130130
}
@@ -143,7 +143,7 @@ static inline void __read_lock(rwlock_t *lock)
143143
{
144144
preempt_disable();
145145
rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
146-
LOCK_CONTENDED(lock, _raw_read_trylock, _raw_read_lock);
146+
LOCK_CONTENDED(lock, do_raw_read_trylock, do_raw_read_lock);
147147
}
148148

149149
static inline unsigned long __read_lock_irqsave(rwlock_t *lock)
@@ -153,8 +153,8 @@ static inline unsigned long __read_lock_irqsave(rwlock_t *lock)
153153
local_irq_save(flags);
154154
preempt_disable();
155155
rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
156-
LOCK_CONTENDED_FLAGS(lock, _raw_read_trylock, _raw_read_lock,
157-
_raw_read_lock_flags, &flags);
156+
LOCK_CONTENDED_FLAGS(lock, do_raw_read_trylock, do_raw_read_lock,
157+
do_raw_read_lock_flags, &flags);
158158
return flags;
159159
}
160160

@@ -163,15 +163,15 @@ static inline void __read_lock_irq(rwlock_t *lock)
163163
local_irq_disable();
164164
preempt_disable();
165165
rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
166-
LOCK_CONTENDED(lock, _raw_read_trylock, _raw_read_lock);
166+
LOCK_CONTENDED(lock, do_raw_read_trylock, do_raw_read_lock);
167167
}
168168

169169
static inline void __read_lock_bh(rwlock_t *lock)
170170
{
171171
local_bh_disable();
172172
preempt_disable();
173173
rwlock_acquire_read(&lock->dep_map, 0, 0, _RET_IP_);
174-
LOCK_CONTENDED(lock, _raw_read_trylock, _raw_read_lock);
174+
LOCK_CONTENDED(lock, do_raw_read_trylock, do_raw_read_lock);
175175
}
176176

177177
static inline unsigned long __write_lock_irqsave(rwlock_t *lock)
@@ -181,8 +181,8 @@ static inline unsigned long __write_lock_irqsave(rwlock_t *lock)
181181
local_irq_save(flags);
182182
preempt_disable();
183183
rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
184-
LOCK_CONTENDED_FLAGS(lock, _raw_write_trylock, _raw_write_lock,
185-
_raw_write_lock_flags, &flags);
184+
LOCK_CONTENDED_FLAGS(lock, do_raw_write_trylock, do_raw_write_lock,
185+
do_raw_write_lock_flags, &flags);
186186
return flags;
187187
}
188188

@@ -191,60 +191,60 @@ static inline void __write_lock_irq(rwlock_t *lock)
191191
local_irq_disable();
192192
preempt_disable();
193193
rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
194-
LOCK_CONTENDED(lock, _raw_write_trylock, _raw_write_lock);
194+
LOCK_CONTENDED(lock, do_raw_write_trylock, do_raw_write_lock);
195195
}
196196

197197
static inline void __write_lock_bh(rwlock_t *lock)
198198
{
199199
local_bh_disable();
200200
preempt_disable();
201201
rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
202-
LOCK_CONTENDED(lock, _raw_write_trylock, _raw_write_lock);
202+
LOCK_CONTENDED(lock, do_raw_write_trylock, do_raw_write_lock);
203203
}
204204

205205
static inline void __write_lock(rwlock_t *lock)
206206
{
207207
preempt_disable();
208208
rwlock_acquire(&lock->dep_map, 0, 0, _RET_IP_);
209-
LOCK_CONTENDED(lock, _raw_write_trylock, _raw_write_lock);
209+
LOCK_CONTENDED(lock, do_raw_write_trylock, do_raw_write_lock);
210210
}
211211

212212
#endif /* CONFIG_PREEMPT */
213213

214214
static inline void __write_unlock(rwlock_t *lock)
215215
{
216216
rwlock_release(&lock->dep_map, 1, _RET_IP_);
217-
_raw_write_unlock(lock);
217+
do_raw_write_unlock(lock);
218218
preempt_enable();
219219
}
220220

221221
static inline void __read_unlock(rwlock_t *lock)
222222
{
223223
rwlock_release(&lock->dep_map, 1, _RET_IP_);
224-
_raw_read_unlock(lock);
224+
do_raw_read_unlock(lock);
225225
preempt_enable();
226226
}
227227

228228
static inline void __read_unlock_irqrestore(rwlock_t *lock, unsigned long flags)
229229
{
230230
rwlock_release(&lock->dep_map, 1, _RET_IP_);
231-
_raw_read_unlock(lock);
231+
do_raw_read_unlock(lock);
232232
local_irq_restore(flags);
233233
preempt_enable();
234234
}
235235

236236
static inline void __read_unlock_irq(rwlock_t *lock)
237237
{
238238
rwlock_release(&lock->dep_map, 1, _RET_IP_);
239-
_raw_read_unlock(lock);
239+
do_raw_read_unlock(lock);
240240
local_irq_enable();
241241
preempt_enable();
242242
}
243243

244244
static inline void __read_unlock_bh(rwlock_t *lock)
245245
{
246246
rwlock_release(&lock->dep_map, 1, _RET_IP_);
247-
_raw_read_unlock(lock);
247+
do_raw_read_unlock(lock);
248248
preempt_enable_no_resched();
249249
local_bh_enable_ip((unsigned long)__builtin_return_address(0));
250250
}
@@ -253,23 +253,23 @@ static inline void __write_unlock_irqrestore(rwlock_t *lock,
253253
unsigned long flags)
254254
{
255255
rwlock_release(&lock->dep_map, 1, _RET_IP_);
256-
_raw_write_unlock(lock);
256+
do_raw_write_unlock(lock);
257257
local_irq_restore(flags);
258258
preempt_enable();
259259
}
260260

261261
static inline void __write_unlock_irq(rwlock_t *lock)
262262
{
263263
rwlock_release(&lock->dep_map, 1, _RET_IP_);
264-
_raw_write_unlock(lock);
264+
do_raw_write_unlock(lock);
265265
local_irq_enable();
266266
preempt_enable();
267267
}
268268

269269
static inline void __write_unlock_bh(rwlock_t *lock)
270270
{
271271
rwlock_release(&lock->dep_map, 1, _RET_IP_);
272-
_raw_write_unlock(lock);
272+
do_raw_write_unlock(lock);
273273
preempt_enable_no_resched();
274274
local_bh_enable_ip((unsigned long)__builtin_return_address(0));
275275
}

‎include/linux/spinlock.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -128,28 +128,28 @@ static inline void smp_mb__after_lock(void) { smp_mb(); }
128128
#define raw_spin_unlock_wait(lock) arch_spin_unlock_wait(&(lock)->raw_lock)
129129

130130
#ifdef CONFIG_DEBUG_SPINLOCK
131-
extern void _raw_spin_lock(raw_spinlock_t *lock);
132-
#define _raw_spin_lock_flags(lock, flags) _raw_spin_lock(lock)
133-
extern int _raw_spin_trylock(raw_spinlock_t *lock);
134-
extern void _raw_spin_unlock(raw_spinlock_t *lock);
131+
extern void do_raw_spin_lock(raw_spinlock_t *lock);
132+
#define do_raw_spin_lock_flags(lock, flags) do_raw_spin_lock(lock)
133+
extern int do_raw_spin_trylock(raw_spinlock_t *lock);
134+
extern void do_raw_spin_unlock(raw_spinlock_t *lock);
135135
#else
136-
static inline void _raw_spin_lock(raw_spinlock_t *lock)
136+
static inline void do_raw_spin_lock(raw_spinlock_t *lock)
137137
{
138138
arch_spin_lock(&lock->raw_lock);
139139
}
140140

141141
static inline void
142-
_raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long *flags)
142+
do_raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long *flags)
143143
{
144144
arch_spin_lock_flags(&lock->raw_lock, *flags);
145145
}
146146

147-
static inline int _raw_spin_trylock(raw_spinlock_t *lock)
147+
static inline int do_raw_spin_trylock(raw_spinlock_t *lock)
148148
{
149149
return arch_spin_trylock(&(lock)->raw_lock);
150150
}
151151

152-
static inline void _raw_spin_unlock(raw_spinlock_t *lock)
152+
static inline void do_raw_spin_unlock(raw_spinlock_t *lock)
153153
{
154154
arch_spin_unlock(&lock->raw_lock);
155155
}

‎include/linux/spinlock_api_smp.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ _spin_unlock_irqrestore(raw_spinlock_t *lock, unsigned long flags)
8585
static inline int __spin_trylock(raw_spinlock_t *lock)
8686
{
8787
preempt_disable();
88-
if (_raw_spin_trylock(lock)) {
88+
if (do_raw_spin_trylock(lock)) {
8989
spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
9090
return 1;
9191
}
@@ -109,13 +109,13 @@ static inline unsigned long __spin_lock_irqsave(raw_spinlock_t *lock)
109109
spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
110110
/*
111111
* On lockdep we dont want the hand-coded irq-enable of
112-
* _raw_spin_lock_flags() code, because lockdep assumes
112+
* do_raw_spin_lock_flags() code, because lockdep assumes
113113
* that interrupts are not re-enabled during lock-acquire:
114114
*/
115115
#ifdef CONFIG_LOCKDEP
116-
LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
116+
LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
117117
#else
118-
_raw_spin_lock_flags(lock, &flags);
118+
do_raw_spin_lock_flags(lock, &flags);
119119
#endif
120120
return flags;
121121
}
@@ -125,54 +125,54 @@ static inline void __spin_lock_irq(raw_spinlock_t *lock)
125125
local_irq_disable();
126126
preempt_disable();
127127
spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
128-
LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
128+
LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
129129
}
130130

131131
static inline void __spin_lock_bh(raw_spinlock_t *lock)
132132
{
133133
local_bh_disable();
134134
preempt_disable();
135135
spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
136-
LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
136+
LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
137137
}
138138

139139
static inline void __spin_lock(raw_spinlock_t *lock)
140140
{
141141
preempt_disable();
142142
spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
143-
LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
143+
LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
144144
}
145145

146146
#endif /* CONFIG_PREEMPT */
147147

148148
static inline void __spin_unlock(raw_spinlock_t *lock)
149149
{
150150
spin_release(&lock->dep_map, 1, _RET_IP_);
151-
_raw_spin_unlock(lock);
151+
do_raw_spin_unlock(lock);
152152
preempt_enable();
153153
}
154154

155155
static inline void __spin_unlock_irqrestore(raw_spinlock_t *lock,
156156
unsigned long flags)
157157
{
158158
spin_release(&lock->dep_map, 1, _RET_IP_);
159-
_raw_spin_unlock(lock);
159+
do_raw_spin_unlock(lock);
160160
local_irq_restore(flags);
161161
preempt_enable();
162162
}
163163

164164
static inline void __spin_unlock_irq(raw_spinlock_t *lock)
165165
{
166166
spin_release(&lock->dep_map, 1, _RET_IP_);
167-
_raw_spin_unlock(lock);
167+
do_raw_spin_unlock(lock);
168168
local_irq_enable();
169169
preempt_enable();
170170
}
171171

172172
static inline void __spin_unlock_bh(raw_spinlock_t *lock)
173173
{
174174
spin_release(&lock->dep_map, 1, _RET_IP_);
175-
_raw_spin_unlock(lock);
175+
do_raw_spin_unlock(lock);
176176
preempt_enable_no_resched();
177177
local_bh_enable_ip((unsigned long)__builtin_return_address(0));
178178
}
@@ -181,7 +181,7 @@ static inline int __spin_trylock_bh(raw_spinlock_t *lock)
181181
{
182182
local_bh_disable();
183183
preempt_disable();
184-
if (_raw_spin_trylock(lock)) {
184+
if (do_raw_spin_trylock(lock)) {
185185
spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
186186
return 1;
187187
}

‎kernel/sched.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6684,7 +6684,7 @@ SYSCALL_DEFINE0(sched_yield)
66846684
*/
66856685
__release(rq->lock);
66866686
spin_release(&rq->lock.dep_map, 1, _THIS_IP_);
6687-
_raw_spin_unlock(&rq->lock);
6687+
do_raw_spin_unlock(&rq->lock);
66886688
preempt_enable_no_resched();
66896689

66906690
schedule();

‎kernel/spinlock.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void __lockfunc __##op##_lock(locktype##_t *lock) \
4848
{ \
4949
for (;;) { \
5050
preempt_disable(); \
51-
if (likely(_raw_##op##_trylock(lock))) \
51+
if (likely(do_raw_##op##_trylock(lock))) \
5252
break; \
5353
preempt_enable(); \
5454
\
@@ -67,7 +67,7 @@ unsigned long __lockfunc __##op##_lock_irqsave(locktype##_t *lock) \
6767
for (;;) { \
6868
preempt_disable(); \
6969
local_irq_save(flags); \
70-
if (likely(_raw_##op##_trylock(lock))) \
70+
if (likely(do_raw_##op##_trylock(lock))) \
7171
break; \
7272
local_irq_restore(flags); \
7373
preempt_enable(); \
@@ -345,7 +345,7 @@ void __lockfunc _spin_lock_nested(raw_spinlock_t *lock, int subclass)
345345
{
346346
preempt_disable();
347347
spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
348-
LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
348+
LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
349349
}
350350
EXPORT_SYMBOL(_spin_lock_nested);
351351

@@ -357,8 +357,8 @@ unsigned long __lockfunc _spin_lock_irqsave_nested(raw_spinlock_t *lock,
357357
local_irq_save(flags);
358358
preempt_disable();
359359
spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
360-
LOCK_CONTENDED_FLAGS(lock, _raw_spin_trylock, _raw_spin_lock,
361-
_raw_spin_lock_flags, &flags);
360+
LOCK_CONTENDED_FLAGS(lock, do_raw_spin_trylock, do_raw_spin_lock,
361+
do_raw_spin_lock_flags, &flags);
362362
return flags;
363363
}
364364
EXPORT_SYMBOL(_spin_lock_irqsave_nested);
@@ -368,7 +368,7 @@ void __lockfunc _spin_lock_nest_lock(raw_spinlock_t *lock,
368368
{
369369
preempt_disable();
370370
spin_acquire_nest(&lock->dep_map, 0, 0, nest_lock, _RET_IP_);
371-
LOCK_CONTENDED(lock, _raw_spin_trylock, _raw_spin_lock);
371+
LOCK_CONTENDED(lock, do_raw_spin_trylock, do_raw_spin_lock);
372372
}
373373
EXPORT_SYMBOL(_spin_lock_nest_lock);
374374

0 commit comments

Comments
 (0)