From owner-dev-commits-src-branches@freebsd.org Mon Jul 5 12:48:56 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 A23B365C833; Mon, 5 Jul 2021 12:48:56 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GJQVJ4FXDz3Jsl; Mon, 5 Jul 2021 12:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7ACC22648C; Mon, 5 Jul 2021 12:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 165CmuGT012045; Mon, 5 Jul 2021 12:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 165CmuV7012044; Mon, 5 Jul 2021 12:48:56 GMT (envelope-from git) Date: Mon, 5 Jul 2021 12:48:56 GMT Message-Id: <202107051248.165CmuV7012044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 2f6dd4a29198 - stable/12 - refcount: add refcount_releasen MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2f6dd4a29198ab82ab013e15b4eb2fa6de25d5bf Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jul 2021 12:48:56 -0000 The branch stable/12 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2f6dd4a29198ab82ab013e15b4eb2fa6de25d5bf commit 2f6dd4a29198ab82ab013e15b4eb2fa6de25d5bf Author: Mateusz Guzik AuthorDate: 2021-07-05 12:45:32 +0000 Commit: Mateusz Guzik CommitDate: 2021-07-05 12:48:23 +0000 refcount: add refcount_releasen This is a direct commit as the routine in main was added as a side effect of functionality which later got reverted. --- sys/sys/refcount.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/sys/refcount.h b/sys/sys/refcount.h index 44edbdf953a0..19a8f38772a0 100644 --- a/sys/sys/refcount.h +++ b/sys/sys/refcount.h @@ -70,26 +70,33 @@ refcount_acquire_checked(volatile u_int *count) } static __inline bool -refcount_release(volatile u_int *count) +refcount_releasen(volatile u_int *count, u_int n) { u_int old; atomic_thread_fence_rel(); - old = atomic_fetchadd_int(count, -1); + old = atomic_fetchadd_int(count, -n); KASSERT(old > 0, ("refcount %p is zero", count)); - if (old > 1) + if (old > n) return (false); /* * Last reference. Signal the user to call the destructor. * - * Ensure that the destructor sees all updates. The fence_rel - * at the start of the function synchronized with this fence. + * Ensure that the destructor sees all updates. This synchronizes with + * release fences from all routines which drop the count. */ atomic_thread_fence_acq(); return (true); } +static __inline bool +refcount_release(volatile u_int *count) +{ + + return (refcount_releasen(count, 1)); +} + /* * This functions returns non-zero if the refcount was * incremented. Else zero is returned.