Merge branch 'rickard/rwmutex-bug/OTP-8925' into dev

* rickard/rwmutex-bug/OTP-8925:
  Use correct argument types on rwlock_wake_set_flags()

2 files changed, 43 insertions, 1 deletions

diff --git a/erts/include/internal/ethr_mutex.h b/erts/include/internal/ethr_mutex.h
index 636fdc1e2f..01855864e3 100644
--- a/erts/include/internal/ethr_mutex.h
+++ b/erts/include/internal/ethr_mutex.h
@@ -95,6 +95,19 @@
 
 #define ETHR_CND_WAIT_FLG__		ETHR_RWMTX_R_WAIT_FLG__
 
+#ifdef ETHR_DEBUG
+#define ETHR_DBG_CHK_UNUSED_FLG_BITS(V)			\
+  ETHR_ASSERT(!((V) & ~(ETHR_RWMTX_W_FLG__		\
+			| ETHR_RWMTX_W_WAIT_FLG__	\
+			| ETHR_RWMTX_R_WAIT_FLG__	\
+			| ETHR_RWMTX_RS_MASK__)))
+#else
+#define ETHR_DBG_CHK_UNUSED_FLG_BITS(V)
+#endif
+
+#define ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(MTX)		\
+  ETHR_DBG_CHK_UNUSED_FLG_BITS(ethr_atomic_read(&(MTX)->mtxb.flgs))
+
 struct ethr_mutex_base_ {
 #ifdef ETHR_MTX_HARD_DEBUG_FENCE
     long pre_fence;
@@ -497,6 +510,7 @@ ETHR_INLINE_FUNC_NAME_(ethr_mutex_trylock)(ethr_mutex *mtx)
     long act;
     int res;
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
 
     act = ethr_atomic_cmpxchg_acqb(&mtx->mtxb.flgs, ETHR_RWMTX_W_FLG__, 0);
     res = (act == 0) ? 0 : EBUSY;
@@ -508,6 +522,7 @@ ETHR_INLINE_FUNC_NAME_(ethr_mutex_trylock)(ethr_mutex *mtx)
 
     ETHR_MTX_HARD_DEBUG_LFS_TRYRWLOCK(&mtx->mtxb, res);
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
 
     ETHR_COMPILER_BARRIER;
     return res;
@@ -518,6 +533,7 @@ ETHR_INLINE_FUNC_NAME_(ethr_mutex_lock)(ethr_mutex *mtx)
 {
     long act;
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
 
     act = ethr_atomic_cmpxchg_acqb(&mtx->mtxb.flgs, ETHR_RWMTX_W_FLG__, 0);
     if (act != 0)
@@ -527,6 +543,7 @@ ETHR_INLINE_FUNC_NAME_(ethr_mutex_lock)(ethr_mutex *mtx)
 
     ETHR_MTX_HARD_DEBUG_LFS_RWLOCK(&mtx->mtxb);
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
 
     ETHR_COMPILER_BARRIER;
 }
@@ -538,6 +555,7 @@ ETHR_INLINE_FUNC_NAME_(ethr_mutex_unlock)(ethr_mutex *mtx)
     ETHR_COMPILER_BARRIER;
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
     ETHR_MTX_HARD_DEBUG_LFS_RWUNLOCK(&mtx->mtxb);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
 
     ETHR_MTX_CHK_EXCL_UNSET_EXCL(&mtx->mtxb);
 
@@ -546,6 +564,7 @@ ETHR_INLINE_FUNC_NAME_(ethr_mutex_unlock)(ethr_mutex *mtx)
 	ethr_mutex_unlock_wake__(mtx, act);
 
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(mtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(mtx);
 }
 
 #endif /* ETHR_TRY_INLINE_FUNCS */
diff --git a/erts/lib_src/common/ethr_mutex.c b/erts/lib_src/common/ethr_mutex.c
index c5738c3d77..95fedc0ba2 100644
--- a/erts/lib_src/common/ethr_mutex.c
+++ b/erts/lib_src/common/ethr_mutex.c
@@ -270,6 +270,8 @@ rwmutex_freqread_rdrs_inc(ethr_rwmutex *rwmtx, ethr_ts_event *tse)
     }
 }
 
+#if 0 /* Not used */
+
 static ETHR_INLINE void
 rwmutex_freqread_rdrs_dec(ethr_rwmutex *rwmtx, ethr_ts_event *tse)
 {
@@ -289,6 +291,8 @@ rwmutex_freqread_rdrs_dec(ethr_rwmutex *rwmtx, ethr_ts_event *tse)
     }
 }
 
+#endif
+
 static ETHR_INLINE long
 rwmutex_freqread_rdrs_dec_read(ethr_rwmutex *rwmtx, ethr_ts_event *tse)
 {
@@ -1908,7 +1912,7 @@ rwmutex_freqread_rwlock_wait(ethr_rwmutex *rwmtx, long initial)
 }
 
 static ETHR_INLINE void
