mirror of https://github.com/torvalds/linux.git
fb1c8f93d8
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> |
||
|---|---|---|
| .. | ||
| 8xx_immap.h | ||
| a.out.h | ||
| amigahw.h | ||
| amigaints.h | ||
| amigappc.h | ||
| amigayle.h | ||
| amipcmcia.h | ||
| ans-lcd.h | ||
| atomic.h | ||
| auxvec.h | ||
| backlight.h | ||
| bitops.h | ||
| bootinfo.h | ||
| bootx.h | ||
| bseip.h | ||
| btext.h | ||
| bug.h | ||
| byteorder.h | ||
| cache.h | ||
| cacheflush.h | ||
| checksum.h | ||
| commproc.h | ||
| cpm2.h | ||
| cputable.h | ||
| current.h | ||
| dbdma.h | ||
| delay.h | ||
| dma-mapping.h | ||
| dma.h | ||
| elf.h | ||
| floppy.h | ||
| futex.h | ||
| gg2.h | ||
| gt64260.h | ||
| gt64260_defs.h | ||
| hardirq.h | ||
| harrier.h | ||
| hawk.h | ||
| hawk_defs.h | ||
| heathrow.h | ||
| highmem.h | ||
| hw_irq.h | ||
| hydra.h | ||
| i8259.h | ||
| ibm4xx.h | ||
| ibm44x.h | ||
| ibm403.h | ||
| ibm405.h | ||
| ibm_ocp.h | ||
| ibm_ocp_pci.h | ||
| ide.h | ||
| immap_85xx.h | ||
| immap_cpm2.h | ||
| io.h | ||
| ipcbuf.h | ||
| ipic.h | ||
| irq.h | ||
| kexec.h | ||
| keylargo.h | ||
| kgdb.h | ||
| kmap_types.h | ||
| m48t35.h | ||
| m8260_pci.h | ||
| machdep.h | ||
| macio.h | ||
| md.h | ||
| mediabay.h | ||
| mk48t59.h | ||
| mmu.h | ||
| mmu_context.h | ||
| mpc8xx.h | ||
| mpc10x.h | ||
| mpc52xx.h | ||
| mpc52xx_psc.h | ||
| mpc83xx.h | ||
| mpc85xx.h | ||
| mpc8260.h | ||
| mpc8260_pci9.h | ||
| mv64x60.h | ||
| mv64x60_defs.h | ||
| nvram.h | ||
| ocp.h | ||
| ocp_ids.h | ||
| of_device.h | ||
| ohare.h | ||
| open_pic.h | ||
| page.h | ||
| parport.h | ||
| pc_serial.h | ||
| pci-bridge.h | ||
| pci.h | ||
| perfmon.h | ||
| pgalloc.h | ||
| pgtable.h | ||
| pmac_feature.h | ||
| pmac_low_i2c.h | ||
| pnp.h | ||
| posix_types.h | ||
| ppc4xx_dma.h | ||
| ppc4xx_pic.h | ||
| ppc_asm.h | ||
| ppc_sys.h | ||
| ppcboot.h | ||
| prep_nvram.h | ||
| processor.h | ||
| prom.h | ||
| ptrace.h | ||
| raven.h | ||
| reg.h | ||
| reg_booke.h | ||
| residual.h | ||
| rheap.h | ||
| rtc.h | ||
| rwsem.h | ||
| scatterlist.h | ||
| seccomp.h | ||
| sections.h | ||
| segment.h | ||
| semaphore.h | ||
| serial.h | ||
| sigcontext.h | ||
| signal.h | ||
| smp.h | ||
| spinlock.h | ||
| spinlock_types.h | ||
| stat.h | ||
| statfs.h | ||
| suspend.h | ||
| system.h | ||
| thread_info.h | ||
| time.h | ||
| tlb.h | ||
| tlbflush.h | ||
| todc.h | ||
| traps.h | ||
| types.h | ||
| uaccess.h | ||
| ucontext.h | ||
| uninorth.h | ||
| unistd.h | ||
| vga.h | ||
| xmon.h | ||
| xparameters.h | ||
| zorro.h | ||