From: John Hodge (sonata) <tpg@mutabah.net>
Date: Thu, 29 Nov 2012 16:19:13 +0000 (+0800)
Subject: Kernel/x86 - Added owner field to SHORTLOCK to catch doublelocks
X-Git-Tag: rel0.15~633
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=866828924cdd5870fd05cf8748dd06f411ac81fc;p=tpg%2Facess2.git

Kernel/x86 - Added owner field to SHORTLOCK to catch doublelocks
---

diff --git a/KernelLand/Kernel/arch/x86/include/arch.h b/KernelLand/Kernel/arch/x86/include/arch.h
index 8a987058..040e18bb 100644
--- a/KernelLand/Kernel/arch/x86/include/arch.h
+++ b/KernelLand/Kernel/arch/x86/include/arch.h
@@ -45,6 +45,7 @@ struct sShortSpinlock {
 	#if LOCK_DISABLE_INTS
 	 int	IF;	//!< Interrupt state on call to SHORTLOCK
 	#endif
+	void	*LockedBy;
 };
 
 // === MACROS ===
diff --git a/KernelLand/Kernel/arch/x86/lib.c b/KernelLand/Kernel/arch/x86/lib.c
index 1b1a0c3f..b732f75f 100644
--- a/KernelLand/Kernel/arch/x86/lib.c
+++ b/KernelLand/Kernel/arch/x86/lib.c
@@ -85,7 +85,11 @@ void SHORTLOCK(struct sShortSpinlock *Lock)
 	__ASM__ ("pushf;\n\tpop %0" : "=r"(IF));
 	IF &= 0x200;	// AND out all but the interrupt flag
 	
-	ASSERT( !CPU_HAS_LOCK(Lock) );
+	if( CPU_HAS_LOCK(Lock) )
+	{
+		Panic("Double lock of %p, %p req, %p has", Lock, __builtin_return_address(0), Lock->LockedBy);
+		for(;;);
+	}
 
 	#if TRACE_LOCKS
 	if( TRACE_LOCK_COND )
@@ -100,6 +104,7 @@ void SHORTLOCK(struct sShortSpinlock *Lock)
 	// Wait for another CPU to release
 	__AtomicTestSetLoop( (Uint*)&Lock->Lock, cpu );
 	Lock->IF = IF;
+	Lock->LockedBy = __builtin_return_address(0);
 	
 	#if TRACE_LOCKS
 	if( TRACE_LOCK_COND )