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 330D0BC32; Fri, 31 Jul 2026 22:00:54 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 6A599BA95; Fri, 31 Jul 2026 22:00:42 +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-yx1-xb133.google.com (mail-yx1-xb133.google.com [IPv6:2607:f8b0:4864:20::b133]) by atuin.qyliss.net (Postfix) with ESMTPS id DFE01BA8E for ; Fri, 31 Jul 2026 22:00:41 +0000 (UTC) Received: by mail-yx1-xb133.google.com with SMTP id 956f58d0204a3-66843536f94so1586171d50.3 for ; Fri, 31 Jul 2026 15:00:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785535240; x=1786140040; 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=Al22taYV7IgndhsUOLY9juGicrnNUUEdXSZ/fVDoG42n9lkfUR2guBaairImfYBBZS d9FceBPOAibteSiDnDQToOLwqwukMp0rKTpWD+ma6YBxkVuhHW15qI8y2VxIQcmTBWCe zG6JUOE5rR1J4m2KW4v0gfUW/Id/TGofWwCnlCLl1L5QlYvPtv7H8PVGyUqTkFNWR778 R0uPV9ypYSQVrWj1+bp7OdrBKobylG77F/mNYVIJQNxS6L/U2O6SeDa3LO8xChnAH9iW 9X+Nj3fSKToTJgsF35uS58Deduw+8jG1J/D34EELuH4ldSUYMGklNmvKwXj+O5fUZw/G TtdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785535240; x=1786140040; 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=eQA+L/qLCUwl0WALI/Fej1F5F0XGbWVGixq6cemdh0SUh6P8Q75I7Mk4Dzc3xUrv2N ScMna6Dm8O1ztHgiJ5nz3H3Ce5nVDSp+X7J3a90Ih3Rq/A4FvoDbzex4u1kczSWagi24 9mx14mzFGPK6SglV+oVsrPUpcbYYFgqaS93c6VsgTY4/EmNj3ewNIHOH/GrXnoCP/aDv US5ZsA3takMLsHrOfXMSb5N1Hc+Tw6pERxYNzJ1unJ0EFXzXIPsMNxes7YjzQYBe9QiP xGGuoxL6brDLmBuWUKyfatebJKnDCyWN6TpfIcPK4nmDjtZyXdxMbG0GkUkifO9ztshp YNmA== X-Gm-Message-State: AOJu0YxDLEw3sJJGryFJv6zlU7NRaOJfP+3Ch5lpYFyRWo7v3RRAotS9 aG/qVLB+EUAChS+oIyq69zUlLGWmePFc9Jwe5/6QCfnn6GLj4qtwCojKN+VgGQ== X-Gm-Gg: AR+sD10nCguG0He6BDy6O1CeMuXF+I0BC+IXFGWO2z14+BRjThIG5v4IZ+wyqlXedb4 1YSOeiMutdSx9SwILg5oWKaLNBxmYtpg+81haVe+viDtjknHf5n1Cr0D4+4TXxTTTF0d1WREAYt kcDkghFOEvCO6iWweT79DUei3nptcvMfx0ANZJk1LWPJ4+BouV+T5xVpInirM4BY6lA1mcLm1Eo 6GeubPy13wjX0g41QAANV0w4QLgmFSFi1mzGtqWsDMObdPCM3izCUDJaTP3KL9AXaIxbXrBcQBY DXxRIHYTzxofKFCmrttJddfiJbGvMG18E5mK5W/LqdDjaGwIcRMlOWagTcjoPtVZjhSSIUwDlCE mqM8P1jv7MfiVAuwCU+pIs8B8pbDla8OrqjkZ8FTXcNA9eYVGj1Q9ixm5HNdSrz1I+PBydVEDZH fdRAnhINfBX+nyEWp+nFW+bEUp8Q3ttTR6AxnmA7qWP1MfP7jVfznRLQvvAfhhZU3/OuJT5+mdT Q== X-Received: by 2002:a05:690e:4388:b0:662:ebb0:36fa with SMTP id 956f58d0204a3-6694f0b65abmr1563267d50.20.1785535240247; Fri, 31 Jul 2026 15:00:40 -0700 (PDT) Received: from localhost.localdomain ([185.98.168.14]) by smtp.gmail.com with UTF8SMTPSA id 956f58d0204a3-66948fc815esm1434090d50.11.2026.07.31.15.00.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 15:00:39 -0700 (PDT) From: Demi Marie Obenour Date: Fri, 31 Jul 2026 17:54:54 -0400 Subject: [PATCH v5 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: <20260731-cgroups-v5-14-b325bac9d34f@gmail.com> References: <20260731-cgroups-v5-0-b325bac9d34f@gmail.com> In-Reply-To: <20260731-cgroups-v5-0-b325bac9d34f@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1785534880; l=997; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=zWwGP10Mj8TlhVZ57+4nY1Pi3zcuVKQj1zbxKkNFkN4=; b=25T4iURpFZ43cT7akufDuXasJ9qESHz1Fcv1RH6fqwB/r5fwf+XODcBsyTiOtss/aQ9VGvYpt trCj/YOWaGeBE8AwDaLGqRxBcG++KdrPQkjXojiPRCUYyYq+n9r4Xh3 X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: MHAJYQQPYD72I3XJHRFDDNCG3RKJU5WM X-Message-ID-Hash: MHAJYQQPYD72I3XJHRFDDNCG3RKJU5WM 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