From owner-svn-src-head@freebsd.org Tue Oct 27 18:11:11 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F230D456928; Tue, 27 Oct 2020 18:11:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CLKWz60gSz3yMb; Tue, 27 Oct 2020 18:11:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B135CF92E; Tue, 27 Oct 2020 18:11:11 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09RIBBCm039126; Tue, 27 Oct 2020 18:11:11 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09RIBBqZ039125; Tue, 27 Oct 2020 18:11:11 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202010271811.09RIBBqZ039125@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 27 Oct 2020 18:11:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367088 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 367088 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Oct 2020 18:11:12 -0000 Author: mjg Date: Tue Oct 27 18:11:11 2020 New Revision: 367088 URL: https://svnweb.freebsd.org/changeset/base/367088 Log: refcount: make it atomic-clean While here consistently use 'old' in all places. Tested by: pho Modified: head/sys/sys/refcount.h Modified: head/sys/sys/refcount.h ============================================================================== --- head/sys/sys/refcount.h Tue Oct 27 18:08:33 2020 (r367087) +++ head/sys/sys/refcount.h Tue Oct 27 18:11:11 2020 (r367088) @@ -63,7 +63,7 @@ refcount_init(volatile u_int *count, u_int value) { KASSERT(!REFCOUNT_SATURATED(value), ("invalid initial refcount value %u", value)); - *count = value; + atomic_store_int(count, value); } static __inline u_int @@ -95,13 +95,14 @@ refcount_acquiren(volatile u_int *count, u_int n) static __inline __result_use_check bool refcount_acquire_checked(volatile u_int *count) { - u_int lcount; + u_int old; - for (lcount = *count;;) { - if (__predict_false(REFCOUNT_SATURATED(lcount + 1))) + old = atomic_load_int(count); + for (;;) { + if (__predict_false(REFCOUNT_SATURATED(old + 1))) return (false); - if (__predict_true(atomic_fcmpset_int(count, &lcount, - lcount + 1) == 1)) + if (__predict_true(atomic_fcmpset_int(count, &old, + old + 1) == 1)) return (true); } } @@ -115,7 +116,7 @@ refcount_acquire_if_gt(volatile u_int *count, u_int n) { u_int old; - old = *count; + old = atomic_load_int(count); for (;;) { if (old <= n) return (false); @@ -174,7 +175,7 @@ refcount_release_if_gt(volatile u_int *count, u_int n) KASSERT(n > 0, ("refcount_release_if_gt: Use refcount_release for final ref")); - old = *count; + old = atomic_load_int(count); for (;;) { if (old <= n) return (false);