Commit fb1c8f93d869b34cacb8b8932e2b83d96a19d720
Committed by
Linus Torvalds
1 parent
4327edf6b8
Exists in
master
and in
39 other branches
[PATCH] spinlock consolidation
This patch (written by me and also containing many suggestions of Arjan van de Ven) does a major cleanup of the spinlock code. It does the following things: - consolidates and enhances the spinlock/rwlock debugging code - simplifies the asm/spinlock.h files - encapsulates the raw spinlock type and moves generic spinlock features (such as ->break_lock) into the generic code. - cleans up the spinlock code hierarchy to get rid of the spaghetti. Most notably there's now only a single variant of the debugging code, located in lib/spinlock_debug.c. (previously we had one SMP debugging variant per architecture, plus a separate generic one for UP builds) Also, i've enhanced the rwlock debugging facility, it will now track write-owners. There is new spinlock-owner/CPU-tracking on SMP builds too. All locks have lockup detection now, which will work for both soft and hard spin/rwlock lockups. The arch-level include files now only contain the minimally necessary subset of the spinlock code - all the rest that can be generalized now lives in the generic headers: include/asm-i386/spinlock_types.h | 16 include/asm-x86_64/spinlock_types.h | 16 I have also split up the various spinlock variants into separate files, making it easier to see which does what. The new layout is: SMP | UP ----------------------------|----------------------------------- asm/spinlock_types_smp.h | linux/spinlock_types_up.h linux/spinlock_types.h | linux/spinlock_types.h asm/spinlock_smp.h | linux/spinlock_up.h linux/spinlock_api_smp.h | linux/spinlock_api_up.h linux/spinlock.h | linux/spinlock.h /* * here's the role of the various spinlock/rwlock related include files: * * on SMP builds: * * asm/spinlock_types.h: contains the raw_spinlock_t/raw_rwlock_t and the * initializers * * linux/spinlock_types.h: * defines the generic type and initializers * * asm/spinlock.h: contains the __raw_spin_*()/etc. lowlevel * implementations, mostly inline assembly code * * (also included on UP-debug builds:) * * linux/spinlock_api_smp.h: * contains the prototypes for the _spin_*() APIs. * * linux/spinlock.h: builds the final spin_*() APIs. * * on UP builds: * * linux/spinlock_type_up.h: * contains the generic, simplified UP spinlock type. * (which is an empty structure on non-debug builds) * * linux/spinlock_types.h: * defines the generic type and initializers * * linux/spinlock_up.h: * contains the __raw_spin_*()/etc. version of UP * builds. (which are NOPs on non-debug, non-preempt * builds) * * (included on UP-non-debug builds:) * * linux/spinlock_api_up.h: * builds the _spin_*() APIs. * * linux/spinlock.h: builds the final spin_*() APIs. */ All SMP and UP architectures are converted by this patch. arm, i386, ia64, ppc, ppc64, s390/s390x, x64 was build-tested via crosscompilers. m32r, mips, sh, sparc, have not been tested yet, but should be mostly fine. From: Grant Grundler <grundler@parisc-linux.org> Booted and lightly tested on a500-44 (64-bit, SMP kernel, dual CPU). Builds 32-bit SMP kernel (not booted or tested). I did not try to build non-SMP kernels. That should be trivial to fix up later if necessary. I converted bit ops atomic_hash lock to raw_spinlock_t. Doing so avoids some ugly nesting of linux/*.h and asm/*.h files. Those particular locks are well tested and contained entirely inside arch specific code. I do NOT expect any new issues to arise with them. If someone does ever need to use debug/metrics with them, then they will need to unravel this hairball between spinlocks, atomic ops, and bit ops that exist only because parisc has exactly one atomic instruction: LDCW (load and clear word). From: "Luck, Tony" <tony.luck@intel.com> ia64 fix Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjanv@infradead.org> Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Cc: Matthew Wilcox <willy@debian.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Mikael Pettersson <mikpe@csd.uu.se> Signed-off-by: Benoit Boissinot <benoit.boissinot@ens-lyon.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 69 changed files with 1591 additions and 2871 deletions Side-by-side Diff
- arch/alpha/kernel/alpha_ksyms.c
- arch/alpha/kernel/smp.c
- arch/ia64/kernel/mca.c
- arch/m32r/kernel/smp.c
- arch/mips/lib/dec_and_lock.c
- arch/parisc/lib/Makefile
- arch/parisc/lib/bitops.c
- arch/parisc/lib/debuglocks.c
- arch/ppc/lib/Makefile
- arch/ppc/lib/dec_and_lock.c
- arch/ppc64/lib/dec_and_lock.c
- arch/ppc64/lib/locks.c
- arch/s390/lib/spinlock.c
- arch/sparc/kernel/sparc_ksyms.c
- arch/sparc/lib/Makefile
- arch/sparc/lib/debuglocks.c
- arch/sparc64/kernel/process.c
- arch/sparc64/kernel/sparc64_ksyms.c
- arch/sparc64/lib/Makefile
- arch/sparc64/lib/debuglocks.c
- fs/buffer.c
- include/asm-alpha/spinlock.h
- include/asm-alpha/spinlock_types.h
- include/asm-arm/spinlock.h
- include/asm-arm/spinlock_types.h
- include/asm-i386/spinlock.h
- include/asm-i386/spinlock_types.h
- include/asm-ia64/spinlock.h
- include/asm-ia64/spinlock_types.h
- include/asm-m32r/spinlock.h
- include/asm-m32r/spinlock_types.h
- include/asm-mips/spinlock.h
- include/asm-mips/spinlock_types.h
- include/asm-parisc/atomic.h
- include/asm-parisc/bitops.h
- include/asm-parisc/cacheflush.h
- include/asm-parisc/processor.h
- include/asm-parisc/spinlock.h
- include/asm-parisc/spinlock_types.h
- include/asm-parisc/system.h
- include/asm-ppc/spinlock.h
- include/asm-ppc/spinlock_types.h
- include/asm-ppc64/spinlock.h
- include/asm-ppc64/spinlock_types.h
- include/asm-s390/spinlock.h
- include/asm-s390/spinlock_types.h
- include/asm-sh/spinlock.h
- include/asm-sh/spinlock_types.h
- include/asm-sparc/spinlock.h
- include/asm-sparc/spinlock_types.h
- include/asm-sparc64/spinlock.h
- include/asm-sparc64/spinlock_types.h
- include/asm-x86_64/spinlock.h
- include/asm-x86_64/spinlock_types.h
- include/linux/bit_spinlock.h
- include/linux/jbd.h
- include/linux/spinlock.h
- include/linux/spinlock_api_smp.h
- include/linux/spinlock_api_up.h
- include/linux/spinlock_types.h
- include/linux/spinlock_types_up.h
- include/linux/spinlock_up.h
- kernel/Makefile
- kernel/sched.c
- kernel/spinlock.c
- lib/Makefile
- lib/dec_and_lock.c
- lib/kernel_lock.c
- lib/spinlock_debug.c