From nobody Thu Oct 22 17:31:46 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4j9Y9b0hc7z6xP1n for ; Thu, 22 Oct 2026 17:31:47 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j9Y9Z5rVkz3GZc for ; Thu, 22 Oct 2026 17:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCV7OZZ6WU5DRNQOYbRB99rT2mokjY+e3oXiMPVYnkg=; b=l4FIr11il41o7T0ZPsgrHSqm1i/g4FJ+fkJhWKe+rmLyP/s9+5Dgei3jSv5vwpZL3A4cNS H0+4BomfYRCY3C6HXtMr9t75hFkt0KMY9/t/EYee0rU52OaO1EPEGNDOZFuwwtGGHqs4Hg yUfg0frceUtyx78xeuldCR8gtLinOeuYQDCpiR+9rsSJiwRv7/ik5hrSWRjGkpypwHBMF9 kALPQJK0uZ3kWmDlaViwruzVRu11prZXYyu9PSlSU4kR22+xRCgfUbMKLVGNgDroYUf2Oo tCyH4lNQQ2oaGzfjuwBRozMhyS+IANCFhVlltgJJoszKxSwwV6c5g/0KgtRsvg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690306; b=FOHgz/wWqJFHFGzpVcRoBsf/uOIwOBXvhX40tbjGDmytZnpfwmegdRTB9QRjlsdszI+8Kh hDzi4/grEI1EBj0jeGoLSuEj9/RG02DfZjpTYJKagi27vYkavXK0o7pODfRfdk10tAh2Ui ZblvaaKSiz5bEPTerRGo57EjCMXYVvS7+H1Twm6tj+PsLolJpm473C6xcvhz6sTt8nYyHX IFhtps9OfAD7S9/dL/QefpjAzoNVEIZBrQx3WHhErlpD0WOPo9VTSwC846qW4vTxYRLIuP Gun6hVV8jdcrpxNmm2LlyzGOlDeu1oEmJunmjf28QCOY9wFgGUlXdoVwQ4MZjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCV7OZZ6WU5DRNQOYbRB99rT2mokjY+e3oXiMPVYnkg=; b=oZOiFr3Xc1NEQWpCIH+zQuLWsDY4TqZSa6Av3Me/N7YCUbKTW/wIGu69ArL/ct1bCqa/02 /d6Vq9cgleikAF+8MIr9XteHrbH3royzs23zxrtnHUpCIxUQJAHM049w1nhgHLt9xpObvI k3qIh1zBYGhEvNLVLWKAjA6/jQxw5f8Sa62PMfF4UUgaRGiog7+5ucf8kDjkx8xiFd18l4 HbvsDg19/T16jqYEEH9HSY4bBItiKbvkHZkfg6fwwDwisKZ0bac90ggXVU8QWNP0wx74cd YVsgxJZdsy33uwy2WS3xqUYEoiq1XrdLqyToEtgGOsifWdZh+1tm5XoB4bCWjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j9Y9Z5PfxzsHx for ; Thu, 22 Oct 2026 17:31:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dd55 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:31:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: db6a902078b4 - stable/15 - jail: Simplify refcount manipulation routines List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: db6a902078b4fa50d900cbdff028581920c4ac7c Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:31:46 +0000 Message-Id: <6ada4882.3dd55.453b9970@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=db6a902078b4fa50d900cbdff028581920c4ac7c commit db6a902078b4fa50d900cbdff028581920c4ac7c Author: Mark Johnston AuthorDate: 2026-09-25 15:16:12 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:40 +0000 jail: Simplify refcount manipulation routines - refcount_acquire() returns the old value, use that to assert that the old value was non-zero. - refcount_release() already asserts that the refcount value is non-zero, so don't bother asserting that again in the jail code. - Use __diagused instead of having separate implementations for INVARIANTS and !INVARIANTS. No functional change intended. Reviewed by: jamie MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59983 (cherry picked from commit de6ee1fde8bbcc3dde643ae9f2122c8e2499fe29) --- sys/kern/kern_jail.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index c2cb111882fc..5629f529b1dd 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3294,14 +3294,11 @@ prison_hold_locked(struct prison *pr) void prison_hold(struct prison *pr) { -#ifdef INVARIANTS - int was_valid = refcount_acquire_if_not_zero(&pr->pr_ref); + u_int old __diagused; - KASSERT(was_valid, - ("Trying to hold dead prison %p (jid=%d).", pr, pr->pr_id)); -#else - refcount_acquire(&pr->pr_ref); -#endif + old = refcount_acquire(&pr->pr_ref); + KASSERT(old > 0, + ("cannot hold a non-alive prison (jid=%d)", pr->pr_id)); } /* @@ -3340,19 +3337,12 @@ prison_free(struct prison *pr) static void prison_free_not_last(struct prison *pr) { -#ifdef INVARIANTS - int lastref; + bool released __diagused; - KASSERT(refcount_load(&pr->pr_ref) > 0, - ("Trying to free dead prison %p (jid=%d).", - pr, pr->pr_id)); - lastref = refcount_release(&pr->pr_ref); - KASSERT(!lastref, + released = refcount_release(&pr->pr_ref); + KASSERT(!released, ("prison_free_not_last freed last ref on prison %p (jid=%d).", pr, pr->pr_id)); -#else - refcount_release(&pr->pr_ref); -#endif } /* @@ -3367,14 +3357,11 @@ prison_free_not_last(struct prison *pr) void prison_proc_hold(struct prison *pr) { -#ifdef INVARIANTS - int was_alive = refcount_acquire_if_not_zero(&pr->pr_uref); + u_int old __diagused; - KASSERT(was_alive, - ("Cannot add a process to a non-alive prison (jid=%d)", pr->pr_id)); -#else - refcount_acquire(&pr->pr_uref); -#endif + old = refcount_acquire(&pr->pr_uref); + KASSERT(old > 0, + ("cannot add a process to a non-alive prison (jid=%d)", pr->pr_id)); } /* @@ -3391,8 +3378,6 @@ prison_proc_free(struct prison *pr) * This allows assurance that a locked prison will remain alive * until it is unlocked. */ - KASSERT(refcount_load(&pr->pr_uref) > 0, - ("Trying to kill a process in a dead prison (jid=%d)", pr->pr_id)); if (!refcount_release_if_not_last(&pr->pr_uref)) { /* * Don't remove the last user reference in this context,