Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6beb0009 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

locking: Make inlining decision Kconfig based 



commit 892a7c67 (locking: Allow arch-inlined spinlocks) implements the
selection of which lock functions are inlined based on defines in
arch/.../spinlock.h: #define __always_inline__LOCK_FUNCTION

Despite of the name __always_inline__* the lock functions can be built
out of line depending on config options. Also if the arch does not set
some inline defines the generic code might set them; again depending on
config options.

This makes it unnecessary hard to figure out when and which lock
functions are inlined. Aside of that it makes it way harder and
messier for -rt to manipulate the lock functions.

Convert the inlining decision to CONFIG switches. Each lock function
is inlined depending on CONFIG_INLINE_*. The configs implement the
existing dependencies. The architecture code can select ARCH_INLINE_*
to signal that it wants the corresponding lock function inlined.
ARCH_INLINE_* is necessary as Kconfig ignores "depends on"
restrictions when a config element is selected.

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
LKML-Reference: <20091109151428.504477141@linutronix.de>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
parent 156171c7

arch/s390/Kconfig

+28 −0
Original line number Diff line number Diff line
@@ -95,6 +95,34 @@ config S390 
	select HAVE_ARCH_TRACEHOOK

	select INIT_ALL_POSSIBLE

	select HAVE_PERF_EVENTS

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK

	select ARCH_INLINE_SPIN_LOCK_BH

	select ARCH_INLINE_SPIN_LOCK_IRQ

	select ARCH_INLINE_SPIN_LOCK_IRQSAVE

	select ARCH_INLINE_SPIN_UNLOCK

	select ARCH_INLINE_SPIN_UNLOCK_BH

	select ARCH_INLINE_SPIN_UNLOCK_IRQ

	select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE

	select ARCH_INLINE_READ_TRYLOCK

	select ARCH_INLINE_READ_LOCK

	select ARCH_INLINE_READ_LOCK_BH

	select ARCH_INLINE_READ_LOCK_IRQ

	select ARCH_INLINE_READ_LOCK_IRQSAVE

	select ARCH_INLINE_READ_UNLOCK

	select ARCH_INLINE_READ_UNLOCK_BH

	select ARCH_INLINE_READ_UNLOCK_IRQ

	select ARCH_INLINE_READ_UNLOCK_IRQRESTORE

	select ARCH_INLINE_WRITE_TRYLOCK

	select ARCH_INLINE_WRITE_LOCK

	select ARCH_INLINE_WRITE_LOCK_BH

	select ARCH_INLINE_WRITE_LOCK_IRQ

	select ARCH_INLINE_WRITE_LOCK_IRQSAVE

	select ARCH_INLINE_WRITE_UNLOCK

	select ARCH_INLINE_WRITE_UNLOCK_BH

	select ARCH_INLINE_WRITE_UNLOCK_IRQ

	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE



config SCHED_OMIT_FRAME_POINTER

	bool

arch/s390/include/asm/spinlock.h

+0 −29
Original line number Diff line number Diff line
@@ -191,33 +191,4 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw) 
#define _raw_read_relax(lock)	cpu_relax()

#define _raw_write_relax(lock)	cpu_relax()



#define __always_inline__spin_lock

#define __always_inline__read_lock

#define __always_inline__write_lock

#define __always_inline__spin_lock_bh

#define __always_inline__read_lock_bh

#define __always_inline__write_lock_bh

#define __always_inline__spin_lock_irq

#define __always_inline__read_lock_irq

#define __always_inline__write_lock_irq

#define __always_inline__spin_lock_irqsave

#define __always_inline__read_lock_irqsave

#define __always_inline__write_lock_irqsave

#define __always_inline__spin_trylock

#define __always_inline__read_trylock

#define __always_inline__write_trylock

#define __always_inline__spin_trylock_bh

#define __always_inline__spin_unlock

#define __always_inline__read_unlock

#define __always_inline__write_unlock

#define __always_inline__spin_unlock_bh

#define __always_inline__read_unlock_bh

#define __always_inline__write_unlock_bh

#define __always_inline__spin_unlock_irq

#define __always_inline__read_unlock_irq

#define __always_inline__write_unlock_irq

#define __always_inline__spin_unlock_irqrestore

#define __always_inline__read_unlock_irqrestore

#define __always_inline__write_unlock_irqrestore



#endif /* __ASM_SPINLOCK_H */

