From nobody Mon Oct 26 19:46:49 2026 X-Original-To: dev-commits-src-branches@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 4jD3zY61Wxz6xWMs for ; Mon, 26 Oct 2026 19:46:49 +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 4jD3zY2ptcz4qcx for ; Mon, 26 Oct 2026 19:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044009; 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=frGK8hV9LEerP0bvVWWe0aYQ20pH44qef/NjK3dyZVk=; b=wpNAptb4qkZsGkV9AjxQhMDqTCicZmC+5ii8lRXkdf8iyV43M+PK6UCNewA3JEHTKavFiw b5UpXsl3y0FwcW5wvVZ5QMTyB3WlQqsER6ioJvsXlFsiIgbuwdYnYlF21No/x8ybVBMpsp 11VPObe3JASKbTfepIx2dUATogLpNoJ8cTlBG1OLzDPyINV+oBrvW/veNHbywXIFbhV0El dhmgEfJYJ7reVtYu70xLa63mbzLmC8Jg1l1aWlZUub7XSSwKFBlgk9/mO/ic5uQJ6YbpXt uid5BFmTfpkoCXNQfxmLNGA8yP6z+bU/MC6DMeM6YqcDfwSa9ThLbHkY1F9A2A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793044009; b=PAAaUhb2IxyO7hbkl5hPsv1a49ewnH+x93V+YL1HKnviWRAan+KzwpquuEHQKeWP5xNey6 dPevdriTio0DgDr4qULTJFxRGJuQAhnqpB+kpitlmBzUpIS5IzKWVvmcMC76zFjjgCZWFO nvHjyWqdkZz1wz0bEXqT9B3eU0XFRGpSXBj2IbZJt86p0Bugcs9CG09BJqAG95j6PKwt5y SP8G85q66IisF1EX0d5dktbhf8d5RtH5hmR65mYb8fY1tXY0f2FjqV0PcU9P5OLYVpkST4 ofu7JUpUtBWSRyuz8Fxdgo3egTmX52UE0b11+BDjqW29Rsh6+7pKAOdA4hDh4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044009; 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=frGK8hV9LEerP0bvVWWe0aYQ20pH44qef/NjK3dyZVk=; b=u/GhDlxLN/a9oD25hAWbqFAPISX2Ou2Ql2wDXVJTjVBMn6wQ9IPiiQbhn80tiX46Ne83Ra 71T2nDpeZy8IWt+jgOqbHGaTBHTpi0126abvB0oWy6Mxmb+8evbj/u5WSFtc2EXS5xHosO juNOGMMRW4+68Si5S7Ep6F3fDDBEBkW4K3GZxQ2yKdNQ0MmLfu6lAr23bnPFqQc4+5I0sm fG9KGoa8L0D2I8hE5ioZ5BufuEDuMllUoJxaK33W8c1WpsINuAPRJWtHfIk+wkWYQ00siZ rsovOCDSBSyJU1WU0wcoUjx3duq/eKVEYqJdqW/0e3J7LOEIBRy5r6zQJhXLLg== 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 4jD3zY2K5Xzntm for ; Mon, 26 Oct 2026 19:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 382e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Oct 2026 19:46:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7fc0292c9fee - stable/14 - jail: Simplify refcount manipulation routines List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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/14 X-Git-Reftype: branch X-Git-Commit: 7fc0292c9fee31dee10f7b50499d97794ed245af Auto-Submitted: auto-generated Date: Mon, 26 Oct 2026 19:46:49 +0000 Message-Id: <6adfae29.382e6.61fabdff@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7fc0292c9fee31dee10f7b50499d97794ed245af commit 7fc0292c9fee31dee10f7b50499d97794ed245af Author: Mark Johnston AuthorDate: 2026-09-25 15:16:12 +0000 Commit: Mark Johnston CommitDate: 2026-10-26 14:12:15 +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 5063410e63b1..5e2992527cf2 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2936,14 +2936,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)); } /* @@ -2982,19 +2979,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 } /* @@ -3009,14 +2999,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)); } /* @@ -3033,8 +3020,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,