Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 29 Oct 2018 14:06:20 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r339860 - stable/12/sys/sys
Message-ID:  <201810291406.w9TE6K6N026280@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: hselasky
Date: Mon Oct 29 14:06:20 2018
New Revision: 339860
URL: https://svnweb.freebsd.org/changeset/base/339860

Log:
  MFC r339600:
  Make sure returned value is checked and assert a valid refcount.
  While at it fix a print: Unsigned types cannot be negative.
  
  Reviewed by:		kib, mjg
  Approved by:		re (gjb)
  Differential revision:	https://reviews.freebsd.org/D17616
  Sponsored by:		Mellanox Technologies

Modified:
  stable/12/sys/sys/refcount.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/sys/refcount.h
==============================================================================
--- stable/12/sys/sys/refcount.h	Mon Oct 29 13:17:41 2018	(r339859)
+++ stable/12/sys/sys/refcount.h	Mon Oct 29 14:06:20 2018	(r339860)
@@ -62,7 +62,7 @@ refcount_release(volatile u_int *count)
 
 	atomic_thread_fence_rel();
 	old = atomic_fetchadd_int(count, -1);
-	KASSERT(old > 0, ("negative refcount %p", count));
+	KASSERT(old > 0, ("refcount %p is zero", count));
 	if (old > 1)
 		return (0);
 
@@ -77,15 +77,19 @@ refcount_release(volatile u_int *count)
 }
 
 /*
+ * This functions returns non-zero if the refcount was
+ * incremented. Else zero is returned.
+ *
  * A temporary hack until refcount_* APIs are sorted out.
  */
-static __inline int
+static __inline __result_use_check int
 refcount_acquire_if_not_zero(volatile u_int *count)
 {
 	u_int old;
 
 	old = *count;
 	for (;;) {
+		KASSERT(old < UINT_MAX, ("refcount %p overflowed", count));
 		if (old == 0)
 			return (0);
 		if (atomic_fcmpset_int(count, &old, old + 1))
@@ -93,13 +97,14 @@ refcount_acquire_if_not_zero(volatile u_int *count)
 	}
 }
 
-static __inline int
+static __inline __result_use_check int
 refcount_release_if_not_last(volatile u_int *count)
 {
 	u_int old;
 
 	old = *count;
 	for (;;) {
+		KASSERT(old > 0, ("refcount %p is zero", count));
 		if (old == 1)
 			return (0);
 		if (atomic_fcmpset_int(count, &old, old - 1))

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810291406.w9TE6K6N026280>