From nobody Mon Oct 20 16:54:28 2025 X-Original-To: dev-commits-src-main@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 4cr1jw4wlKz6Cl5d; Mon, 20 Oct 2025 16:54:28 +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 4cr1jw4DGqz3h42; Mon, 20 Oct 2025 16:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760979268; 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=dTJLarUbh8XQcEWUjQzQM2hNuGEE67g4cCopSOZlqLM=; b=xHXiRNm3EkFjcksNiJOXswxbLKv2PYw+3KFkJG0baKzh3wEThTRcpz0c8/+QcPRY9BBawj tl6E9J3O7dFCoNIHqZQriv7Lfj0Y2M5cEeK0k3Q/bEkh0ukgE2UZxMfOjL4/o/I+7378B1 Ll1GR8OEy803pfDZz2z4o+GSgPNm12Yp6dH6bc9/BXYCPZRWaUVoQiyBAOaTKt6a3Nckn6 KjUfUU8SmwAeubXm+NMv6oTuGBXwWjcUtcq/MxnRBbTtyYWTa61RWYFIQz27pWRccTVjsz QzKmTvxVsk2eJlwqNL7VP4JVhFzWQ4Re3471UwKjp5JNhjjZzN4spWJpzU7aYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760979268; 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=dTJLarUbh8XQcEWUjQzQM2hNuGEE67g4cCopSOZlqLM=; b=bNgWVayXs15fU5E3u9gqoyXHOeLHXndCPj7xumeZyqjrI9haMOsi7sJ4cXhfzB1uSoHk0j +NIlEmfrMVC9c99GjAVfACrF9y+PLvje/qRECkkzL6m+VTwUTTYvgYyocVYyY7UcvoDDz9 CC8p1rxSU3DfKUPnjvH72E2qQPs/b3HoTDlDa44tSzi5PJ9ZpNXeWJEe4bsNHK5TbNZo2+ X1oCkPlHxUM07jwff3ZshStVsQaO9oid6NOBQH6U6FLFEduePCj8s36ihvgBBqccJfWWcb V/mOSyjJEmIqDErTUpT+UElB9L81FKm0sZIVGDWJOV5usaRiFKGo8D9B+5ZtRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760979268; a=rsa-sha256; cv=none; b=LGUhl2ZaTyYTG1IKOHeo9gxyFdVmoMRhxAD4z9A0/YputKSomXDI6ar2rRrQNfjdMpM5nk Txqz5d10dRpXuVaYF1jNMv78RnjOLZV/lEIpv1Uj0hyD8JDPM+dPN5I24UXgxmqR6cHk82 jgmdOZ5nnLX1/DHS3tAw0q8fsQt62WNGDxo2POdEC7GyYy3Mi4V+JIZHLmXW+WH0sJ4DGU oD/gVEIaj2dc2g87Q7CH3mkORQ4EHBLiPtt6xtRDThGpG6F6HsIILjJJrybH642tiDhDNs KXa5BKKdIv7hzU658KkvOBCWtM0rOAMwbdAz+IRd7N1/EW3oTa+TBegUHWXScQ== 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 4cr1jw3mBmz5n6; Mon, 20 Oct 2025 16:54:28 +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 59KGsS6O017502; Mon, 20 Oct 2025 16:54:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KGsS4p017499; Mon, 20 Oct 2025 16:54:28 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:54:28 GMT Message-Id: <202510201654.59KGsS4p017499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: 78f70d4ff9dd - main - jail: fix a regression that creates zombies when removing dying jails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78f70d4ff9dd4af2318b25023a7f55be7402ec60 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=78f70d4ff9dd4af2318b25023a7f55be7402ec60 commit 78f70d4ff9dd4af2318b25023a7f55be7402ec60 Author: Jamie Gritton AuthorDate: 2025-10-20 16:49:14 +0000 Commit: Jamie Gritton CommitDate: 2025-10-20 16:49:14 +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. PR: 290217 Reported by: David 'equinox' Lamparter Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D53200 --- 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 3697d95fe0e5..00732d55cd46 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -2909,12 +2909,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); } @@ -3461,12 +3455,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. */