-rwlock_wake_set_flags(ethr_rwmutex *rwmtx, long new_initial, int act_initial)
+rwlock_wake_set_flags(ethr_rwmutex *rwmtx, long new_initial, long act_initial)
 {
     long act, act_mask;
     int chk_abrt_flg;
@@ -2315,6 +2319,7 @@ ethr_rwmutex_destroy(ethr_rwmutex *rwmtx)
 	return EINVAL;
     }
 #endif
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
     if (rwmtx->type != ETHR_RWMUTEX_TYPE_NORMAL) {
 	long act = ethr_atomic_read(&rwmtx->mtxb.flgs);
 	if (act == ETHR_RWMTX_R_FLG__)
@@ -2345,6 +2350,8 @@ ethr_rwmutex_tryrlock(ethr_rwmutex *rwmtx)
 
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
 
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
     switch (rwmtx->type) {
     case ETHR_RWMUTEX_TYPE_NORMAL: {
 #ifdef ETHR_RLOCK_WITH_INC_DEC
@@ -2399,6 +2406,7 @@ ethr_rwmutex_tryrlock(ethr_rwmutex *rwmtx)
     ETHR_MTX_HARD_DEBUG_LFS_TRYRLOCK(&rwmtx->mtxb, res);
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
 
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
     return res;
 }
 
@@ -2413,6 +2421,8 @@ ethr_rwmutex_rlock(ethr_rwmutex *rwmtx)
 
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
 
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
     switch (rwmtx->type) {
     case ETHR_RWMUTEX_TYPE_NORMAL: {
 #ifdef ETHR_RLOCK_WITH_INC_DEC
@@ -2446,6 +2456,7 @@ ethr_rwmutex_rlock(ethr_rwmutex *rwmtx)
     }
     }
 
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
     ETHR_MTX_CHK_EXCL_SET_NON_EXCL(&rwmtx->mtxb);
     ETHR_MTX_CHK_EXCL_IS_NOT_EXCL(&rwmtx->mtxb);
     ETHR_MTX_HARD_DEBUG_LFS_RLOCK(&rwmtx->mtxb);
@@ -2466,6 +2477,8 @@ ethr_rwmutex_runlock(ethr_rwmutex *rwmtx)
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
     ETHR_MTX_HARD_DEBUG_LFS_RUNLOCK(&rwmtx->mtxb);
 
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
     switch (rwmtx->type) {
     case ETHR_RWMUTEX_TYPE_NORMAL:
 	act = ethr_atomic_dec_read_relb(&rwmtx->mtxb.flgs);
@@ -2497,6 +2510,7 @@ ethr_rwmutex_runlock(ethr_rwmutex *rwmtx)
     }
     }
 
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
 }
 
@@ -2512,6 +2526,8 @@ ethr_rwmutex_tryrwlock(ethr_rwmutex *rwmtx)
 
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
 
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
     switch (rwmtx->type) {
     case ETHR_RWMUTEX_TYPE_NORMAL:
 	act = ethr_atomic_cmpxchg_acqb(&rwmtx->mtxb.flgs,
@@ -2553,6 +2569,7 @@ ethr_rwmutex_tryrwlock(ethr_rwmutex *rwmtx)
     }
 #endif
 
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
     ETHR_MTX_HARD_DEBUG_LFS_TRYRWLOCK(&rwmtx->mtxb, res);
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
 
@@ -2569,6 +2586,8 @@ ethr_rwmutex_rwlock(ethr_rwmutex *rwmtx)
 
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
 
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
     switch (rwmtx->type) {
     case ETHR_RWMUTEX_TYPE_NORMAL:
 	act = ethr_atomic_cmpxchg_acqb(&rwmtx->mtxb.flgs,
@@ -2601,6 +2620,7 @@ ethr_rwmutex_rwlock(ethr_rwmutex *rwmtx)
     ETHR_MTX_CHK_EXCL_IS_NOT_NON_EXCL(&rwmtx->mtxb);
     ETHR_MTX_HARD_DEBUG_LFS_RWLOCK(&rwmtx->mtxb);
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
 
 }
 
@@ -2618,6 +2638,8 @@ ethr_rwmutex_rwunlock(ethr_rwmutex *rwmtx)
     ETHR_MTX_CHK_EXCL_IS_NOT_NON_EXCL(&rwmtx->mtxb);
     ETHR_MTX_CHK_EXCL_UNSET_EXCL(&rwmtx->mtxb);
 
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
+
     switch (rwmtx->type) {
     case ETHR_RWMUTEX_TYPE_NORMAL:
 	act = ethr_atomic_cmpxchg_relb(&rwmtx->mtxb.flgs,
@@ -2636,6 +2658,7 @@ ethr_rwmutex_rwunlock(ethr_rwmutex *rwmtx)
     }
 
     ETHR_MTX_HARD_DEBUG_FENCE_CHK(rwmtx);
+    ETHR_MTX_DBG_CHK_UNUSED_FLG_BITS(rwmtx);
 }
 
 #else