From nobody Fri Sep 25 17:00:44 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 4hrxmD3hR6z6tfZ2 for ; Fri, 25 Sep 2026 17:00:44 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hrxmD2Vvgz4VQ0 for ; Fri, 25 Sep 2026 17:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790355644; 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=8Z+4P8aOjYsuhD/vGI6hl7k7Or/eBOQ5ql7yU4y6dIU=; b=W3vn8wocw1klEnH92fMGANv60cO26sCgWDY47PKkw9+DtTv+sXqMPH5faTabIk+MokRfjx wmStRI1jYCKn+QfViwQO2jRlIT3b2ugZxT6Zn1y1fYc9iqqkQYy4Q0QptmVob6fkYstKjl NjFriV/cwUGT/FtUMxPhGCOx6w8MQrYFpqlPfOJcvFsOwUA5Wp/KCSFmyyhfv81scGaG5o ancamqGk5muV/IxZYgthsEHCc+ziKDmw/2ge02qCk9avmVqeaPJYEpjV4SRn+OT5XPi3ok uMAcZpmMDg9DbyRYkCK4o7Vk0wZUOgBN+Rf7y9RAk4SKGXEir+P7ze6Il3il8A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790355644; b=uIg52VDwGBE+ujCDx57koVg62WBHrkvkLRQpcL2/OxabyYGoaUbCGg65DluaSAaE2S36qC sM/md3uAdQJqLZZ+D8A7yRsPnwduNSK21pIHPE4BygUEYQYOPEFv80W1Voiyd19yeE7ybW KrmVbjlnISQAF7OkOh0W/t6jvwrcDZQI2UDFg0fO2Lr/daZcYGtYHeducu6yVzhLAZP7F3 kcklh+mGDjyGli3E9fMXtIzQgpAD+tbtrpsnSvjiAWIC+usYC1e+Df5UJQY9L0N8712S4h 9CFwxqxgAYYePeF0kNWcfhz7GY1F3YMB7kQ4/BU180FG/Nsmn35cca45lASICQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790355644; 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=8Z+4P8aOjYsuhD/vGI6hl7k7Or/eBOQ5ql7yU4y6dIU=; b=wOLh55gAo3+c/zquwzJP6nbY5TgcWr2EKopG8NQKJV5WHjlKy05MCJ8xRp9Uwq4rxU3uKe bWgO+SVcP/WM5FMp2NOLSE+5K4jLo6uTc33SRkESJdnoOyMq93Ay+IicXJr+a16077oXOA dZH1KZ5bI1XNYPK0r5xpJ9HPpry9hZQTYQC+jUU3BA53R+MaN9fYDszc8Sr09LCQ0DsGJv yeu8L/I6sUYTTBfE38sECNrrl6hxYsHzO/+mgAqEla/1r62yK2EHo17mj4PN/bwDAGxyis TT4rGH+8ekmoplDMY6UVVfgR/u+4omlVtTWsTxCboRbC0+gFs9T5wtPppjp08w== 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 4hrxmD0TxpzJSJ for ; Fri, 25 Sep 2026 17:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bbd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 25 Sep 2026 17:00:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: de6ee1fde8bb - main - jail: Simplify refcount manipulation routines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: de6ee1fde8bbcc3dde643ae9f2122c8e2499fe29 Auto-Submitted: auto-generated Date: Fri, 25 Sep 2026 17:00:44 +0000 Message-Id: <6ab6a8bc.1bbd6.6c1c3866@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=de6ee1fde8bbcc3dde643ae9f2122c8e2499fe29 commit de6ee1fde8bbcc3dde643ae9f2122c8e2499fe29 Author: Mark Johnston AuthorDate: 2026-09-25 15:16:12 +0000 Commit: Mark Johnston CommitDate: 2026-09-25 16:50:41 +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 --- 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 69cb003b9fda..31b7c4a1e4f6 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3432,14 +3432,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)); } /* @@ -3478,19 +3475,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 } /* @@ -3505,14 +3495,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)); } /* @@ -3529,8 +3516,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,