include/linux/spinlock_api_smp.h

+28 −47
Original line number Diff line number Diff line
@@ -60,137 +60,118 @@ void __lockfunc _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) 
void __lockfunc _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags)

							__releases(lock);



/*

 * We inline the unlock functions in the nondebug case:

 */

#if !defined(CONFIG_DEBUG_SPINLOCK) && !defined(CONFIG_PREEMPT)

#define __always_inline__spin_unlock

#define __always_inline__read_unlock

#define __always_inline__write_unlock

#define __always_inline__spin_unlock_irq

#define __always_inline__read_unlock_irq

#define __always_inline__write_unlock_irq

#endif



#ifndef CONFIG_DEBUG_SPINLOCK

#ifndef CONFIG_GENERIC_LOCKBREAK



#ifdef __always_inline__spin_lock

#ifdef CONFIG_INLINE_SPIN_LOCK

#define _spin_lock(lock) __spin_lock(lock)

#endif



#ifdef __always_inline__read_lock

#ifdef CONFIG_INLINE_READ_LOCK

#define _read_lock(lock) __read_lock(lock)

#endif



#ifdef __always_inline__write_lock

#ifdef CONFIG_INLINE_WRITE_LOCK

#define _write_lock(lock) __write_lock(lock)

#endif



#ifdef __always_inline__spin_lock_bh

#ifdef CONFIG_INLINE_SPIN_LOCK_BH

#define _spin_lock_bh(lock) __spin_lock_bh(lock)

#endif



#ifdef __always_inline__read_lock_bh

#ifdef CONFIG_INLINE_READ_LOCK_BH

#define _read_lock_bh(lock) __read_lock_bh(lock)

#endif



#ifdef __always_inline__write_lock_bh

#ifdef CONFIG_INLINE_WRITE_LOCK_BH

#define _write_lock_bh(lock) __write_lock_bh(lock)

#endif



#ifdef __always_inline__spin_lock_irq

#ifdef CONFIG_INLINE_SPIN_LOCK_IRQ

#define _spin_lock_irq(lock) __spin_lock_irq(lock)

#endif



#ifdef __always_inline__read_lock_irq

#ifdef CONFIG_INLINE_READ_LOCK_IRQ

#define _read_lock_irq(lock) __read_lock_irq(lock)

#endif



#ifdef __always_inline__write_lock_irq

#ifdef CONFIG_INLINE_WRITE_LOCK_IRQ

#define _write_lock_irq(lock) __write_lock_irq(lock)

#endif



#ifdef __always_inline__spin_lock_irqsave

#ifdef CONFIG_INLINE_SPIN_LOCK_IRQSAVE

#define _spin_lock_irqsave(lock) __spin_lock_irqsave(lock)

#endif



#ifdef __always_inline__read_lock_irqsave

#ifdef CONFIG_INLINE_READ_LOCK_IRQSAVE

#define _read_lock_irqsave(lock) __read_lock_irqsave(lock)

#endif



#ifdef __always_inline__write_lock_irqsave

#ifdef CONFIG_INLINE_WRITE_LOCK_IRQSAVE

#define _write_lock_irqsave(lock) __write_lock_irqsave(lock)

#endif



#endif /* !CONFIG_GENERIC_LOCKBREAK */



#ifdef __always_inline__spin_trylock

#ifdef CONFIG_INLINE_SPIN_TRYLOCK

#define _spin_trylock(lock) __spin_trylock(lock)

#endif



#ifdef __always_inline__read_trylock

#ifdef CONFIG_INLINE_READ_TRYLOCK

#define _read_trylock(lock) __read_trylock(lock)

#endif



#ifdef __always_inline__write_trylock

#ifdef CONFIG_INLINE_WRITE_TRYLOCK

#define _write_trylock(lock) __write_trylock(lock)

#endif



#ifdef __always_inline__spin_trylock_bh

#ifdef CONFIG_INLINE_SPIN_TRYLOCK_BH

#define _spin_trylock_bh(lock) __spin_trylock_bh(lock)

#endif



#ifdef __always_inline__spin_unlock

#ifdef CONFIG_INLINE_SPIN_UNLOCK

#define _spin_unlock(lock) __spin_unlock(lock)

#endif



#ifdef __always_inline__read_unlock

#ifdef CONFIG_INLINE_READ_UNLOCK

#define _read_unlock(lock) __read_unlock(lock)

#endif



