core/locking changes for v2.6.33
Subsystems (3)
Linus,
Please pull the latest core-locking-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-locking-for-linus
Thanks,
Ingo
------------------>
Frederic Weisbecker (2):
mutex: Better control mutex adaptive spinning config
mutex: Fix missing conditions to build mutex_spin_on_owner()
Hiroshi Shimamoto (1):
locking, task_struct: Reduce size on TRACE_IRQFLAGS and 64bit
Thomas Gleixner (4):
locking: Make inlining decision Kconfig based
locking: Reduce ifdefs in kernel/spinlock.c
locking: Remove unused prototype
locking: Use __[SPIN|RW]_LOCK_UNLOCKED in [spin|rw]_lock_init()
arch/s390/Kconfig | 28 ++++ arch/s390/include/asm/spinlock.h | 29 ---- include/linux/sched.h | 10 +- include/linux/spinlock.h | 6 +- include/linux/spinlock_api_smp.h | 75 ++++------ init/Kconfig | 1 + kernel/Kconfig.locks | 202 +++++++++++++++++++++++++ kernel/mutex.c | 4 +- kernel/sched.c | 2 +- kernel/spinlock.c | 310 +++++++++++++++++++------------------- 10 files changed, 422 insertions(+), 245 deletions(-) create mode 100644 kernel/Kconfig.locks
arch/s390/Kconfig +28 -0
@@ -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
@@ -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/sched.h +5 -5
@@ -1421,17 +1421,17 @@ struct task_struct {#endif #ifdef CONFIG_TRACE_IRQFLAGS unsigned int irq_events; -int hardirqs_enabled;unsigned long hardirq_enable_ip; -unsigned int hardirq_enable_event;unsigned long hardirq_disable_ip; +unsigned int hardirq_enable_event;unsigned int hardirq_disable_event; -int softirqs_enabled; +int hardirqs_enabled; +int hardirq_context;unsigned long softirq_disable_ip; -unsigned int softirq_disable_event;unsigned long softirq_enable_ip; +unsigned int softirq_disable_event;unsigned int softirq_enable_event; -int hardirq_context; +int softirqs_enabled;int softirq_context;#endif #ifdef CONFIG_LOCKDEP
include/linux/spinlock.h +2 -4
@@ -79,8 +79,6 @@*/ #include <linux/spinlock_types.h> -extern int __lockfunc generic__raw_read_trylock(raw_rwlock_t *lock); -/* * Pull the __raw*() functions/declarations (UP-nondebug doesnt need them): */
@@ -102,7 +100,7 @@ do { \#else # define spin_lock_init (lock) \ - do { *(lock) = SPIN_LOCK_UNLOCKED; } while (0) + do { *(lock) = __SPIN_LOCK_UNLOCKED(lock); } while (0)#endif #ifdef CONFIG_DEBUG_SPINLOCK
@@ -116,7 +114,7 @@ do { \ } while (0)#else # define rwlock_init (lock) \ - do { *(lock) = RW_LOCK_UNLOCKED; } while (0) + do { *(lock) = __RW_LOCK_UNLOCKED(lock); } while (0)#endif #define spin_is_locked (lock) __raw_spin_is_locked(&(lock)->raw_lock)
include/linux/spinlock_api_smp.h +28 -47
165 lines not on this page · raw message
init/Kconfig +1 -0
@@ -1210,3 +1210,4 @@ source "block/Kconfig" config PREEMPT_NOTIFIERS bool +source "kernel/Kconfig.locks"
kernel/Kconfig.locks new file +202 -0
202 lines not on this page · raw message
kernel/mutex.c +2 -2
@@ -148,8 +148,8 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,preempt_disable ();mutex_acquire (&lock->dep_map, subclass,0 , ip); -#if defined(CONFIG_SMP ) && !defined(CONFIG_DEBUG_MUTEXES ) && \ - !defined(CONFIG_HAVE_DEFAULT_NO_SPIN_MUTEXES ) + +#ifdef CONFIG_MUTEX_SPIN_ON_OWNER /* * Optimistic spinning. *
kernel/sched.c +1 -1
@@ -5481,7 +5481,7 @@ need_resched_nonpreemptible: }EXPORT_SYMBOL (schedule); -#ifdef CONFIG_SMP +#ifdef CONFIG_MUTEX_SPIN_ON_OWNER /* * Look out! "owner" is an entirely speculative pointer * access and not reliable.
kernel/spinlock.c +153 -157
444 lines not on this page · raw message