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 81A9F952B; Thu, 06 Aug 2026 01:20:26 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 750C093CE; Thu, 06 Aug 2026 01:20:22 +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-x1130.google.com (mail-yw1-x1130.google.com [IPv6:2607:f8b0:4864:20::1130]) by atuin.qyliss.net (Postfix) with ESMTPS id B041F947B for ; Thu, 06 Aug 2026 01:20:21 +0000 (UTC) Received: by mail-yw1-x1130.google.com with SMTP id 00721157ae682-82011c59e66so32212287b3.0 for ; Wed, 05 Aug 2026 18:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785979221; x=1786584021; 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=CUFopDp9JUNDSaFHJjGxDd9iIWInXiHwp9avxMhNfy4pLLrGYjbazeiWiJ4ImyouxT bKEu6+26v5Rw4porIrg4xHqzQ3xSyPuIvJLEFIJegPqj3asT5IrEtIS0lcx36entfKez BdISfC2yx2Q17w7EjizOin340hsYxELIG2xytyf0eTpT8r+2nmAUvCi27y69/jK+4oQF aFPwMYMf8vqOysAElPD3bdnoENcQqbPf+qlDUmTer+3DgSVfN+/S+2hnqcfGgM+h7tno 1WFEfWc7fynrHEvX21IF2EEJKzQKgc7vKvwE5nxvJO2wenqORRcTlk6mD/6Y/tzazBcF C99g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785979221; x=1786584021; 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=Z9Eo9ccoDjSl6rnCunQlKg0XjpG325bh1aJqacL4Ei9wKHVLZFsymkoCyBPKo22OIa kwtV9UqBEoA0iTh30IMpLjX2RoulxXK+aPXDrihfmSASxaLgGLrS8YTHbbGEJn/+L+yX lRhG7Lj1fpS4SWY8kRzwZ3fPguo5Tw5gWpy3qtqNXlfvFS+3k7Uo5+tYoRSU26S6aMKG MTx6biiiT6kH/laMhMVmuvaoeqBL/8MnBdZOLMi8OckSr5QmkahqB43mU3Ut7dvfdA4r Naxf2fxOhNoSKDc97LnzNeV1ER/yTymCFEeFgFSn+DeA7U8eIFz/sEtKsCr8WoFhWP74 QknA== X-Gm-Message-State: AOJu0Yxo5w2/gRn26x737fN/bez1DYsGUSWh3TVlnHvVNAiEhg3xx5Ab o0OhuwD54hryMAE2+I3GLPKTgG9qrNLEGL8VmhvYzPhKCcASTdGfEmfcuSdb7g== X-Gm-Gg: AR+sD13tWBC998H2wu+mKwsQram3uC72UUE3fJHn4yS3yrQBMML4G823NGz2F4pLdg/ 5z0VZayH3rvPQNXRiK3La8y8sVtIyJZz6r9KLgYm8Pu916VPUvYfkJVpclxR3V2Ypxtz/RtreXr 6GhcQ7aJRbBFsAmarzxTAPiqMFAPAnydt3H1GNKHHnIRCTvCjJIkwSBCi43HhxfsuZ/WeNo73fg +Zd6G3RcRBGmSh4IiT9qiKs9INrshJ8i9cAMsT47X6RZE50xMRmstbY8+yhWb3bLmq2QYUvNzpc iWzvC/JxJiqr0OX1BqTZ0sSl9un2A2SnT3aADYmksl1m+Ttq9ocBxUQlAF39t/kFF7+otlmwVl0 5/TRCopPIaHyVc+5iMVTy1fER+ZTXprVHAzSX1a1vBB3WkdM1eSK8n7RME2VAF0Syq2FjYwETyX oL7uh4ngb06qBxZkfClCUiZXGGfD8MyAhHZ46RW9ua80OxbI1a+Jic+CSWvxfTYNj5kehImXPUe Q== X-Received: by 2002:a05:690c:6802:b0:81e:ad1:8e5b with SMTP id 00721157ae682-820224f293amr68175957b3.33.1785979220686; Wed, 05 Aug 2026 18:20:20 -0700 (PDT) Received: from localhost.localdomain ([185.98.168.14]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-8201341d3bcsm30741127b3.24.2026.08.05.18.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2026 18:20:20 -0700 (PDT) From: Demi Marie Obenour Date: Wed, 05 Aug 2026 21:16:21 -0400 Subject: [PATCH v6 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: <20260805-cgroups-v6-14-086c0f00f55f@gmail.com> References: <20260805-cgroups-v6-0-086c0f00f55f@gmail.com> In-Reply-To: <20260805-cgroups-v6-0-086c0f00f55f@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1785978967; l=997; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=zWwGP10Mj8TlhVZ57+4nY1Pi3zcuVKQj1zbxKkNFkN4=; b=Hl8pTkiEmqFzibVvjD8LbCK34rHVqttRQsrdRYBF7LVX/wH6kV9sCwuCv3SniBVVZ5cQrv8gX VgccnKdVEBZAENsb2jeRhVNiqc3CdcgLizERzgnQCSGxSCo+gwSkB9W X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: FBCK6N7V4VCDAQHDEXA2V2FS4GZD3EMW X-Message-ID-Hash: FBCK6N7V4VCDAQHDEXA2V2FS4GZD3EMW 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