Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'locking_urgent_for_v6.4_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fix from Borislav Petkov:
- Make sure __down_read_common() is always inlined so that the callers'
names land in traceevents output and thus the blocked function can be
identified
* tag 'locking_urgent_for_v6.4_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
locking/rwsem: Add __always_inline annotation to __down_read_common() and inlined callers
+4
-4
+4
-4
kernel/locking/rwsem.c
+4
-4
kernel/locking/rwsem.c
···
1240
1240
/*
1241
1241
* lock for reading
1242
1242
*/
1243
-
static inline int __down_read_common(struct rw_semaphore *sem, int state)
1243
+
static __always_inline int __down_read_common(struct rw_semaphore *sem, int state)
1244
1244
{
1245
1245
int ret = 0;
1246
1246
long count;
···
1258
1258
return ret;
1259
1259
}
1260
1260
1261
-
static inline void __down_read(struct rw_semaphore *sem)
1261
+
static __always_inline void __down_read(struct rw_semaphore *sem)
1262
1262
{
1263
1263
__down_read_common(sem, TASK_UNINTERRUPTIBLE);
1264
1264
}
1265
1265
1266
-
static inline int __down_read_interruptible(struct rw_semaphore *sem)
1266
+
static __always_inline int __down_read_interruptible(struct rw_semaphore *sem)
1267
1267
{
1268
1268
return __down_read_common(sem, TASK_INTERRUPTIBLE);
1269
1269
}
1270
1270
1271
-
static inline int __down_read_killable(struct rw_semaphore *sem)
1271
+
static __always_inline int __down_read_killable(struct rw_semaphore *sem)
1272
1272
{
1273
1273
return __down_read_common(sem, TASK_KILLABLE);
1274
1274
}