From nobody Wed Jun 29 17:36:32 2022 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 C9A02874B38; Wed, 29 Jun 2022 17:36:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LY7tS4cwQz4RnM; Wed, 29 Jun 2022 17:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656524192; 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=Yg1hIz7+Id/WcyrQn8P+SRJtssgyveTMx2P/xfm8JKA=; b=NpH3Oh6sMs9gn+nQmhAPKN1ttm3eb5fqVqBUp7HrqF4HFHh6MN/0LpmyNSZQEVI1r21vkb PTqhJBS9MEGWJ3wubH/YVgMr7zwH6dj32X/Ec8ogsVLgeEKaaFtsHc8NtIPz5Tmi6sbG0/ xuIsRjXnSBD10gWmKOsumAARVFyARj5nlc+diy0Rta0taNP8NRzZj2Auj4poFEl27t99ac 5V1qyCcf61bQnAHZjO+X1Z1CuGbFRhfJQcLrnl6tC6nj8EVIuE6WhzTgsJ2V18FWDf0RKH tC9kvwaqZPJRvEPfQSs5SBUnf7NzW91DWfrCH486JcJkXCQDp2IEP9Du8Ol6KQ== 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 7F14A161AC; Wed, 29 Jun 2022 17:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25THaWVa071651; Wed, 29 Jun 2022 17:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25THaWCG071650; Wed, 29 Jun 2022 17:36:32 GMT (envelope-from git) Date: Wed, 29 Jun 2022 17:36:32 GMT Message-Id: <202206291736.25THaWCG071650@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: a9f7455c38c1 - main - jail: add prison_cleanup() to release resources held by a dying jail 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a9f7455c38c19438d1061227b1fa11d40c5407a6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656524192; 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=Yg1hIz7+Id/WcyrQn8P+SRJtssgyveTMx2P/xfm8JKA=; b=u17NDDtOicCjjWIQ5nfdyLZprvRSMVYJEJfq7dtjGXtpUym8Uuizhwaqf++2T3TXaHy3qC yPZPkJwJsojFXzdsDsRSpyAHNHRHyKCWjMSt4pdo6PfHcJveHDxBtzq/oSdDr0Dk43ez8X Q8CuB/rUDNaV5FfLVamaPNv95InqM4jtJk0F/ZLGioZv3+VsiAj3U5+4uZTrljrjr8ixeh LF8vTWgREvfxY1sRnF99aBb4v5U01zUY1u8lHg8fTVlpuxMcfRZmJ/mx0hz6E7p85kwPKF luzI72gm/pkBZle6ZIZZgiwt41VA+bhlcW+tKxhmydFMEFaW+LJ8DLpgBMMoMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656524192; a=rsa-sha256; cv=none; b=CL5xfeKlvgDwJsTmbDsRXzVzR4iY8I8SJsHHHTx0CldFfGAF7qkpD+IzHRafo/C5WU500Q Eei+FeUz0aOits9V5FMs9q/PFMmcjUaMUdl+bRHFXix8JbLQ/Ufd4nHUy/8KSEGkDuHGQL QcDZV0jh9UjMq3YEjIaNRripVADiUI38clREf7IoC6TWcMDBlXMGvk4JTwYl6EX6TMmPvA /hOrGrw8oP+y717IjnpQ1UvGLkrqVpsfvCl6+VOuQWpQ3vt8ZJ9suZgpgA4EehSR4pjQVr lj0AB3rUabn6DDmpIEnROIx2HBttRV+xBLkuRhzNCPdb9l3vKLazJVtrYQlIaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=a9f7455c38c19438d1061227b1fa11d40c5407a6 commit a9f7455c38c19438d1061227b1fa11d40c5407a6 Author: Jamie Gritton AuthorDate: 2022-06-29 17:33:05 +0000 Commit: Jamie Gritton CommitDate: 2022-06-29 17:33:05 +0000 jail: add prison_cleanup() to release resources held by a dying jail Currently, when a jail starts dying, either by losing its last user reference or by being explicitly killed, osd_jail_call(...PR_METHOD_REMOVE...) is called. Encapsulate this into a function prison_cleanup() that can then do other cleanup. --- sys/kern/kern_jail.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 187768b59608..7ef0afabe49d 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -143,6 +143,7 @@ static void prison_complete(void *context, int pending); static void prison_deref(struct prison *pr, int flags); static void prison_deref_kill(struct prison *pr, struct prisonlist *freeprison); static int prison_lock_xlock(struct prison *pr, int flags); +static void prison_cleanup(struct prison *pr); static void prison_free_not_last(struct prison *pr); static void prison_proc_free_not_last(struct prison *pr); static void prison_set_allow_locked(struct prison *pr, unsigned flag, @@ -2994,8 +2995,7 @@ prison_deref(struct prison *pr, int flags) pr->pr_state = PRISON_STATE_DYING; mtx_unlock(&pr->pr_mtx); flags &= ~PD_LOCKED; - (void)osd_jail_call(pr, - PR_METHOD_REMOVE, NULL); + prison_cleanup(pr); } } } @@ -3150,7 +3150,7 @@ prison_deref_kill(struct prison *pr, struct prisonlist *freeprison) } if (!(cpr->pr_flags & PR_REMOVE)) continue; - (void)osd_jail_call(cpr, PR_METHOD_REMOVE, NULL); + prison_cleanup(cpr); mtx_lock(&cpr->pr_mtx); cpr->pr_flags &= ~PR_REMOVE; if (cpr->pr_flags & PR_PERSIST) { @@ -3186,7 +3186,7 @@ prison_deref_kill(struct prison *pr, struct prisonlist *freeprison) if (rpr != NULL) LIST_REMOVE(rpr, pr_sibling); - (void)osd_jail_call(pr, PR_METHOD_REMOVE, NULL); + prison_cleanup(pr); mtx_lock(&pr->pr_mtx); if (pr->pr_flags & PR_PERSIST) { pr->pr_flags &= ~PR_PERSIST; @@ -3232,6 +3232,18 @@ prison_lock_xlock(struct prison *pr, int flags) return flags; } +/* + * Release a prison's resources when it starts dying (when the last user + * reference is dropped, or when it is killed). + */ +static void +prison_cleanup(struct prison *pr) +{ + sx_assert(&allprison_lock, SA_XLOCKED); + mtx_assert(&pr->pr_mtx, MA_NOTOWNED); + (void)osd_jail_call(pr, PR_METHOD_REMOVE, NULL); +} + /* * Set or clear a permission bit in the pr_allow field, passing restrictions * (cleared permission) down to child jails.