core/locking for v2.6.32
Subsystems (6)
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
Highlights:
- More flexible lock-op inlining/uninlining support, used on s390
- Reimplement/improve lockdep via BFS
- Various cleanups
Thanks,
Ingo
------------------>
Heiko Carstens (9):
locking, powerpc: Rename __spin_try_lock() and friends locking, sparc: Rename __spin_try_lock() and friends locking, m68k/asm-offsets: Rename pt_regs offset defines locking, m68k: Calculate thread_info offset with asm offset
locking: Move spinlock function bodies to header file
locking: Allow arch-inlined spinlocks
locking: Simplify spinlock inlining
locking: Inline spinlock code for all locking variants on s390 locking, m68k/asm-offsets: Rename signal defines
Ingo Molnar (1):
lockdep: Fix BFS build
Li Zefan (5):
lockdep: Fix missing entry in /proc/lock_stat
lockdep: Fix missing entries in /proc/lock_chains
lockdep: Simplify lockdep seqfile code
lockdep: Simplify lockdep_chains seqfile code
lockdep: Simplify lock_stat seqfile code
Ming Lei (12):
lockdep: Print the shortest dependency chain if finding a circle
lockdep: Improve implementation of BFS
lockdep: Introduce match function to BFS
lockdep: Implement check_noncircular() by BFS
lockdep: Implement find_usage_*wards by BFS
lockdep: Introduce print_shortest_lock_dependencies
lockdep: Implement lockdep_count_*ward_deps by BFS
lockdep: Update memory usage introduced by BFS
lockdep: Add statistics info for max bfs queue depth
lockdep: Reintroduce generation count to make BFS faster
lockdep: Fix memory usage info of BFS
lockdep: Remove recursion stattistics
Peter Zijlstra (5):
lockdep: BFS cleanup
lockdep: Fix backtraces
lockdep: Fix style nits
lockdep: Introduce lockdep_assert_held()
lockdep: Deal with many similar locks
arch/m68k/include/asm/entry_mm.h | 4 - arch/m68k/include/asm/entry_no.h | 8 +- arch/m68k/include/asm/math-emu.h | 20 +- arch/m68k/include/asm/thread_info_mm.h | 11 +- arch/m68k/kernel/asm-offsets.c | 39 +- arch/m68k/kernel/entry.S | 22 +- arch/m68k/math-emu/fp_entry.S | 38 +- arch/powerpc/include/asm/spinlock.h | 20 +- arch/s390/include/asm/spinlock.h | 29 ++ arch/sparc/include/asm/spinlock_32.h | 12 +- arch/sparc/include/asm/spinlock_64.h | 28 +- include/linux/lockdep.h | 18 +- include/linux/spinlock.h | 64 +-- include/linux/spinlock_api_smp.h | 394 ++++++++++++++++ kernel/lockdep.c | 792 +++++++++++++++++++++----------- kernel/lockdep_internals.h | 2 + kernel/lockdep_proc.c | 128 +---- kernel/sched.c | 2 + kernel/spinlock.c | 230 ++++------ 19 files changed, 1209 insertions(+), 652 deletions(-)
arch/m68k/include/asm/entry_mm.h +0 -4
@@ -46,7 +46,6 @@#define curptr a2 LFLUSH_I_AND_D = 0x00000808 -LSIGTRAP = 5/* process bits for task_struct.ptrace */ PT_TRACESYS_OFF =3
@@ -118,9 +117,6 @@ PT_DTRACE_BIT = 2#define STR (X ) STR1(X)#define STR1 (X ) #X -#define PT_OFF_ORIG_D0 0x24 -#define PT_OFF_FORMATVEC 0x32 -#define PT_OFF_SR 0x2C#define SAVE_ALL_INT \ "clrl %%sp@-;"/* stk_adj */ \"pea -1:w;" /* orig d0 = -1 */ \
arch/m68k/include/asm/entry_no.h +4 -4
@@ -72,8 +72,8 @@ LENOSYS = 38 lea %sp@(-32),%sp /* space for 8 regs */ moveml %d1-%d5/%a0-%a2,%sp@ movel sw_usp,%a0 /* get usp */ - movel %a0@-,%sp@(PT_PC) /* copy exception program counter */ - movel %a0@-,%sp@(PT_FORMATVEC)/* copy exception format/vector/sr */ + movel %a0@-,%sp@(PT_OFF_PC) /* copy exception program counter */ + movel %a0@-,%sp@(PT_OFF_FORMATVEC)/*copy exception format/vector/sr */ bra 7f 6: clrl %sp@- /* stkadj */
@@ -89,8 +89,8 @@ LENOSYS = 38 bnes 8f /* no, skip */ move #0x2700,%sr /* disable intrs */ movel sw_usp,%a0 /* get usp */ - movel %sp@(PT_PC),%a0@- /* copy exception program counter */ - movel %sp@(PT_FORMATVEC),%a0@-/* copy exception format/vector/sr */ + movel %sp@(PT_OFF_PC),%a0@- /* copy exception program counter */ + movel %sp@(PT_OFF_FORMATVEC),%a0@-/*copy exception format/vector/sr */ moveml %sp@,%d1-%d5/%a0-%a2 lea %sp@(32),%sp /* space for 8 regs */ movel %sp@+,%d0
arch/m68k/include/asm/math-emu.h +10 -10
@@ -145,16 +145,16 @@ extern unsigned int fp_debugprint;* these are only used during instruction decoding * where we always know how deep we're on the stack. */ -#define FPS_DO (PT_D0) -#define FPS_D1 (PT_D1) -#define FPS_D2 (PT_D2) -#define FPS_A0 (PT_A0) -#define FPS_A1 (PT_A1) -#define FPS_A2 (PT_A2) -#define FPS_SR (PT_SR) -#define FPS_PC (PT_PC) -#define FPS_EA (PT_PC+6) -#define FPS_PC2 (PT_PC+10) +#define FPS_DO (PT_OFF_D0) +#define FPS_D1 (PT_OFF_D1) +#define FPS_D2 (PT_OFF_D2) +#define FPS_A0 (PT_OFF_A0) +#define FPS_A1 (PT_OFF_A1) +#define FPS_A2 (PT_OFF_A2) +#define FPS_SR (PT_OFF_SR) +#define FPS_PC (PT_OFF_PC) +#define FPS_EA (PT_OFF_PC+6) +#define FPS_PC2 (PT_OFF_PC+10) .macro fp_get_fp_reg lea (FPD_FPREG,FPDATA,%d0.w*4),%a0
arch/m68k/include/asm/thread_info_mm.h +10 -1
@@ -1,6 +1,10 @@#ifndef _ASM_M68K_THREAD_INFO_H#define _ASM_M68K_THREAD_INFO_H +#ifndef ASM_OFFSETS_C +#include <asm/asm-offsets.h> +#endif +#include <asm/current.h> #include <asm/types.h> #include <asm/page.h>
@@ -31,7 +35,12 @@ struct thread_info {#define init_thread_info (init_task.thread.info)#define init_stack (init_thread_union.stack) -#define task_thread_info (tsk) (&(tsk)->thread.info) +#ifdef ASM_OFFSETS_C +#define task_thread_info (tsk) ((struct thread_info *) NULL) +#else +#define task_thread_info (tsk) ((struct thread_info *)((char *)tsk+TASK_TINFO)) +#endif +#define task_stack_page (tsk) ((tsk)->stack)#define current_thread_info () task_thread_info(current)
arch/m68k/kernel/asm-offsets.c +22 -17
@@ -8,6 +8,8 @@* #defines from the assembly-language output. */ +#define ASM_OFFSETS_C +#include <linux/stddef.h> #include <linux/sched.h> #include <linux/kernel_stat.h>
@@ -27,6 +29,9 @@ int main(void) DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info));DEFINE (TASK_MM , offsetof(struct task_struct , mm));DEFINE (TASK_ACTIVE_MM , offsetof(struct task_struct , active_mm)); +#ifdef CONFIG_MMU + DEFINE(TASK_TINFO, offsetof(struct task_struct, thread.info)); +#endif /* offsets into the thread struct */ DEFINE (THREAD_KSP , offsetof(struct thread_struct , ksp));
@@ -44,20 +49,20 @@ int main(void)DEFINE (TINFO_FLAGS , offsetof(struct thread_info , flags));/* offsets into the pt_regs */ -DEFINE (PT_D0 , offsetof(struct pt_regs , d0)); -DEFINE (PT_ORIG_D0 , offsetof(struct pt_regs , orig_d0)); -DEFINE (PT_D1 , offsetof(struct pt_regs , d1)); -DEFINE (PT_D2 , offsetof(struct pt_regs , d2)); -DEFINE (PT_D3 , offsetof(struct pt_regs , d3)); -DEFINE (PT_D4 , offsetof(struct pt_regs , d4)); -DEFINE (PT_D5 , offsetof(struct pt_regs , d5)); -DEFINE (PT_A0 , offsetof(struct pt_regs , a0)); -DEFINE (PT_A1 , offsetof(struct pt_regs , a1)); -DEFINE (PT_A2 , offsetof(struct pt_regs , a2)); -DEFINE (PT_PC , offsetof(struct pt_regs , pc)); -DEFINE (PT_SR , offsetof(struct pt_regs , sr)); +DEFINE (PT_OFF_D0 , offsetof(struct pt_regs , d0)); +DEFINE (PT_OFF_ORIG_D0 , offsetof(struct pt_regs , orig_d0)); +DEFINE (PT_OFF_D1 , offsetof(struct pt_regs , d1)); +DEFINE (PT_OFF_D2 , offsetof(struct pt_regs , d2)); +DEFINE (PT_OFF_D3 , offsetof(struct pt_regs , d3)); +DEFINE (PT_OFF_D4 , offsetof(struct pt_regs , d4)); +DEFINE (PT_OFF_D5 , offsetof(struct pt_regs , d5)); +DEFINE (PT_OFF_A0 , offsetof(struct pt_regs , a0)); +DEFINE (PT_OFF_A1 , offsetof(struct pt_regs , a1)); +DEFINE (PT_OFF_A2 , offsetof(struct pt_regs , a2)); +DEFINE (PT_OFF_PC , offsetof(struct pt_regs , pc)); +DEFINE (PT_OFF_SR , offsetof(struct pt_regs , sr));/* bitfields are a bit difficult */ -DEFINE (PT_VECTOR , offsetof(struct pt_regs , pc) +4 ); +DEFINE (PT_OFF_FORMATVEC , offsetof(struct pt_regs , pc) +4 );/* offsets into the irq_handler struct */ DEFINE (IRQ_HANDLER , offsetof(struct irq_node , handler));
@@ -84,10 +89,10 @@ int main(void)DEFINE (FONT_DESC_PREF , offsetof(struct font_desc , pref));/* signal defines */ -DEFINE (SIGSEGV ,SIGSEGV ); -DEFINE (SEGV_MAPERR ,SEGV_MAPERR ); -DEFINE (SIGTRAP ,SIGTRAP ); -DEFINE (TRAP_TRACE ,TRAP_TRACE ); +DEFINE (LSIGSEGV ,SIGSEGV ); +DEFINE (LSEGV_MAPERR ,SEGV_MAPERR ); +DEFINE (LSIGTRAP ,SIGTRAP ); +DEFINE (LTRAP_TRACE ,TRAP_TRACE );/* offsets into the custom struct */ DEFINE (CUSTOMBASE , &amiga_custom);
arch/m68k/kernel/entry.S +11 -11
@@ -77,17 +77,17 @@ ENTRY(ret_from_fork) jra .Lret_from_exception do_trace_entry: - movel #-ENOSYS,%sp@(PT_D0) | needed for strace + movel #-ENOSYS,%sp@(PT_OFF_D0)| needed for strace subql #4,%sp SAVE_SWITCH_STACK jbsr syscall_trace RESTORE_SWITCH_STACK addql #4,%sp - movel %sp@(PT_ORIG_D0),%d0 + movel %sp@(PT_OFF_ORIG_D0),%d0 cmpl #NR_syscalls,%d0 jcs syscall badsys: - movel #-ENOSYS,%sp@(PT_D0) + movel #-ENOSYS,%sp@(PT_OFF_D0) jra ret_from_syscall do_trace_exit:
@@ -103,7 +103,7 @@ ENTRY(ret_from_signal) addql #4,%sp /* on 68040 complete pending writebacks if any */ #ifdef CONFIG_M68040 - bfextu %sp@(PT_VECTOR){#0,#4},%d0 + bfextu %sp@(PT_OFF_FORMATVEC){#0,#4},%d0 subql #7,%d0 | bus error frame ? jbne 1f movel %sp,%sp@-
@@ -127,7 +127,7 @@ ENTRY(system_call) jcc badsys syscall: jbsr @(sys_call_table,%d0:l:4)@(0) - movel %d0,%sp@(PT_D0) | save the return value + movel %d0,%sp@(PT_OFF_D0) | save the return value ret_from_syscall: |oriw #0x0700,%sr movew %curptr@(TASK_INFO+TINFO_FLAGS+2),%d0
@@ -135,7 +135,7 @@ ret_from_syscall: 1: RESTORE_ALL syscall_exit_work: - btst #5,%sp@(PT_SR) | check if returning to kernel + btst #5,%sp@(PT_OFF_SR) | check if returning to kernel bnes 1b | if so, skip resched, signals lslw #1,%d0 jcs do_trace_exit
@@ -148,7 +148,7 @@ syscall_exit_work: ENTRY(ret_from_exception) .Lret_from_exception: - btst #5,%sp@(PT_SR) | check if returning to kernel + btst #5,%sp@(PT_OFF_SR) | check if returning to kernel bnes 1f | if so, skip resched, signals | only allow interrupts when we are really the last one on the | kernel stack, otherwise stack overflow can occur during
@@ -182,7 +182,7 @@ do_signal_return: jbra resume_userspace do_delayed_trace: - bclr #7,%sp@(PT_SR) | clear trace bit in SR + bclr #7,%sp@(PT_OFF_SR) | clear trace bit in SR pea 1 | send SIGTRAP movel %curptr,%sp@- pea LSIGTRAP
@@ -199,7 +199,7 @@ ENTRY(auto_inthandler) GET_CURRENT(%d0) addqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1) | put exception # in d0 - bfextu %sp@(PT_VECTOR){#4,#10},%d0 + bfextu %sp@(PT_OFF_FORMATVEC){#4,#10},%d0 subw #VEC_SPUR,%d0 movel %sp,%sp@-
@@ -216,7 +216,7 @@ ret_from_interrupt: ALIGN ret_from_last_interrupt: moveq #(~ALLOWINT>>8)&0xff,%d0 - andb %sp@(PT_SR),%d0 + andb %sp@(PT_OFF_SR),%d0 jne 2b /* check if we need to do software interrupts */
@@ -232,7 +232,7 @@ ENTRY(user_inthandler) GET_CURRENT(%d0) addqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1) | put exception # in d0 - bfextu %sp@(PT_VECTOR){#4,#10},%d0 + bfextu %sp@(PT_OFF_FORMATVEC){#4,#10},%d0 user_irqvec_fixup = . + 2 subw #VEC_USER,%d0
arch/m68k/math-emu/fp_entry.S +19 -19
@@ -85,8 +85,8 @@ fp_err_ua2: fp_err_ua1: addq.l #4,%sp move.l %a0,-(%sp) - pea SEGV_MAPERR - pea SIGSEGV + pea LSEGV_MAPERR + pea LSIGSEGV jsr fpemu_signal add.w #12,%sp jra ret_from_exception
@@ -96,8 +96,8 @@ fp_err_ua1: | it does not really belong here, but... fp_sendtrace060: move.l (FPS_PC,%sp),-(%sp) - pea TRAP_TRACE - pea SIGTRAP + pea LTRAP_TRACE + pea LSIGTRAP jsr fpemu_signal add.w #12,%sp jra ret_from_exception
@@ -122,17 +122,17 @@ fp_get_data_reg: .long fp_get_d6, fp_get_d7 fp_get_d0: - move.l (PT_D0+8,%sp),%d0 + move.l (PT_OFF_D0+8,%sp),%d0 printf PREGISTER,"{d0->%08x}",1,%d0 rts fp_get_d1: - move.l (PT_D1+8,%sp),%d0 + move.l (PT_OFF_D1+8,%sp),%d0 printf PREGISTER,"{d1->%08x}",1,%d0 rts fp_get_d2: - move.l (PT_D2+8,%sp),%d0 + move.l (PT_OFF_D2+8,%sp),%d0 printf PREGISTER,"{d2->%08x}",1,%d0 rts
@@ -173,35 +173,35 @@ fp_put_data_reg: fp_put_d0: printf PREGISTER,"{d0<-%08x}",1,%d0 - move.l %d0,(PT_D0+8,%sp) + move.l %d0,(PT_OFF_D0+8,%sp) rts fp_put_d1: printf PREGISTER,"{d1<-%08x}",1,%d0 - move.l %d0,(PT_D1+8,%sp) + move.l %d0,(PT_OFF_D1+8,%sp) rts fp_put_d2: printf PREGISTER,"{d2<-%08x}",1,%d0 - move.l %d0,(PT_D2+8,%sp) + move.l %d0,(PT_OFF_D2+8,%sp) rts fp_put_d3: printf PREGISTER,"{d3<-%08x}",1,%d0 | move.l %d0,%d3 - move.l %d0,(PT_D3+8,%sp) + move.l %d0,(PT_OFF_D3+8,%sp) rts fp_put_d4: printf PREGISTER,"{d4<-%08x}",1,%d0 | move.l %d0,%d4 - move.l %d0,(PT_D4+8,%sp) + move.l %d0,(PT_OFF_D4+8,%sp) rts fp_put_d5: printf PREGISTER,"{d5<-%08x}",1,%d0 | move.l %d0,%d5 - move.l %d0,(PT_D5+8,%sp) + move.l %d0,(PT_OFF_D5+8,%sp) rts fp_put_d6:
@@ -225,17 +225,17 @@ fp_get_addr_reg: .long fp_get_a6, fp_get_a7 fp_get_a0: - move.l (PT_A0+8,%sp),%a0 + move.l (PT_OFF_A0+8,%sp),%a0 printf PREGISTER,"{a0->%08x}",1,%a0 rts fp_get_a1: - move.l (PT_A1+8,%sp),%a0 + move.l (PT_OFF_A1+8,%sp),%a0 printf PREGISTER,"{a1->%08x}",1,%a0 rts fp_get_a2: - move.l (PT_A2+8,%sp),%a0 + move.l (PT_OFF_A2+8,%sp),%a0 printf PREGISTER,"{a2->%08x}",1,%a0 rts
@@ -276,17 +276,17 @@ fp_put_addr_reg: fp_put_a0: printf PREGISTER,"{a0<-%08x}",1,%a0 - move.l %a0,(PT_A0+8,%sp) + move.l %a0,(PT_OFF_A0+8,%sp) rts fp_put_a1: printf PREGISTER,"{a1<-%08x}",1,%a0 - move.l %a0,(PT_A1+8,%sp) + move.l %a0,(PT_OFF_A1+8,%sp) rts fp_put_a2: printf PREGISTER,"{a2<-%08x}",1,%a0 - move.l %a0,(PT_A2+8,%sp) + move.l %a0,(PT_OFF_A2+8,%sp) rts fp_put_a3:
arch/powerpc/include/asm/spinlock.h +10 -10
@@ -54,7 +54,7 @@* This returns the old value in the lock, so we succeeded * in getting the lock if the return value is 0. */ -static inline unsigned long __spin_trylock (raw_spinlock_t *lock) +static inline unsigned long arch_spin_trylock (raw_spinlock_t *lock) {unsigned long tmp, token;
@@ -76,7 +76,7 @@ static inline unsigned long __spin_trylock(raw_spinlock_t *lock)static inline int __raw_spin_trylock (raw_spinlock_t *lock) {CLEAR_IO_SYNC ; -return __spin_trylock (lock) ==0 ; +return arch_spin_trylock (lock) ==0 ; }/*
@@ -108,7 +108,7 @@ static inline void __raw_spin_lock(raw_spinlock_t *lock) {CLEAR_IO_SYNC ;while (1 ) { -if (likely (__spin_trylock (lock) ==0 )) +if (likely (arch_spin_trylock (lock) ==0 ))break ; do { HMT_low();
@@ -126,7 +126,7 @@ void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)CLEAR_IO_SYNC ;while (1 ) { -if (likely (__spin_trylock (lock) ==0 )) +if (likely (arch_spin_trylock (lock) ==0 ))break ;local_save_flags (flags_dis);local_irq_restore (flags);
@@ -181,7 +181,7 @@ extern void __raw_spin_unlock_wait(raw_spinlock_t *lock);* This returns the old value in the lock + 1, * so we got a read lock if the return value is > 0. */ -static inline long __read_trylock (raw_rwlock_t *rw) +static inline long arch_read_trylock (raw_rwlock_t *rw) {long tmp;
@@ -205,7 +205,7 @@ static inline long __read_trylock(raw_rwlock_t *rw)* This returns the old value in the lock, * so we got the write lock if the return value is 0. */ -static inline long __write_trylock (raw_rwlock_t *rw) +static inline long arch_write_trylock (raw_rwlock_t *rw) {long tmp, token;
@@ -228,7 +228,7 @@ static inline long __write_trylock(raw_rwlock_t *rw)static inline void __raw_read_lock (raw_rwlock_t *rw) {while (1 ) { -if (likely (__read_trylock (rw) >0 )) +if (likely (arch_read_trylock (rw) >0 ))break ; do { HMT_low();
@@ -242,7 +242,7 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)static inline void __raw_write_lock (raw_rwlock_t *rw) {while (1 ) { -if (likely (__write_trylock (rw) ==0 )) +if (likely (arch_write_trylock (rw) ==0 ))break ; do { HMT_low();
@@ -255,12 +255,12 @@ static inline void __raw_write_lock(raw_rwlock_t *rw)static inline int __raw_read_trylock (raw_rwlock_t *rw) { -return __read_trylock (rw) >0 ; +return arch_read_trylock (rw) >0 ; }static inline int __raw_write_trylock (raw_rwlock_t *rw) { -return __write_trylock (rw) ==0 ; +return arch_write_trylock (rw) ==0 ; }static inline void __raw_read_unlock (raw_rwlock_t *rw)
arch/s390/include/asm/spinlock.h +29 -0
@@ -191,4 +191,33 @@ 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 */
arch/sparc/include/asm/spinlock_32.h +6 -6
@@ -76,7 +76,7 @@ static inline void __raw_spin_unlock(raw_spinlock_t *lock)* * Unfortunately this scheme limits us to ~16,000,000 cpus. */ -static inline void __read_lock (raw_rwlock_t *rw) +static inline void arch_read_lock (raw_rwlock_t *rw) { registerraw_rwlock_t *lp asm("g1" ); lp = rw;
@@ -92,11 +92,11 @@ static inline void __read_lock(raw_rwlock_t *rw)#define __raw_read_lock (lock) \ do { unsigned long flags; \ local_irq_save(flags); \ - __read_lock(lock); \ + arch_read_lock(lock); \ local_irq_restore(flags); \ } while(0) -static inline void __read_unlock (raw_rwlock_t *rw) +static inline void arch_read_unlock (raw_rwlock_t *rw) { registerraw_rwlock_t *lp asm("g1" ); lp = rw;
@@ -112,7 +112,7 @@ static inline void __read_unlock(raw_rwlock_t *rw)#define __raw_read_unlock (lock) \ do { unsigned long flags; \ local_irq_save(flags); \ - __read_unlock(lock); \ + arch_read_unlock(lock); \ local_irq_restore(flags); \ } while(0)
@@ -150,7 +150,7 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)return (val ==0 ); } -static inline int __read_trylock (raw_rwlock_t *rw) +static inline int arch_read_trylock (raw_rwlock_t *rw) { registerraw_rwlock_t *lp asm("g1" ); registerint res asm("o0" );
@@ -169,7 +169,7 @@ static inline int __read_trylock(raw_rwlock_t *rw) ({unsigned long flags; \int res; \local_irq_save (flags); \ - res =__read_trylock (lock); \ + res =arch_read_trylock (lock); \local_irq_restore (flags); \ res; \ })
arch/sparc/include/asm/spinlock_64.h +14 -14
@@ -92,7 +92,7 @@ static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long fla/* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */ -static void inline __read_lock (raw_rwlock_t *lock) +static void inline arch_read_lock (raw_rwlock_t *lock) {unsigned long tmp1, tmp2;
@@ -115,7 +115,7 @@ static void inline __read_lock(raw_rwlock_t *lock) : "memory"); } -static int inline __read_trylock (raw_rwlock_t *lock) +static int inline arch_read_trylock (raw_rwlock_t *lock) {int tmp1, tmp2;
@@ -136,7 +136,7 @@ static int inline __read_trylock(raw_rwlock_t *lock)return tmp1; } -static void inline __read_unlock (raw_rwlock_t *lock) +static void inline arch_read_unlock (raw_rwlock_t *lock) {unsigned long tmp1, tmp2;
@@ -152,7 +152,7 @@ static void inline __read_unlock(raw_rwlock_t *lock) : "memory"); } -static void inline __write_lock (raw_rwlock_t *lock) +static void inline arch_write_lock (raw_rwlock_t *lock) {unsigned long mask, tmp1, tmp2;
@@ -177,7 +177,7 @@ static void inline __write_lock(raw_rwlock_t *lock) : "memory"); } -static void inline __write_unlock (raw_rwlock_t *lock) +static void inline arch_write_unlock (raw_rwlock_t *lock) { __asm__ __volatile__( " stw %%g0, [%0]"
@@ -186,7 +186,7 @@ static void inline __write_unlock(raw_rwlock_t *lock) : "memory"); } -static int inline __write_trylock (raw_rwlock_t *lock) +static int inline arch_write_trylock (raw_rwlock_t *lock) {unsigned long mask, tmp1, tmp2, result;
@@ -210,14 +210,14 @@ static int inline __write_trylock(raw_rwlock_t *lock)return result; } -#define __raw_read_lock (p) __read_lock(p) -#define __raw_read_lock_flags (p, f) __read_lock(p) -#define __raw_read_trylock (p) __read_trylock(p) -#define __raw_read_unlock (p) __read_unlock(p) -#define __raw_write_lock (p) __write_lock(p) -#define __raw_write_lock_flags (p, f) __write_lock(p) -#define __raw_write_unlock (p) __write_unlock(p) -#define __raw_write_trylock (p) __write_trylock(p) +#define __raw_read_lock (p) arch_read_lock(p) +#define __raw_read_lock_flags (p, f) arch_read_lock(p) +#define __raw_read_trylock (p) arch_read_trylock(p) +#define __raw_read_unlock (p) arch_read_unlock(p) +#define __raw_write_lock (p) arch_write_lock(p) +#define __raw_write_lock_flags (p, f) arch_write_lock(p) +#define __raw_write_unlock (p) arch_write_unlock(p) +#define __raw_write_trylock (p) arch_write_trylock(p)#define __raw_read_can_lock (rw) (!((rw)->lock & 0x80000000UL))#define __raw_write_can_lock (rw) (!(rw)->lock)
include/linux/lockdep.h +17 -1
@@ -149,6 +149,12 @@ struct lock_list {struct lock_class *class;struct stack_trace trace;int distance; + +/* +* The parent field is used to implement breadth-first search, and the +* bit 0 is reused to indicate if the lock has been accessed in BFS. +*/ +struct lock_list *parent; };/*
@@ -208,10 +214,12 @@ struct held_lock {* interrupt context: */ unsigned int irq_context:2; /* bit 0 - soft, bit 1 - hard */ - unsigned int trylock:1; + unsigned int trylock:1; /* 16 bits */ + unsigned int read:2; /* see lock_acquire() comment */ unsigned int check:2; /* see lock_acquire() comment */ unsigned int hardirqs_off:1; + unsigned int references:11; /* 32 bits */ };/*
@@ -291,6 +299,10 @@ extern void lock_acquire(struct lockdep_map *lock, unsigned int subclass,extern void lock_release (struct lockdep_map *lock,int nested,unsigned long ip); +#define lockdep_is_held (lock) lock_is_held(&(lock)->dep_map) + +extern int lock_is_held (struct lockdep_map *lock); +extern void lock_set_class (struct lockdep_map *lock,const char *name,struct lock_class_key *key,unsigned int subclass,unsigned long ip);
@@ -309,6 +321,8 @@ extern void lockdep_trace_alloc(gfp_t mask);#define lockdep_depth (tsk) (debug_locks ? (tsk)->lockdep_depth : 0) +#define lockdep_assert_held (l) WARN_ON(debug_locks && !lockdep_is_held(l)) +#else /* !LOCKDEP */ static inline void lockdep_off (void )
@@ -353,6 +367,8 @@ struct lock_class_key { };#define lockdep_depth (tsk) (0) +#define lockdep_assert_held (l) do { } while (0) +#endif /* !LOCKDEP */ #ifdef CONFIG_LOCK_STAT
include/linux/spinlock.h +15 -49
84 lines not on this page · raw message
include/linux/spinlock_api_smp.h +394 -0
398 lines not on this page · raw message
kernel/lockdep.c +535 -257
1,155 lines not on this page · raw message
kernel/lockdep_internals.h +2 -0
@@ -91,6 +91,8 @@ extern unsigned int nr_process_chains;extern unsigned int max_lockdep_depth;extern unsigned int max_recursion_depth; +extern unsigned int max_bfs_queue_depth; +#ifdef CONFIG_PROVE_LOCKING extern unsigned long lockdep_count_forward_deps (struct lock_class *);extern unsigned long lockdep_count_backward_deps (struct lock_class *);
kernel/lockdep_proc.c +25 -103
230 lines not on this page · raw message
kernel/sched.c +2 -0
@@ -6609,6 +6609,8 @@ int cond_resched_lock(spinlock_t *lock)int resched =should_resched ();int ret =0 ; +lockdep_assert_held (lock); +if (spin_needbreak (lock) || resched) {spin_unlock (lock);if (resched)
kernel/spinlock.c +84 -146
385 lines not on this page · raw message