#ifdef __always_inline__write_unlock

#ifdef CONFIG_INLINE_WRITE_UNLOCK

#define _write_unlock(lock) __write_unlock(lock)

#endif



#ifdef __always_inline__spin_unlock_bh

#ifdef CONFIG_INLINE_SPIN_UNLOCK_BH

#define _spin_unlock_bh(lock) __spin_unlock_bh(lock)

#endif



#ifdef __always_inline__read_unlock_bh

#ifdef CONFIG_INLINE_READ_UNLOCK_BH

#define _read_unlock_bh(lock) __read_unlock_bh(lock)

#endif



#ifdef __always_inline__write_unlock_bh

#ifdef CONFIG_INLINE_WRITE_UNLOCK_BH

#define _write_unlock_bh(lock) __write_unlock_bh(lock)

#endif



#ifdef __always_inline__spin_unlock_irq

#ifdef CONFIG_INLINE_SPIN_UNLOCK_IRQ

#define _spin_unlock_irq(lock) __spin_unlock_irq(lock)

#endif



#ifdef __always_inline__read_unlock_irq

#ifdef CONFIG_INLINE_READ_UNLOCK_IRQ

#define _read_unlock_irq(lock) __read_unlock_irq(lock)

#endif



#ifdef __always_inline__write_unlock_irq

#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQ

#define _write_unlock_irq(lock) __write_unlock_irq(lock)

#endif



#ifdef __always_inline__spin_unlock_irqrestore

#ifdef CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE

#define _spin_unlock_irqrestore(lock, flags) __spin_unlock_irqrestore(lock, flags)

#endif



#ifdef __always_inline__read_unlock_irqrestore

#ifdef CONFIG_INLINE_READ_UNLOCK_IRQRESTORE

#define _read_unlock_irqrestore(lock, flags) __read_unlock_irqrestore(lock, flags)

#endif



#ifdef __always_inline__write_unlock_irqrestore

#ifdef CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE

#define _write_unlock_irqrestore(lock, flags) __write_unlock_irqrestore(lock, flags)

#endif



#endif /* CONFIG_DEBUG_SPINLOCK */



static inline int __spin_trylock(spinlock_t *lock)

