From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id CB5D85646; Fri, 21 Aug 2026 06:54:15 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 491ED5630; Fri, 21 Aug 2026 06:54:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yw1-x1131.google.com (mail-yw1-x1131.google.com [IPv6:2607:f8b0:4864:20::1131]) by atuin.qyliss.net (Postfix) with ESMTPS id C5FCF5626 for ; Fri, 21 Aug 2026 06:54:09 +0000 (UTC) Received: by mail-yw1-x1131.google.com with SMTP id 00721157ae682-81f3b227a4aso11869327b3.1 for ; Thu, 20 Aug 2026 23:54:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787295248; x=1787900048; darn=spectrum-os.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=iWUD3cLgBXdW7IR6oyKgMDlDsSvjOWrLQahEmy1OJ+I=; b=HYEzaLSOv9soIT/QBAEVIXwOS9Sye+8qXXMwi5KZanKlKBsgVG6Ehp5+GM24IVuz/Z SFSlivqtqAnWvcekljuycUmitGesG9c8Z5Vlp7W+w/nEr7JAsQ1LnSFj5Lvcu1Mr1dWr nAsj4maRGPWb1gwpBczAEHRjgZ8i3xOLuRvn6vs9/J5DZrP+VNXdShT2ycWwvnkKiG3C QZr65yxWp0dC3pzjnpoDpa4FkDgF03sWYrBto/1pcbjjMqAqx7hpwUwYQRmXrFxvoc0K Euc4xcuI0vXDc0hVlLGWJiYOc4TM9SaQgYXED83sdSdeJFmI7KvAu6f66WaZi8ZJhSNy YmIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787295248; x=1787900048; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=iWUD3cLgBXdW7IR6oyKgMDlDsSvjOWrLQahEmy1OJ+I=; b=OLcn6xlTcsck0JU7WmCudIhttjueUFPOEKP87usHRi5OaiKUB01S7klRVQ+TBW5zLm GxXJ6mrStL2D8H3Dq1nTz4/d/OrQi2YkjP6MwhDocMLui5R8lYdddotMbhkHH/D5iU2o eisMi6ACqWtj7mG4JSIqNKExY3/m3aQ3Px1V6OU5JGaEbFBl19h7gPKfs3mf71mijeca 6rmGPIbL1TyW1hqwIX2aMRez9ge6TEm4nsDUQYq6Z1N6qJ06fLb1pZUv9viLVSXm28M7 QhL+nMnmgjNX7+El8NgmSTnO6KMeweTiruCbbbwN0Co2BshhQvFB80rRXigR8SiW/qvs w/YA== X-Gm-Message-State: AFuF++nZOq1qDg8JE4i8M914akpurNeoDietIiWdjTPEHxrrXclT2wzg fm11oQHaT+7b39fN7d2DN+3ks9BBntFj3w8byCcOAet0PGyxLsnY6r5y+0vDuXIK X-Gm-Gg: AR+sD124QHPLRX583rSqDEdz6mdri6ssX8Zkr1YBc4mUwD5KG6lSdSAVfigrlRwuh9S NtLoytGQwBzFjBKhn6L8EYVMVK/Q2Fgi+pZoE6DbJDh+oxPuW1IMxoAp7V/6EeGawr8dAY/UnRO cIzNRqVM7OFSvDrWBZjsIcSONWv2lbFckZVlarvtq4du92xQYoUlv0HoeyLSmyPq29O69CJylfs eQFShsFUxSp1TDDIe7iasZHlae6dfh3vNsbVg7nHOP1Wk3mwFut6Y2T2PBGCTuOaQaRCkAlAInb pEM4cIOxtbj0zXO9TnVlmaUgpOHzuhb4VFOMMS+AAJft7cyKG4svV0tEqkplO7tzNqZKIW5QbL1 /4+y+by6/dFbc834GWEzRUCeHgDja4MC63pnrcBAzuKQpyk4hbiGa7unwjAC8Nqc6r4S84+K5zi ShoSbNbhPSwI65lmTaPEGjL3yiICvlfz35jS/7ZRQ5cBXt8YOeWgUHOuuB9RDW09C5uOj9cTIIm R78JdwBLb+K X-Received: by 2002:a05:690c:e15c:20b0:820:dd2:3c84 with SMTP id 00721157ae682-849f4c71f45mr13712217b3.22.1787295248327; Thu, 20 Aug 2026 23:54:08 -0700 (PDT) Received: from localhost.localdomain ([185.98.168.14]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-84519268f55sm36131357b3.44.2026.08.20.23.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2026 23:54:07 -0700 (PDT) From: Demi Marie Obenour Date: Fri, 21 Aug 2026 02:51:57 -0400 Subject: [PATCH v7 14/19] host/rootfs: run-flatpak: Purge the per-VM cgroup MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260821-cgroups-v7-14-7f1870dedefc@gmail.com> References: <20260821-cgroups-v7-0-7f1870dedefc@gmail.com> In-Reply-To: <20260821-cgroups-v7-0-7f1870dedefc@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787295104; l=997; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=zWwGP10Mj8TlhVZ57+4nY1Pi3zcuVKQj1zbxKkNFkN4=; b=qGx8CDz0YY5P2F0scudRNeaHsokPG7r3oYVTeiQHX1FGCViZOEC9DkYhpg6FiKn+uC1GBKkfz fs97OZ/0uu2DAkjkDOy/v+j7KfCXnqMwkmsJj+nH7zK0DZV5T1XT4qB X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: ISEUCPZIR4U2M56HHSMSUIJVLPAJR7PG X-Message-ID-Hash: ISEUCPZIR4U2M56HHSMSUIJVLPAJR7PG X-MailFrom: demiobenour@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; emergency CC: Demi Marie Obenour , Alyssa Ross X-Mailman-Version: 3.3.10 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Demi Marie Obenour Reviewed-by: Alyssa Ross --- host/rootfs/image/usr/bin/run-flatpak | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/host/rootfs/image/usr/bin/run-flatpak b/host/rootfs/image/usr/bin/run-flatpak index fafbc82ff6966d8be9c8083a17618f1fb192bd07..cdd13fb52d97751f92864d34a5221367df6d6f0d 100755 --- a/host/rootfs/image/usr/bin/run-flatpak +++ b/host/rootfs/image/usr/bin/run-flatpak @@ -87,9 +87,12 @@ if { fdclose 4 foreground { run-vmm $id } -} -if { s6-instance-delete -- /run/service/vm-services $id } + # Even if s6-instance-delete fails, cgroup-purge is enough + # to ensure that the VMM and all per-VM services are killed. + foreground { s6-instance-delete /run/service/vm-services $id } + cgroup-purge /vm-services.slice/vm-${id}.slice +} if { umount -R /run/vm/by-id/${id}/ns } rm -r -- $diskdir /run/vm/by-id/${id} /run/configs/${id} -- 2.55.0