11002 recursive mutex detection in libfakekernel

Reviewed by: Matt Barden <matt.barden@nexenta.com> Reviewed by: Evan Layton <evan.layton@nexenta.com> Approved by: Garrett D'Amore <garrett@damore.org>
illumos · Jun 6, 2019 · a24b1e6 · a24b1e6
1 parent 5831d79
commit a24b1e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/usr/src/lib/libfakekernel/common/mapfile-vers b/usr/src/lib/libfakekernel/common/mapfile-vers
@@ -121,9 +121,9 @@ SYMBOL_VERSION SUNWprivate_1.1 {
 	kmem_zalloc;
 
 	kmutex_destroy;
-	kmutex_init;
 	kmutex_enter;
 	kmutex_exit;
+	kmutex_init;
 
 	ksema_destroy;
 	ksema_init;

diff --git a/usr/src/lib/libfakekernel/common/mutex.c b/usr/src/lib/libfakekernel/common/mutex.c
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2018 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2017 RackTop Systems.
  */
 
@@ -31,8 +31,9 @@ int	_lwp_mutex_trylock(lwp_mutex_t *);
 
 extern clock_t ddi_get_lbolt(void);
 
+/* See: head/synch.h ERRORCHECKMUTEX */
 static const lwp_mutex_t default_mutex =
-	{{0, 0, 0, {USYNC_THREAD}, _MUTEX_MAGIC},
+	{{0, 0, 0, {USYNC_THREAD|LOCK_ERRORCHECK}, _MUTEX_MAGIC},
 	{{{0, 0, 0, 0, 0, 0, 0, 0}}}, 0};
 
 /* ARGSUSED */
@@ -53,8 +54,11 @@ kmutex_destroy(kmutex_t *mp)
 void
 kmutex_enter(kmutex_t *mp)
 {
+	kthread_t *t = _curthread();
+
+	VERIFY(mp->m_owner != t);
 	VERIFY(0 == _lwp_mutex_lock(&mp->m_lock));
-	mp->m_owner = _curthread();
+	mp->m_owner = t;
 }
 
 int