mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
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>
229 lines
7.5 KiB
C
229 lines
7.5 KiB
C
#ifndef __LINUX_SPINLOCK_H
|
|
#define __LINUX_SPINLOCK_H
|
|
|
|
/*
|
|
* include/linux/spinlock.h - generic spinlock/rwlock declarations
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/config.h>
|
|
#include <linux/preempt.h>
|
|
#include <linux/linkage.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/thread_info.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/stringify.h>
|
|
|
|
#include <asm/system.h>
|
|
|
|
/*
|
|
* Must define these before including other files, inline functions need them
|
|
*/
|
|
#define LOCK_SECTION_NAME \
|
|
".text.lock." __stringify(KBUILD_BASENAME)
|
|
|
|
#define LOCK_SECTION_START(extra) \
|
|
".subsection 1\n\t" \
|
|
extra \
|
|
".ifndef " LOCK_SECTION_NAME "\n\t" \
|
|
LOCK_SECTION_NAME ":\n\t" \
|
|
".endif\n"
|
|
|
|
#define LOCK_SECTION_END \
|
|
".previous\n\t"
|
|
|
|
#define __lockfunc fastcall __attribute__((section(".spinlock.text")))
|
|
|
|
/*
|
|
* Pull the raw_spinlock_t and raw_rwlock_t definitions:
|
|
*/
|
|
#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):
|
|
*/
|
|
#if defined(CONFIG_SMP)
|
|
# include <asm/spinlock.h>
|
|
#else
|
|
# include <linux/spinlock_up.h>
|
|
#endif
|
|
|
|
#define spin_lock_init(lock) do { *(lock) = SPIN_LOCK_UNLOCKED; } while (0)
|
|
#define rwlock_init(lock) do { *(lock) = RW_LOCK_UNLOCKED; } while (0)
|
|
|
|
#define spin_is_locked(lock) __raw_spin_is_locked(&(lock)->raw_lock)
|
|
|
|
/**
|
|
* spin_unlock_wait - wait until the spinlock gets unlocked
|
|
* @lock: the spinlock in question.
|
|
*/
|
|
#define spin_unlock_wait(lock) __raw_spin_unlock_wait(&(lock)->raw_lock)
|
|
|
|
/*
|
|
* Pull the _spin_*()/_read_*()/_write_*() functions/declarations:
|
|
*/
|
|
#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
|
|
# include <linux/spinlock_api_smp.h>
|
|
#else
|
|
# include <linux/spinlock_api_up.h>
|
|
#endif
|
|
|
|
#ifdef CONFIG_DEBUG_SPINLOCK
|
|
extern void _raw_spin_lock(spinlock_t *lock);
|
|
#define _raw_spin_lock_flags(lock, flags) _raw_spin_lock(lock)
|
|
extern int _raw_spin_trylock(spinlock_t *lock);
|
|
extern void _raw_spin_unlock(spinlock_t *lock);
|
|
|
|
extern void _raw_read_lock(rwlock_t *lock);
|
|
extern int _raw_read_trylock(rwlock_t *lock);
|
|
extern void _raw_read_unlock(rwlock_t *lock);
|
|
extern void _raw_write_lock(rwlock_t *lock);
|
|
extern int _raw_write_trylock(rwlock_t *lock);
|
|
extern void _raw_write_unlock(rwlock_t *lock);
|
|
#else
|
|
# define _raw_spin_unlock(lock) __raw_spin_unlock(&(lock)->raw_lock)
|
|
# define _raw_spin_trylock(lock) __raw_spin_trylock(&(lock)->raw_lock)
|
|
# define _raw_spin_lock(lock) __raw_spin_lock(&(lock)->raw_lock)
|
|
# define _raw_spin_lock_flags(lock, flags) \
|
|
__raw_spin_lock_flags(&(lock)->raw_lock, *(flags))
|
|
# define _raw_read_lock(rwlock) __raw_read_lock(&(rwlock)->raw_lock)
|
|
# define _raw_write_lock(rwlock) __raw_write_lock(&(rwlock)->raw_lock)
|
|
# define _raw_read_unlock(rwlock) __raw_read_unlock(&(rwlock)->raw_lock)
|
|
# define _raw_write_unlock(rwlock) __raw_write_unlock(&(rwlock)->raw_lock)
|
|
# define _raw_read_trylock(rwlock) __raw_read_trylock(&(rwlock)->raw_lock)
|
|
# define _raw_write_trylock(rwlock) __raw_write_trylock(&(rwlock)->raw_lock)
|
|
#endif
|
|
|
|
#define read_can_lock(rwlock) __raw_read_can_lock(&(rwlock)->raw_lock)
|
|
#define write_can_lock(rwlock) __raw_write_can_lock(&(rwlock)->raw_lock)
|
|
|
|
/*
|
|
* Define the various spin_lock and rw_lock methods. Note we define these
|
|
* regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various
|
|
* methods are defined as nops in the case they are not required.
|
|
*/
|
|
#define spin_trylock(lock) __cond_lock(_spin_trylock(lock))
|
|
#define read_trylock(lock) __cond_lock(_read_trylock(lock))
|
|
#define write_trylock(lock) __cond_lock(_write_trylock(lock))
|
|
|
|
#define spin_lock(lock) _spin_lock(lock)
|
|
#define write_lock(lock) _write_lock(lock)
|
|
#define read_lock(lock) _read_lock(lock)
|
|
|
|
#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
|
|
#define spin_lock_irqsave(lock, flags) flags = _spin_lock_irqsave(lock)
|
|
#define read_lock_irqsave(lock, flags) flags = _read_lock_irqsave(lock)
|
|
#define write_lock_irqsave(lock, flags) flags = _write_lock_irqsave(lock)
|
|
#else
|
|
#define spin_lock_irqsave(lock, flags) _spin_lock_irqsave(lock, flags)
|
|
#define read_lock_irqsave(lock, flags) _read_lock_irqsave(lock, flags)
|
|
#define write_lock_irqsave(lock, flags) _write_lock_irqsave(lock, flags)
|
|
#endif
|
|
|
|
#define spin_lock_irq(lock) _spin_lock_irq(lock)
|
|
#define spin_lock_bh(lock) _spin_lock_bh(lock)
|
|
|
|
#define read_lock_irq(lock) _read_lock_irq(lock)
|
|
#define read_lock_bh(lock) _read_lock_bh(lock)
|
|
|
|
#define write_lock_irq(lock) _write_lock_irq(lock)
|
|
#define write_lock_bh(lock) _write_lock_bh(lock)
|
|
|
|
#define spin_unlock(lock) _spin_unlock(lock)
|
|
#define write_unlock(lock) _write_unlock(lock)
|
|
#define read_unlock(lock) _read_unlock(lock)
|
|
|
|
#define spin_unlock_irqrestore(lock, flags) \
|
|
_spin_unlock_irqrestore(lock, flags)
|
|
#define spin_unlock_irq(lock) _spin_unlock_irq(lock)
|
|
#define spin_unlock_bh(lock) _spin_unlock_bh(lock)
|
|
|
|
#define read_unlock_irqrestore(lock, flags) \
|
|
_read_unlock_irqrestore(lock, flags)
|
|
#define read_unlock_irq(lock) _read_unlock_irq(lock)
|
|
#define read_unlock_bh(lock) _read_unlock_bh(lock)
|
|
|
|
#define write_unlock_irqrestore(lock, flags) \
|
|
_write_unlock_irqrestore(lock, flags)
|
|
#define write_unlock_irq(lock) _write_unlock_irq(lock)
|
|
#define write_unlock_bh(lock) _write_unlock_bh(lock)
|
|
|
|
#define spin_trylock_bh(lock) __cond_lock(_spin_trylock_bh(lock))
|
|
|
|
#define spin_trylock_irq(lock) \
|
|
({ \
|
|
local_irq_disable(); \
|
|
_spin_trylock(lock) ? \
|
|
1 : ({ local_irq_enable(); 0; }); \
|
|
})
|
|
|
|
#define spin_trylock_irqsave(lock, flags) \
|
|
({ \
|
|
local_irq_save(flags); \
|
|
_spin_trylock(lock) ? \
|
|
1 : ({ local_irq_restore(flags); 0; }); \
|
|
})
|
|
|
|
/*
|
|
* Pull the atomic_t declaration:
|
|
* (asm-mips/atomic.h needs above definitions)
|
|
*/
|
|
#include <asm/atomic.h>
|
|
/**
|
|
* atomic_dec_and_lock - lock on reaching reference count zero
|
|
* @atomic: the atomic counter
|
|
* @lock: the spinlock in question
|
|
*/
|
|
extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);
|
|
#define atomic_dec_and_lock(atomic, lock) \
|
|
__cond_lock(_atomic_dec_and_lock(atomic, lock))
|
|
|
|
/**
|
|
* spin_can_lock - would spin_trylock() succeed?
|
|
* @lock: the spinlock in question.
|
|
*/
|
|
#define spin_can_lock(lock) (!spin_is_locked(lock))
|
|
|
|
#endif /* __LINUX_SPINLOCK_H */
|