From nobody Thu Oct 30 04:23:53 2025 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 4cxrbG1cQ1z6Dk7f; Thu, 30 Oct 2025 04:23:54 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cxrbF6VZ7z3G5h; Thu, 30 Oct 2025 04:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798233; 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=wEYJovj+f26ibICmMXqGI8Dm7mMlGs3M37AyEiasoWM=; b=PmIpf39o8E93QMO+VyJdjgO7y15iPHWfb6xcw0w8f0SLowx9Xw4bz1uS8Z8knlrsYrTSc5 JyIDJ8kI3nbXp2/6fp9B3L2Dd4+wQAAuDiLMTuKHbJwRtIq+sb9NgfeJPE3O351GzlaHgs B16nNyuaFRaC2C/vbSxaa8cdl8mNrPfrYDTxSFvKLqwgflMdwqydCTWQVVyLHYZwtrloMJ vdufGbfZ2D+9x3OIbKF7e+eZE3Q5uwVd95C+IAvOFf/y+gdghXD5agDP5M2hfuU0z/kWjV P3W4C47lJ4Rh5iqjQ2BU0mcxPQa9nsBznGX1s5xHqiQS/RiMeiXmXNZyULe2iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761798233; 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=wEYJovj+f26ibICmMXqGI8Dm7mMlGs3M37AyEiasoWM=; b=j/DbMoNLeNgAEat3V+Hs9y20lNSHa/Ac/7OZbTtIfb/GKJPJhLys6HgWvNnZQkubzJ0mMU PAiBVdGj/LsXNn7XJK7Phgv0IbF6YWNQittF3BPIZ0LLim+sxseO/DbVhWiQ5/2XK3057G gyBLHS1FV6/82ej5vmC7GRYZqrbhr+N5m9zvbJhQLoRCpzxzL1fcg8dsXgqrh8ynZmeAFM qtGqs7bW24E7xlyH/DZNrT/ctbY6hWhEtS4RceKEo1m7+qYRAzw5FeoSlLhN1FYi+1kdhM Tnhip4YFWZoueHxIfg1921ehSovOPZgBjG+uqrb1CzuFFyHw10TsrCkCcb/rpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761798233; a=rsa-sha256; cv=none; b=mk1MDcbk/XaO9rXLBUKoRAwZhmOGbf+MdzHFF9QHu2LbDJvNaw0iAFWIiSFJfXf+VX90+4 qJHIiVTTzLojeqnIHjdHM0teg05dUSUimilJBNCpTJav++lveO+CrybsC8RmOmTrWvmalg TwAu9TjdJkm32OqDu+0BZEo8SD/eB6dyO0t5WRaqR50Qzm8r7w2tldYMaLsn7HGhgqeMlH bXReHrNQuzFIWHDRLFG2BgsXokkFaRYdZ8DW5fnoejMKfHYtJF6PqJBKWeqsSAKqw3fsvF S0XSOr3opdgOX8eIkV7uq2T23+5ZepHMi5iZSz5CW8XknQSot8VpRb4JNJAxLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cxrbF64k6z16Nh; Thu, 30 Oct 2025 04:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59U4NrJg084752; Thu, 30 Oct 2025 04:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59U4NrWs084749; Thu, 30 Oct 2025 04:23:53 GMT (envelope-from git) Date: Thu, 30 Oct 2025 04:23:53 GMT Message-Id: <202510300423.59U4NrWs084749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: c37d95826ab5 - releng/15.0 - jail: fix a regression that creates zombies when removing dying jails List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: c37d95826ab5a9becb491396a6522f442680d25f Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c37d95826ab5a9becb491396a6522f442680d25f commit c37d95826ab5a9becb491396a6522f442680d25f Author: Jamie Gritton AuthorDate: 2025-10-20 16:49:14 +0000 Commit: Colin Percival CommitDate: 2025-10-30 04:23:18 +0000 jail: fix a regression that creates zombies when removing dying jails When adding jail descriptors, I split sys_jail remove in two, and didn't properly track jail held between them when a jail was dying. This fixes that as well as cleaning up the logic behind it. Approved by: re (cperciva) PR: 290217 Reported by: David 'equinox' Lamparter Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53200 (cherry picked from commit 78f70d4ff9dd4af2318b25023a7f55be7402ec60) (cherry picked from commit 2d3c6a06edc3919455d1152f4ffaa60697e2c4f2) --- sys/kern/kern_jail.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index a0a200caefc6..267b60ffb5bc 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2911,12 +2911,6 @@ prison_remove(struct prison *pr) { sx_assert(&allprison_lock, SA_XLOCKED); mtx_assert(&pr->pr_mtx, MA_OWNED); - if (!prison_isalive(pr)) { - /* Silently ignore already-dying prisons. */ - mtx_unlock(&pr->pr_mtx); - sx_xunlock(&allprison_lock); - return; - } prison_deref(pr, PD_KILL | PD_DEREF | PD_LOCKED | PD_LIST_XLOCKED); } @@ -3463,12 +3457,17 @@ prison_deref(struct prison *pr, int flags) /* Kill the prison and its descendents. */ KASSERT(pr != &prison0, ("prison_deref trying to kill prison0")); - if (!(flags & PD_DEREF)) { - prison_hold(pr); - flags |= PD_DEREF; + if (!prison_isalive(pr)) { + /* Silently ignore already-dying prisons. */ + flags &= ~PD_KILL; + } else { + if (!(flags & PD_DEREF)) { + prison_hold(pr); + flags |= PD_DEREF; + } + flags = prison_lock_xlock(pr, flags); + prison_deref_kill(pr, &freeprison); } - flags = prison_lock_xlock(pr, flags); - prison_deref_kill(pr, &freeprison); } if (flags & PD_DEUREF) { /* Drop a user reference. */