Skip to content

Commit 9983a9d

Browse files
Sebastian Andrzej SiewiorPeter Zijlstra
authored andcommitted
locking/local_lock: Make the empty local_lock_*() function a macro.
It has been said that local_lock() does not add any overhead compared to preempt_disable() in a !LOCKDEP configuration. A micro benchmark showed an unexpected result which can be reduced to the fact that local_lock() was not entirely optimized away. In the !LOCKDEP configuration local_lock_acquire() is an empty static inline function. On x86 the this_cpu_ptr() argument of that function is fully evaluated leading to an additional mov+add instructions which are not needed and not used. Replace the static inline function with a macro. The typecheck() macro ensures that the argument is of proper type while the resulting disassembly shows no traces of this_cpu_ptr(). Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Waiman Long <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent dc1b4df commit 9983a9d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

include/linux/local_lock_internal.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ static inline void local_lock_debug_init(local_lock_t *l)
4444
}
4545
#else /* CONFIG_DEBUG_LOCK_ALLOC */
4646
# define LOCAL_LOCK_DEBUG_INIT(lockname)
47-
static inline void local_lock_acquire(local_lock_t *l) { }
48-
static inline void local_lock_release(local_lock_t *l) { }
49-
static inline void local_lock_debug_init(local_lock_t *l) { }
47+
# define local_lock_acquire(__ll) do { typecheck(local_lock_t *, __ll); } while (0)
48+
# define local_lock_release(__ll) do { typecheck(local_lock_t *, __ll); } while (0)
49+
# define local_lock_debug_init(__ll) do { typecheck(local_lock_t *, __ll); } while (0)
5050
#endif /* !CONFIG_DEBUG_LOCK_ALLOC */
5151

5252
#define INIT_LOCAL_LOCK(lockname) { LOCAL_LOCK_DEBUG_INIT(lockname) }

0 commit comments

Comments
 (0)