locking changes for v3.15
Subsystems (23)
Linus,
Please pull the latest core-locking-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-locking-for-linus
# HEAD: 6f008e72cd111a119b5d8de8c5438d892aae99eb locking/mutex: Fix debug checks
The biggest change is the MCS spinlock generalization changes from Tim Chen, Peter Zijlstra, Jason Low et al. There's also lockdep fixes/enhancements from Oleg Nesterov, in particular a false negative fix related to lockdep_set_novalidate_class() usage.
Thanks,
Ingo
------------------>
Aaron Tomlin (1):
hung_task/Documentation: Fix hung_task_warnings description
Finn Thain (1):
m68k: Skip futex_atomic_cmpxchg_inatomic() test
Heiko Carstens (1):
futex: Allow architectures to skip futex_atomic_cmpxchg_inatomic() test
Ingo Molnar (1):
Revert "sched/wait: Suppress Sparse 'variable shadowing' warning"
Jason Low (4):
locking/mcs: Micro-optimize the MCS code, add extra comments locking/mutexes: Return false if task need_resched() in mutex_can_spin_on_owner() locking/mutexes: Modify the way optimistic spinners are queued locking/mutexes: Unlock the mutex without the wait_lock
Johannes Berg (1):
sched/wait: Suppress Sparse 'variable shadowing' warning
Oleg Nesterov (4):
lockdep: Make held_lock->check and "int check" argument bool
lockdep: Don't create the wrong dependency on hlock->check == 0
lockdep: Change mark_held_locks() to check hlock->check instead of lockdep_no_validate
lockdep: Change lockdep_set_novalidate_class() to use _and_namePeter Zijlstra (4):
locking: Move mcs_spinlock.h into kernel/locking/ locking/mutexes: Introduce cancelable MCS lock for adaptive spinning locking/mutexes: Add extra reschedule point locking/mutex: Fix debug checks
Tim Chen (3):
locking/mutexes/mcs: Restructure the MCS lock defines and locking code into its own file locking/mcs: Order the header files in Kbuild of each architecture in alphabetical order locking/mcs: Allow architecture specific asm files to be used for contended case
Waiman Long (1):
locking/mutexes/mcs: Correct barrier usage
Will Deacon (1):
locking/mcs: Allow architectures to hook in to contended paths
Documentation/sysctl/kernel.txt | 5 +- arch/alpha/include/asm/Kbuild | 7 +- arch/arc/include/asm/Kbuild | 7 +- arch/arm/include/asm/Kbuild | 5 +- arch/arm64/include/asm/Kbuild | 7 +- arch/avr32/include/asm/Kbuild | 41 ++++----- arch/blackfin/include/asm/Kbuild | 7 +- arch/c6x/include/asm/Kbuild | 5 +- arch/cris/include/asm/Kbuild | 3 +- arch/frv/include/asm/Kbuild | 5 +- arch/hexagon/include/asm/Kbuild | 7 +- arch/ia64/include/asm/Kbuild | 5 +- arch/m32r/include/asm/Kbuild | 5 +- arch/m68k/Kconfig | 1 + arch/m68k/include/asm/Kbuild | 7 +- arch/metag/include/asm/Kbuild | 5 +- arch/microblaze/include/asm/Kbuild | 5 +- arch/mips/include/asm/Kbuild | 5 +- arch/mn10300/include/asm/Kbuild | 3 +- arch/openrisc/include/asm/Kbuild | 11 +-- arch/parisc/include/asm/Kbuild | 32 +++++-- arch/powerpc/include/asm/Kbuild | 5 +- arch/s390/Kconfig | 1 + arch/s390/include/asm/Kbuild | 5 +- arch/score/include/asm/Kbuild | 5 +- arch/sh/include/asm/Kbuild | 9 +- arch/sparc/include/asm/Kbuild | 11 +-- arch/tile/include/asm/Kbuild | 5 +- arch/um/include/asm/Kbuild | 34 +++++-- arch/unicore32/include/asm/Kbuild | 5 +- arch/x86/include/asm/Kbuild | 1 + arch/xtensa/include/asm/Kbuild | 5 +- drivers/tty/tty_ldsem.c | 15 +--- include/asm-generic/mcs_spinlock.h | 13 +++ include/linux/futex.h | 4 + include/linux/lockdep.h | 27 +++--- include/linux/mutex.h | 5 +- include/linux/rcupdate.h | 2 +- init/Kconfig | 7 ++ kernel/futex.c | 37 +++++--- kernel/locking/Makefile | 2 +- kernel/locking/lockdep.c | 17 ++-- kernel/locking/mcs_spinlock.c | 178 +++++++++++++++++++++++++++++++++++++ kernel/locking/mcs_spinlock.h | 129 +++++++++++++++++++++++++++ kernel/locking/mutex-debug.c | 6 ++ kernel/locking/mutex.c | 94 +++++++------------- 46 files changed, 586 insertions(+), 214 deletions(-) create mode 100644 include/asm-generic/mcs_spinlock.h create mode 100644 kernel/locking/mcs_spinlock.c create mode 100644 kernel/locking/mcs_spinlock.h
Documentation/sysctl/kernel.txt +3 -2
@@ -320,10 +320,11 @@ This file shows up if CONFIG_DETECT_HUNG_TASK is enabled. ============================================================== -hung_task_warning: +hung_task_warnings: The maximum number of warnings to report. During a check interval -When this value is reached, no more the warnings will be reported. +if a hung task is detected, this value is decreased by 1. +When this value reaches 0, no more warnings will be reported. This file shows up if CONFIG_DETECT_HUNG_TASK is enabled. -1: report an infinite number of warnings.
arch/alpha/include/asm/Kbuild +4 -3
@@ -1,7 +1,8 @@ -generic-y += clkdev.h +generic-y += clkdev.h generic-y += exec.h -generic-y += trace_clock.h -generic-y += preempt.h generic-y += hash.h +generic-y += mcs_spinlock.h +generic-y += preempt.h +generic-y += trace_clock.h
arch/arc/include/asm/Kbuild +4 -3
@@ -1,15 +1,15 @@ generic-y += auxvec.h generic-y += barrier.h -generic-y += bugs.h generic-y += bitsperlong.h +generic-y += bugs.h generic-y += clkdev.h generic-y += cputime.h generic-y += device.h generic-y += div64.h generic-y += emergency-restart.h generic-y += errno.h -generic-y += fcntl.h generic-y += fb.h +generic-y += fcntl.h generic-y += ftrace.h generic-y += hardirq.h generic-y += hash.h
@@ -22,6 +22,7 @@ generic-y += kmap_types.h generic-y += kvm_para.h generic-y += local.h generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += mman.h generic-y += msgbuf.h generic-y += param.h
@@ -30,6 +31,7 @@ generic-y += pci.h generic-y += percpu.h generic-y += poll.h generic-y += posix_types.h +generic-y += preempt.h generic-y += resource.h generic-y += scatterlist.h generic-y += sembuf.h
@@ -48,4 +50,3 @@ generic-y += ucontext.h generic-y += user.h generic-y += vga.h generic-y += xor.h -generic-y += preempt.h
arch/arm/include/asm/Kbuild +3 -2
@@ -7,16 +7,19 @@ generic-y += current.h generic-y += emergency-restart.h generic-y += errno.h generic-y += exec.h +generic-y += hash.h generic-y += ioctl.h generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += local.h generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += msgbuf.h generic-y += param.h generic-y += parport.h generic-y += poll.h +generic-y += preempt.h generic-y += resource.h generic-y += sections.h generic-y += segment.h
@@ -33,5 +36,3 @@ generic-y += termios.h generic-y += timex.h generic-y += trace_clock.h generic-y += unaligned.h -generic-y += preempt.h -generic-y += hash.h
arch/arm64/include/asm/Kbuild +4 -3
@@ -12,6 +12,7 @@ generic-y += dma.h generic-y += emergency-restart.h generic-y += errno.h generic-y += ftrace.h +generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ioctls.h
@@ -22,12 +23,14 @@ generic-y += kmap_types.h generic-y += kvm_para.h generic-y += local.h generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += mman.h generic-y += msgbuf.h generic-y += mutex.h generic-y += pci.h generic-y += poll.h generic-y += posix_types.h +generic-y += preempt.h generic-y += resource.h generic-y += scatterlist.h generic-y += sections.h
@@ -38,8 +41,8 @@ generic-y += shmbuf.h generic-y += sizes.h generic-y += socket.h generic-y += sockios.h -generic-y += switch_to.h generic-y += swab.h +generic-y += switch_to.h generic-y += termbits.h generic-y += termios.h generic-y += topology.h
@@ -49,5 +52,3 @@ generic-y += unaligned.h generic-y += user.h generic-y += vga.h generic-y += xor.h -generic-y += preempt.h -generic-y += hash.h
arch/avr32/include/asm/Kbuild +21 -20
42 lines not on this page · raw message
arch/blackfin/include/asm/Kbuild +4 -3
@@ -10,6 +10,7 @@ generic-y += emergency-restart.h generic-y += errno.h generic-y += fb.h generic-y += futex.h +generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ipcbuf.h
@@ -17,14 +18,16 @@ generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h generic-y += kvm_para.h -generic-y += local64.h generic-y += local.h +generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += mman.h generic-y += msgbuf.h generic-y += mutex.h generic-y += param.h generic-y += percpu.h generic-y += pgalloc.h +generic-y += preempt.h generic-y += resource.h generic-y += scatterlist.h generic-y += sembuf.h
@@ -44,5 +47,3 @@ generic-y += ucontext.h generic-y += unaligned.h generic-y += user.h generic-y += xor.h -generic-y += preempt.h -generic-y += hash.h
arch/c6x/include/asm/Kbuild +3 -2
@@ -15,6 +15,7 @@ generic-y += exec.h generic-y += fb.h generic-y += fcntl.h generic-y += futex.h +generic-y += hash.h generic-y += hw_irq.h generic-y += io.h generic-y += ioctl.h
@@ -24,6 +25,7 @@ generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h generic-y += local.h +generic-y += mcs_spinlock.h generic-y += mman.h generic-y += mmu.h generic-y += mmu_context.h
@@ -34,6 +36,7 @@ generic-y += percpu.h generic-y += pgalloc.h generic-y += poll.h generic-y += posix_types.h +generic-y += preempt.h generic-y += resource.h generic-y += scatterlist.h generic-y += segment.h
@@ -56,5 +59,3 @@ generic-y += ucontext.h generic-y += user.h generic-y += vga.h generic-y += xor.h -generic-y += preempt.h -generic-y += hash.h
arch/cris/include/asm/Kbuild +2 -1
@@ -9,8 +9,9 @@ generic-y += exec.h generic-y += hash.h generic-y += kvm_para.h generic-y += linkage.h +generic-y += mcs_spinlock.h generic-y += module.h +generic-y += preempt.h generic-y += trace_clock.h generic-y += vga.h generic-y += xor.h -generic-y += preempt.h
arch/frv/include/asm/Kbuild +3 -2
@@ -1,6 +1,7 @@ generic-y += clkdev.h generic-y += exec.h -generic-y += trace_clock.h -generic-y += preempt.h generic-y += hash.h +generic-y += mcs_spinlock.h +generic-y += preempt.h +generic-y += trace_clock.h
arch/hexagon/include/asm/Kbuild +4 -3
@@ -25,14 +25,16 @@ generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h -generic-y += local64.h generic-y += local.h +generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += mman.h generic-y += msgbuf.h generic-y += pci.h generic-y += percpu.h generic-y += poll.h generic-y += posix_types.h +generic-y += preempt.h generic-y += resource.h generic-y += rwsem.h generic-y += scatterlist.h
@@ -45,8 +47,8 @@ generic-y += siginfo.h generic-y += sizes.h generic-y += socket.h generic-y += sockios.h -generic-y += statfs.h generic-y += stat.h +generic-y += statfs.h generic-y += termbits.h generic-y += termios.h generic-y += topology.h
@@ -55,4 +57,3 @@ generic-y += types.h generic-y += ucontext.h generic-y += unaligned.h generic-y += xor.h -generic-y += preempt.h
arch/ia64/include/asm/Kbuild +3 -2
@@ -1,8 +1,9 @@ generic-y += clkdev.h generic-y += exec.h +generic-y += hash.h generic-y += kvm_para.h -generic-y += trace_clock.h +generic-y += mcs_spinlock.h generic-y += preempt.h +generic-y += trace_clock.h generic-y += vtime.h -generic-y += hash.h
arch/m32r/include/asm/Kbuild +3 -2
@@ -1,7 +1,8 @@ generic-y += clkdev.h generic-y += exec.h +generic-y += hash.h +generic-y += mcs_spinlock.h generic-y += module.h -generic-y += trace_clock.h generic-y += preempt.h -generic-y += hash.h +generic-y += trace_clock.h
arch/m68k/Kconfig +1 -0
@@ -17,6 +17,7 @@ config M68K select FPU if MMU select ARCH_WANT_IPC_PARSE_VERSION select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE + select HAVE_FUTEX_CMPXCHG if MMU && FUTEX select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_REL select MODULES_USE_ELF_RELA
arch/m68k/include/asm/Kbuild +4 -3
@@ -6,6 +6,7 @@ generic-y += device.h generic-y += emergency-restart.h generic-y += errno.h generic-y += exec.h +generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ipcbuf.h
@@ -13,11 +14,13 @@ generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h generic-y += kvm_para.h -generic-y += local64.h generic-y += local.h +generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += mman.h generic-y += mutex.h generic-y += percpu.h +generic-y += preempt.h generic-y += resource.h generic-y += scatterlist.h generic-y += sections.h
@@ -31,5 +34,3 @@ generic-y += trace_clock.h generic-y += types.h generic-y += word-at-a-time.h generic-y += xor.h -generic-y += preempt.h -generic-y += hash.h
arch/metag/include/asm/Kbuild +3 -2
@@ -13,6 +13,7 @@ generic-y += fb.h generic-y += fcntl.h generic-y += futex.h generic-y += hardirq.h +generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ioctls.h
@@ -23,6 +24,7 @@ generic-y += kmap_types.h generic-y += kvm_para.h generic-y += local.h generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += msgbuf.h generic-y += mutex.h generic-y += param.h
@@ -30,6 +32,7 @@ generic-y += pci.h generic-y += percpu.h generic-y += poll.h generic-y += posix_types.h +generic-y += preempt.h generic-y += scatterlist.h generic-y += sections.h generic-y += sembuf.h
@@ -52,5 +55,3 @@ generic-y += unaligned.h generic-y += user.h generic-y += vga.h generic-y += xor.h -generic-y += preempt.h -generic-y += hash.h
arch/microblaze/include/asm/Kbuild +3 -2
@@ -3,6 +3,7 @@ generic-y += barrier.h generic-y += clkdev.h generic-y += exec.h generic-y += hash.h -generic-y += trace_clock.h -generic-y += syscalls.h +generic-y += mcs_spinlock.h generic-y += preempt.h +generic-y += syscalls.h +generic-y += trace_clock.h
arch/mips/include/asm/Kbuild +3 -2
@@ -2,16 +2,17 @@ generic-y += cputime.h generic-y += current.h generic-y += emergency-restart.h +generic-y += hash.h generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += mutex.h generic-y += parport.h generic-y += percpu.h +generic-y += preempt.h generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += serial.h generic-y += trace_clock.h -generic-y += preempt.h generic-y += ucontext.h generic-y += xor.h -generic-y += hash.h
arch/mn10300/include/asm/Kbuild +2 -1
@@ -3,5 +3,6 @@ generic-y += barrier.h generic-y += clkdev.h generic-y += exec.h generic-y += hash.h -generic-y += trace_clock.h +generic-y += mcs_spinlock.h generic-y += preempt.h +generic-y += trace_clock.h
arch/openrisc/include/asm/Kbuild +6 -5
@@ -10,8 +10,8 @@ generic-y += bugs.h generic-y += cacheflush.h generic-y += checksum.h generic-y += clkdev.h -generic-y += cmpxchg.h generic-y += cmpxchg-local.h +generic-y += cmpxchg.h generic-y += cputime.h generic-y += current.h generic-y += device.h
@@ -25,6 +25,7 @@ generic-y += fcntl.h generic-y += ftrace.h generic-y += futex.h generic-y += hardirq.h +generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ioctls.h
@@ -34,6 +35,7 @@ generic-y += kdebug.h generic-y += kmap_types.h generic-y += kvm_para.h generic-y += local.h +generic-y += mcs_spinlock.h generic-y += mman.h generic-y += module.h generic-y += msgbuf.h
@@ -41,6 +43,7 @@ generic-y += pci.h generic-y += percpu.h generic-y += poll.h generic-y += posix_types.h +generic-y += preempt.h generic-y += resource.h generic-y += scatterlist.h generic-y += sections.h
@@ -53,11 +56,11 @@ generic-y += siginfo.h generic-y += signal.h generic-y += socket.h generic-y += sockios.h -generic-y += statfs.h generic-y += stat.h +generic-y += statfs.h generic-y += string.h -generic-y += switch_to.h generic-y += swab.h +generic-y += switch_to.h generic-y += termbits.h generic-y += termios.h generic-y += topology.h
@@ -68,5 +71,3 @@ generic-y += user.h generic-y += vga.h generic-y += word-at-a-time.h generic-y += xor.h -generic-y += preempt.h -generic-y += hash.h
arch/parisc/include/asm/Kbuild +26 -6
@@ -1,9 +1,29 @@ +generic-y += auxvec.h generic-y += barrier.h -generic-y += word-at-a-time.h auxvec.h user.h cputime.h emergency-restart.h \ - segment.h topology.h vga.h device.h percpu.h hw_irq.h mutex.h \ - div64.h irq_regs.h kdebug.h kvm_para.h local64.h local.h param.h \ - poll.h xor.h clkdev.h exec.h -generic-y += trace_clock.h -generic-y += preempt.h +generic-y += clkdev.h +generic-y += cputime.h +generic-y += device.h +generic-y += div64.h +generic-y += emergency-restart.h +generic-y += exec.h generic-y += hash.h +generic-y += hw_irq.h +generic-y += irq_regs.h +generic-y += kdebug.h +generic-y += kvm_para.h +generic-y += local.h +generic-y += local64.h +generic-y += mcs_spinlock.h +generic-y += mutex.h +generic-y += param.h +generic-y += percpu.h +generic-y += poll.h +generic-y += preempt.h +generic-y += segment.h +generic-y += topology.h +generic-y += trace_clock.h +generic-y += user.h +generic-y += vga.h +generic-y += word-at-a-time.h +generic-y += xor.h
arch/powerpc/include/asm/Kbuild +3 -2
@@ -1,7 +1,8 @@ generic-y += clkdev.h +generic-y += hash.h +generic-y += mcs_spinlock.h +generic-y += preempt.h generic-y += rwsem.h generic-y += trace_clock.h -generic-y += preempt.h generic-y += vtime.h -generic-y += hash.h
arch/s390/Kconfig +1 -0
@@ -117,6 +117,7 @@ config S390 select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACER select HAVE_FUNCTION_TRACE_MCOUNT_TEST + select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZ4
arch/s390/include/asm/Kbuild +3 -2
@@ -1,6 +1,7 @@ generic-y += clkdev.h -generic-y += trace_clock.h -generic-y += preempt.h generic-y += hash.h +generic-y += mcs_spinlock.h +generic-y += preempt.h +generic-y += trace_clock.h
arch/score/include/asm/Kbuild +3 -2
@@ -1,10 +1,11 @@ header-y += + generic-y += barrier.h generic-y += clkdev.h generic-y += hash.h +generic-y += mcs_spinlock.h +generic-y += preempt.h generic-y += trace_clock.h generic-y += xor.h -generic-y += preempt.h -
arch/sh/include/asm/Kbuild +5 -4
@@ -8,18 +8,21 @@ generic-y += emergency-restart.h generic-y += errno.h generic-y += exec.h generic-y += fcntl.h +generic-y += hash.h generic-y += ioctl.h generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kvm_para.h generic-y += local.h generic-y += local64.h +generic-y += mcs_spinlock.h +generic-y += mman.h +generic-y += msgbuf.h generic-y += param.h generic-y += parport.h generic-y += percpu.h generic-y += poll.h -generic-y += mman.h -generic-y += msgbuf.h +generic-y += preempt.h generic-y += resource.h generic-y += scatterlist.h generic-y += sembuf.h
@@ -34,5 +37,3 @@ generic-y += termios.h generic-y += trace_clock.h generic-y += ucontext.h generic-y += xor.h -generic-y += preempt.h -generic-y += hash.h
arch/sparc/include/asm/Kbuild +6 -5
@@ -6,15 +6,16 @@ generic-y += cputime.h generic-y += div64.h generic-y += emergency-restart.h generic-y += exec.h -generic-y += linkage.h -generic-y += local64.h -generic-y += mutex.h +generic-y += hash.h generic-y += irq_regs.h +generic-y += linkage.h generic-y += local.h +generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += module.h +generic-y += mutex.h +generic-y += preempt.h generic-y += serial.h generic-y += trace_clock.h generic-y += types.h generic-y += word-at-a-time.h -generic-y += preempt.h -generic-y += hash.h
arch/tile/include/asm/Kbuild +3 -2
@@ -11,6 +11,7 @@ generic-y += errno.h generic-y += exec.h generic-y += fb.h generic-y += fcntl.h +generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ioctls.h
@@ -18,12 +19,14 @@ generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += local.h generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += msgbuf.h generic-y += mutex.h generic-y += param.h generic-y += parport.h generic-y += poll.h generic-y += posix_types.h +generic-y += preempt.h generic-y += resource.h generic-y += scatterlist.h generic-y += sembuf.h
@@ -38,5 +41,3 @@ generic-y += termios.h generic-y += trace_clock.h generic-y += types.h generic-y += xor.h -generic-y += preempt.h -generic-y += hash.h
arch/um/include/asm/Kbuild +27 -7
@@ -1,8 +1,28 @@ -generic-y += bug.h cputime.h device.h emergency-restart.h futex.h hardirq.h -generic-y += hw_irq.h irq_regs.h kdebug.h percpu.h sections.h topology.h xor.h -generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h -generic-y += switch_to.h clkdev.h -generic-y += trace_clock.h -generic-y += preempt.h -generic-y += hash.h generic-y += barrier.h +generic-y += bug.h +generic-y += clkdev.h +generic-y += cputime.h +generic-y += current.h +generic-y += delay.h +generic-y += device.h +generic-y += emergency-restart.h +generic-y += exec.h +generic-y += ftrace.h +generic-y += futex.h +generic-y += hardirq.h +generic-y += hash.h +generic-y += hw_irq.h +generic-y += io.h +generic-y += irq_regs.h +generic-y += kdebug.h +generic-y += mcs_spinlock.h +generic-y += mutex.h +generic-y += param.h +generic-y += pci.h +generic-y += percpu.h +generic-y += preempt.h +generic-y += sections.h +generic-y += switch_to.h +generic-y += topology.h +generic-y += trace_clock.h +generic-y += xor.h
arch/unicore32/include/asm/Kbuild +3 -2
@@ -16,6 +16,7 @@ generic-y += fcntl.h generic-y += ftrace.h generic-y += futex.h generic-y += hardirq.h +generic-y += hash.h generic-y += hw_irq.h generic-y += ioctl.h generic-y += ioctls.h
@@ -24,6 +25,7 @@ generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h generic-y += local.h +generic-y += mcs_spinlock.h generic-y += mman.h generic-y += module.h generic-y += msgbuf.h
@@ -32,6 +34,7 @@ generic-y += parport.h generic-y += percpu.h generic-y += poll.h generic-y += posix_types.h +generic-y += preempt.h generic-y += resource.h generic-y += scatterlist.h generic-y += sections.h
@@ -60,5 +63,3 @@ generic-y += unaligned.h generic-y += user.h generic-y += vga.h generic-y += xor.h -generic-y += preempt.h -generic-y += hash.h
arch/x86/include/asm/Kbuild +1 -0
@@ -5,3 +5,4 @@ genhdr-y += unistd_64.h genhdr-y += unistd_x32.h generic-y += clkdev.h +generic-y += mcs_spinlock.h
arch/xtensa/include/asm/Kbuild +3 -2
@@ -9,6 +9,7 @@ generic-y += errno.h generic-y += exec.h generic-y += fcntl.h generic-y += hardirq.h +generic-y += hash.h generic-y += ioctl.h generic-y += irq_regs.h generic-y += kdebug.h
@@ -17,7 +18,9 @@ generic-y += kvm_para.h generic-y += linkage.h generic-y += local.h generic-y += local64.h +generic-y += mcs_spinlock.h generic-y += percpu.h +generic-y += preempt.h generic-y += resource.h generic-y += scatterlist.h generic-y += sections.h
@@ -27,5 +30,3 @@ generic-y += termios.h generic-y += topology.h generic-y += trace_clock.h generic-y += xor.h -generic-y += preempt.h -generic-y += hash.h
drivers/tty/tty_ldsem.c +4 -11
@@ -39,17 +39,10 @@ lock_acquire(&(l)->dep_map, s, t, r, c, n, i)# define __rel (l, n, i) \ lock_release(&(l)->dep_map, n, i) -# ifdef CONFIG_PROVE_LOCKING -# define lockdep_acquire (l, s, t, i) __acq(l, s, t, 0, 2, NULL, i) -# define lockdep_acquire_nest (l, s, t, n, i) __acq(l, s, t, 0, 2, n, i) -# define lockdep_acquire_read (l, s, t, i) __acq(l, s, t, 1, 2, NULL, i) -# define lockdep_release (l, n, i) __rel(l, n, i) -# else -# define lockdep_acquire (l, s, t, i) __acq(l, s, t, 0, 1, NULL, i) -# define lockdep_acquire_nest (l, s, t, n, i) __acq(l, s, t, 0, 1, n, i) -# define lockdep_acquire_read (l, s, t, i) __acq(l, s, t, 1, 1, NULL, i) -# define lockdep_release (l, n, i) __rel(l, n, i) -# endif +#define lockdep_acquire (l, s, t, i) __acq(l, s, t, 0, 1, NULL, i) +#define lockdep_acquire_nest (l, s, t, n, i) __acq(l, s, t, 0, 1, n, i) +#define lockdep_acquire_read (l, s, t, i) __acq(l, s, t, 1, 1, NULL, i) +#define lockdep_release (l, n, i) __rel(l, n, i)#else # define lockdep_acquire (l, s, t, i) do { } while (0)# define lockdep_acquire_nest (l, s, t, n, i) do { } while (0)
include/asm-generic/mcs_spinlock.h new file +13 -0
@@ -0,0 +1,13 @@ +#ifndef __ASM_MCS_SPINLOCK_H +#define __ASM_MCS_SPINLOCK_H + +/* +* Architectures can define their own: +* +* arch_mcs_spin_lock_contended(l) +* arch_mcs_spin_unlock_contended(l) +* +* See kernel/locking/mcs_spinlock.c. +*/ + +#endif /* __ASM_MCS_SPINLOCK_H */
include/linux/futex.h +4 -0
@@ -55,7 +55,11 @@ union futex_key {#ifdef CONFIG_FUTEX extern void exit_robust_list (struct task_struct *curr);extern void exit_pi_state_list (struct task_struct *curr); +#ifdef CONFIG_HAVE_FUTEX_CMPXCHG +#define futex_cmpxchg_enabled 1 +#else extern int futex_cmpxchg_enabled; +#endif #else static inline void exit_robust_list (struct task_struct *curr) {
include/linux/lockdep.h +10 -17
@@ -252,9 +252,9 @@ struct held_lock { unsigned int trylock:1; /* 16 bits */ unsigned int read:2; /* see lock_acquire() comment */ - unsigned int check:2; /* see lock_acquire() comment */ + unsigned int check:1; /* see lock_acquire() comment */ unsigned int hardirqs_off:1; - unsigned int references:11; /* 32 bits */ + unsigned int references:12; /* 32 bits */ };/*
@@ -303,7 +303,7 @@ extern void lockdep_init_map(struct lockdep_map *lock, const char *name, (lock)->dep_map.key, sub)#define lockdep_set_novalidate_class (lock) \ - lockdep_set_class(lock, &__lockdep_no_validate__) + lockdep_set_class_and_name(lock, &__lockdep_no_validate__, #lock)/* * Compare locking classes */
@@ -326,9 +326,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,* * Values for check: * -* 0: disabled -* 1: simple checks (freeing, held-at-exit-time, etc.) -* 2: full validation +* 0: simple checks (freeing, held-at-exit-time, etc.) +* 1: full validation */ extern void lock_acquire(struct lockdep_map *lock, unsigned int subclass, int trylock, int read, int check,
@@ -479,15 +478,9 @@ static inline void print_irqtrace_events(struct task_struct *curr)* on the per lock-class debug mode: */ -#ifdef CONFIG_PROVE_LOCKING -#define lock_acquire_exclusive (l, s, t, n, i) lock_acquire(l, s, t, 0, 2, n, i) -#define lock_acquire_shared (l, s, t, n, i) lock_acquire(l, s, t, 1, 2, n, i) -#define lock_acquire_shared_recursive (l, s, t, n, i) lock_acquire(l, s, t, 2, 2, n, i) -#else -#define lock_acquire_exclusive (l, s, t, n, i) lock_acquire(l, s, t, 0, 1, n, i) -#define lock_acquire_shared (l, s, t, n, i) lock_acquire(l, s, t, 1, 1, n, i) -#define lock_acquire_shared_recursive (l, s, t, n, i) lock_acquire(l, s, t, 2, 1, n, i) -#endif +#define lock_acquire_exclusive (l, s, t, n, i) lock_acquire(l, s, t, 0, 1, n, i) +#define lock_acquire_shared (l, s, t, n, i) lock_acquire(l, s, t, 1, 1, n, i) +#define lock_acquire_shared_recursive (l, s, t, n, i) lock_acquire(l, s, t, 2, 1, n, i)#define spin_acquire (l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)#define spin_acquire_nest (l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)
@@ -518,13 +511,13 @@ static inline void print_irqtrace_events(struct task_struct *curr)# define might_lock (lock) \ do { \ typecheck(struct lockdep_map *, &(lock)->dep_map); \ - lock_acquire(&(lock)->dep_map, 0, 0, 0, 2, NULL, _THIS_IP_); \ + lock_acquire(&(lock)->dep_map, 0, 0, 0, 1, NULL, _THIS_IP_); \ lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ } while (0)# define might_lock_read (lock) \ do { \ typecheck(struct lockdep_map *, &(lock)->dep_map); \ - lock_acquire(&(lock)->dep_map, 0, 0, 1, 2, NULL, _THIS_IP_); \ + lock_acquire(&(lock)->dep_map, 0, 0, 1, 1, NULL, _THIS_IP_); \ lock_release(&(lock)->dep_map, 0, _THIS_IP_); \ } while (0)#else
include/linux/mutex.h +3 -2
@@ -46,6 +46,7 @@* - detects multi-task circular deadlocks and prints out all affected * locks and tasks (and only those tasks) */ +struct optimistic_spin_queue ;struct mutex {/* 1: unlocked, 0: locked, negative: locked, possible waiters */ atomic_t count;
@@ -55,7 +56,7 @@ struct mutex {struct task_struct *owner;#endif #ifdef CONFIG_MUTEX_SPIN_ON_OWNER -void *spin_mlock;/* Spinner MCS lock */ +struct optimistic_spin_queue *osq;/* Spinner MCS lock */ #endif #ifdef CONFIG_DEBUG_MUTEXES const char *name;
@@ -179,4 +180,4 @@ extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);# define arch_mutex_cpu_relax () cpu_relax()#endif -#endif +#endif /* __LINUX_MUTEX_H */
include/linux/rcupdate.h +1 -1
@@ -314,7 +314,7 @@ static inline bool rcu_lockdep_current_cpu_online(void)static inline void rcu_lock_acquire (struct lockdep_map *map) { -lock_acquire (map,0 ,0 ,2 ,1 ,NULL , _THIS_IP_); +lock_acquire (map,0 ,0 ,2 ,0 ,NULL , _THIS_IP_); }static inline void rcu_lock_release (struct lockdep_map *map)
init/Kconfig +7 -0
@@ -1387,6 +1387,13 @@ config FUTEX support for "fast userspace mutexes". The resulting kernel may not run glibc-based applications correctly. +config HAVE_FUTEX_CMPXCHG + bool + help + Architectures should select this if futex_atomic_cmpxchg_inatomic() + is implemented and always working. This removes a couple of runtime + checks. + config EPOLL bool "Enable eventpoll support" if EXPERT default y
kernel/futex.c +24 -13
@@ -157,7 +157,9 @@* enqueue. */ +#ifndef CONFIG_HAVE_FUTEX_CMPXCHG int __read_mostly futex_cmpxchg_enabled; +#endif /* * Futex flags used to encode options to functions and preserve them across
@@ -2843,9 +2845,28 @@ SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,return do_futex (uaddr, op, val, tp, uaddr2, val2, val3); } -static int __init futex_init (void ) +static void __init futex_detect_cmpxchg (void ) { +#ifndef CONFIG_HAVE_FUTEX_CMPXCHG u32 curval; + +/* +* This will fail and we want it. Some arch implementations do +* runtime detection of the futex_atomic_cmpxchg_inatomic() +* functionality. We want to know that before we call in any +* of the complex code paths. Also we want to prevent +* registration of robust lists in that case. NULL is +* guaranteed to fault and we get -EFAULT on functional +* implementation, the non-functional ones will return +* -ENOSYS. +*/ +if (cmpxchg_futex_value_locked (&curval,NULL ,0 ,0 ) == -EFAULT ) + futex_cmpxchg_enabled =1 ; +#endif +} + +static int __init futex_init (void ) +{unsigned int futex_shift;unsigned long i;
@@ -2861,18 +2882,8 @@ static int __init futex_init(void) &futex_shift,NULL , futex_hashsize, futex_hashsize); futex_hashsize =1UL << futex_shift; -/* -* This will fail and we want it. Some arch implementations do -* runtime detection of the futex_atomic_cmpxchg_inatomic() -* functionality. We want to know that before we call in any -* of the complex code paths. Also we want to prevent -* registration of robust lists in that case. NULL is -* guaranteed to fault and we get -EFAULT on functional -* implementation, the non-functional ones will return -* -ENOSYS. -*/ -if (cmpxchg_futex_value_locked (&curval,NULL ,0 ,0 ) == -EFAULT ) - futex_cmpxchg_enabled =1 ; + +futex_detect_cmpxchg ();for (i =0 ; i < futex_hashsize; i++) {plist_head_init (&futex_queues[i].chain);
kernel/locking/Makefile +1 -1
@@ -1,5 +1,5 @@ -obj-y += mutex.o semaphore.o rwsem.o lglock.o +obj-y += mutex.o semaphore.o rwsem.o lglock.o mcs_spinlock.o ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_lockdep.o = -pg
kernel/locking/lockdep.c +7 -10
@@ -1936,12 +1936,12 @@ check_prevs_add(struct task_struct *curr, struct held_lock *next)for (;;) {int distance = curr->lockdep_depth - depth +1 ; - hlock = curr->held_locks + depth-1 ; + hlock = curr->held_locks + depth -1 ;/* * Only non-recursive-read entries get new dependencies * added: */ -if (hlock->read !=2 ) { +if (hlock->read !=2 && hlock->check) {if (!check_prev_add (curr, hlock, next, distance, trylock_loop))return 0 ;
@@ -2098,7 +2098,7 @@ static int validate_chain(struct task_struct *curr, struct lockdep_map *lock,* (If lookup_chain_cache() returns with 1 it acquires * graph_lock for us) */ -if (!hlock->trylock && (hlock->check ==2 ) && +if (!hlock->trylock && hlock->check &&lookup_chain_cache (curr, hlock, chain_key)) {/* * Check whether last held lock:
@@ -2517,7 +2517,7 @@ mark_held_locks(struct task_struct *curr, enum mark_type mark)BUG_ON (usage_bit >=LOCK_USAGE_STATES ); -if (hlock_class (hlock)->key == __lockdep_no_validate__.subkeys) +if (!hlock->check)continue ;if (!mark_lock (curr, hlock, usage_bit))
@@ -3055,9 +3055,6 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,int class_idx;u64 chain_key; -if (!prove_locking) - check =1 ; -if (unlikely (!debug_locks))return 0 ;
@@ -3069,8 +3066,8 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,if (DEBUG_LOCKS_WARN_ON (!irqs_disabled ()))return 0 ; -if (lock->key == &__lockdep_no_validate__) - check =1 ; +if (!prove_locking || lock->key == &__lockdep_no_validate__) + check =0 ;if (subclass <NR_LOCKDEP_CACHING_CLASSES ) class = lock->class_cache[subclass];
@@ -3138,7 +3135,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass, hlock->holdtime_stamp =lockstat_clock ();#endif -if (check ==2 && !mark_irqflags (curr, hlock)) +if (check && !mark_irqflags (curr, hlock))return 0 ;/* mark it as used: */
kernel/locking/mcs_spinlock.c new file +178 -0
178 lines not on this page · raw message
kernel/locking/mcs_spinlock.h new file +129 -0
129 lines not on this page · raw message
kernel/locking/mutex-debug.c +6 -0
@@ -83,6 +83,12 @@ void debug_mutex_unlock(struct mutex *lock)DEBUG_LOCKS_WARN_ON (!lock->wait_list.prev && !lock->wait_list.next);mutex_clear_owner (lock); + +/* +* __mutex_slowpath_needs_to_unlock() is explicitly 0 for debug +* mutexes so that we can do it here after we've verified state. +*/ +atomic_set (&lock->count,1 ); } void debug_mutex_init(struct mutex *lock, const char *name,
kernel/locking/mutex.c +32 -62
180 lines not on this page · raw message