{

	preempt_disable();

init/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1210,3 +1210,4 @@ source "block/Kconfig" 
config PREEMPT_NOTIFIERS

	bool



source "kernel/Kconfig.locks"

kernel/Kconfig.locks

0 → 100644
+199 −0
Original line number Diff line number Diff line 
#

# The ARCH_INLINE foo is necessary because select ignores "depends on"

#

config ARCH_INLINE_SPIN_TRYLOCK

	bool



config ARCH_INLINE_SPIN_TRYLOCK_BH

	bool



config ARCH_INLINE_SPIN_LOCK

	bool



config ARCH_INLINE_SPIN_LOCK_BH

	bool



config ARCH_INLINE_SPIN_LOCK_IRQ

	bool



config ARCH_INLINE_SPIN_LOCK_IRQSAVE

	bool



config ARCH_INLINE_SPIN_UNLOCK

	bool



config ARCH_INLINE_SPIN_UNLOCK_BH

	bool



config ARCH_INLINE_SPIN_UNLOCK_IRQ

	bool



config ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE

	bool





config ARCH_INLINE_READ_TRYLOCK

	bool



config ARCH_INLINE_READ_LOCK

	bool



config ARCH_INLINE_READ_LOCK_BH

	bool



config ARCH_INLINE_READ_LOCK_IRQ

	bool



config ARCH_INLINE_READ_LOCK_IRQSAVE

	bool



config ARCH_INLINE_READ_UNLOCK

	bool



config ARCH_INLINE_READ_UNLOCK_BH

	bool



config ARCH_INLINE_READ_UNLOCK_IRQ

	bool



config ARCH_INLINE_READ_UNLOCK_IRQRESTORE

	bool





config ARCH_INLINE_WRITE_TRYLOCK

	bool



config ARCH_INLINE_WRITE_LOCK

	bool



config ARCH_INLINE_WRITE_LOCK_BH

	bool



config ARCH_INLINE_WRITE_LOCK_IRQ

	bool



config ARCH_INLINE_WRITE_LOCK_IRQSAVE

	bool



config ARCH_INLINE_WRITE_UNLOCK

	bool



config ARCH_INLINE_WRITE_UNLOCK_BH

	bool



config ARCH_INLINE_WRITE_UNLOCK_IRQ

	bool



config ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE

	bool



#

# lock_* functions are inlined when:

#   - DEBUG_SPINLOCK=n and GENERIC_LOCKBREAK=n and ARCH_INLINE_*LOCK=y

#

# trylock_* functions are inlined when:

#   - DEBUG_SPINLOCK=n and ARCH_INLINE_*LOCK=y

#

# unlock and unlock_irq functions are inlined when:

#   - DEBUG_SPINLOCK=n and ARCH_INLINE_*LOCK=y

#  or

#   - DEBUG_SPINLOCK=n and PREEMPT=n

#

# unlock_bh and unlock_irqrestore functions are inlined when:

#   - DEBUG_SPINLOCK=n and ARCH_INLINE_*LOCK=y

#



config INLINE_SPIN_TRYLOCK

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_SPIN_TRYLOCK



config INLINE_SPIN_TRYLOCK_BH

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_SPIN_TRYLOCK_BH



config INLINE_SPIN_LOCK

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && ARCH_INLINE_SPIN_LOCK



config INLINE_SPIN_LOCK_BH

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && \

		 ARCH_INLINE_SPIN_LOCK_BH



config INLINE_SPIN_LOCK_IRQ

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && \

		 ARCH_INLINE_SPIN_LOCK_IRQ



config INLINE_SPIN_LOCK_IRQSAVE

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && \

		 ARCH_INLINE_SPIN_LOCK_IRQSAVE



config INLINE_SPIN_UNLOCK

	def_bool !DEBUG_SPINLOCK && (!PREEMPT || ARCH_INLINE_SPIN_UNLOCK)



config INLINE_SPIN_UNLOCK_BH

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_SPIN_UNLOCK_BH



config INLINE_SPIN_UNLOCK_IRQ

	def_bool !DEBUG_SPINLOCK && (!PREEMPT || ARCH_INLINE_SPIN_UNLOCK_BH)



config INLINE_SPIN_UNLOCK_IRQRESTORE

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE





config INLINE_READ_TRYLOCK

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_READ_TRYLOCK



config INLINE_READ_LOCK

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && ARCH_INLINE_READ_LOCK



config INLINE_READ_LOCK_BH

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && \

		 ARCH_INLINE_READ_LOCK_BH



config INLINE_READ_LOCK_IRQ

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && \

		 ARCH_INLINE_READ_LOCK_IRQ



config INLINE_READ_LOCK_IRQSAVE

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && \

		 ARCH_INLINE_READ_LOCK_IRQSAVE



config INLINE_READ_UNLOCK

	def_bool !DEBUG_SPINLOCK && (!PREEMPT || ARCH_INLINE_READ_UNLOCK)



config INLINE_READ_UNLOCK_BH

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_READ_UNLOCK_BH



config INLINE_READ_UNLOCK_IRQ

	def_bool !DEBUG_SPINLOCK && (!PREEMPT || ARCH_INLINE_READ_UNLOCK_BH)



config INLINE_READ_UNLOCK_IRQRESTORE

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_READ_UNLOCK_IRQRESTORE





config INLINE_WRITE_TRYLOCK

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_WRITE_TRYLOCK



config INLINE_WRITE_LOCK

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && ARCH_INLINE_WRITE_LOCK



config INLINE_WRITE_LOCK_BH

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && \

		 ARCH_INLINE_WRITE_LOCK_BH



config INLINE_WRITE_LOCK_IRQ

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && \

		 ARCH_INLINE_WRITE_LOCK_IRQ



config INLINE_WRITE_LOCK_IRQSAVE

	def_bool !DEBUG_SPINLOCK && !GENERIC_LOCKBREAK && \

		 ARCH_INLINE_WRITE_LOCK_IRQSAVE



config INLINE_WRITE_UNLOCK

	def_bool !DEBUG_SPINLOCK && (!PREEMPT || ARCH_INLINE_WRITE_UNLOCK)



config INLINE_WRITE_UNLOCK_BH

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_WRITE_UNLOCK_BH



config INLINE_WRITE_UNLOCK_IRQ

	def_bool !DEBUG_SPINLOCK && (!PREEMPT || ARCH_INLINE_WRITE_UNLOCK_BH)



config INLINE_WRITE_UNLOCK_IRQRESTORE

	def_bool !DEBUG_SPINLOCK && ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE