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 803EAA603; Sun, 30 Aug 2026 06:45:42 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 810A3A562; Sun, 30 Aug 2026 06:45:40 +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-x112f.google.com (mail-yw1-x112f.google.com [IPv6:2607:f8b0:4864:20::112f]) by atuin.qyliss.net (Postfix) with ESMTPS id EB830A5AE for ; Sun, 30 Aug 2026 06:45:39 +0000 (UTC) Received: by mail-yw1-x112f.google.com with SMTP id 00721157ae682-836c8bde2dcso24545077b3.0 for ; Sat, 29 Aug 2026 23:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788072339; x=1788677139; 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=bhTBtlKrUs9IXoIy1+4AzqNiWS0r+2b9QNCg3MyzkYXjdTJse7kxSNbLff150ICsuy gQQrVwfxW85y7zj4JrywSX84BAA6YAv14qhYyoa9ppsgZ7Dn1iAedNjFSHL2NZcRUQIZ oJRmEqu+nUwQoDBqFBpiHNTFav7Hbaoqo20fUHYi1ycS3Iv28KWxBNU+lpFbcHvpi+9t 3sEs9ygo6Xow7PLnukQh1jyj1apTjYgNOqEIYMjaIa7Gm5Ue22TZI0UgXdbY8F3+ffn8 ktODzZdNHRe3sQP0ma0nKARklcnbm5UYjLVUwB0Fktk3xHcer/m6f8x229/VDoH4E6BW eYYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788072339; x=1788677139; 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=QHqGQKwXERIPFv1Ik/cq4DmT/HtZWW1CU6S3S2G8qTGkGfqdeHejUD7/Zo2v/ry0/x y4k0xquYqMbQ1RuuVVP+dup/I9H5gxP7sxPrP9d/rfUKOhQzyJuKYCZhqJ1h4saLa6ya X3pACd8UNLw2YP0xIC7TYQt/W+QRwtlOqyuSp8PdygxqRNYXRSm8Z26XZGwLTqXFE8uS 7NG85f65mADynqNZWQpI8XIjSl0L4YYrgscLzcOUTS6+ipjsOWCqFFM7wxwUCMdHquBx 4sLeggz+LcHnyiuiJ1a1yO2spFlwl+/vUiqHo2em5FrEmonXlvdkf7iRPCZODbQqCoc+ HFJQ== X-Gm-Message-State: AFuF++mW0RCnRB9gwOFlWXqfWTKlopu6JgIj5lwQ5sAziD0j1ddOyykv H9tkZ4qP/qN9W+Mug5AM2iSkxIz9HsF5gi3+6HaxtXLZy7fpQyu8M489q1fzBg== X-Gm-Gg: AYBFou3CHe0tGZERiLhngWMyOCKEVhRI9T/Q1xrvSg0Hr064/ResaOuIex+W7ul1mMW E5ljl1h/9v8XQFnHpEk00SsmvqL/oYO0Aaf9Fi5i/L4cUpTr47RIPhqNx+WBqSeVVikG7+uXyEX WV3NdFDTfqwR1CGY+R0yWARuE0jvh9hFmtbGXktpwsfuY3TFAv05dTB44O83K9aVJ3oes3JKFz8 RuMqItOB882nwNXhJ9sqXQIGGL3LUQzP2AMq5rYiPD/vVGWgs+IJfPhLTYOKGmrCq7h+GkF8IZA nbgYs24SEcJmH07MaECgQ0e0InyatTqyxZ5CUhoDCkHSQHIRJTtRa8MePywCl7AYoh6XQvr6/JX vDccD9CJ/7br4aFx6ch4DFtILrXfdIi+j+L0FZ5fDksZ+59wAy2mZJTlfOfAOah/F4JhOLOP/bK XOUAbKamVtlurc1HvHNBAFCnRkxdXdcHFlbWKVlr03tGiFpA3fjf27hXruG2C/JCyG4fOqj4Mlw A== X-Received: by 2002:a05:690c:e1d5:10b0:857:b539:c43f with SMTP id 00721157ae682-85d6c7e9492mr51649387b3.26.1788072338745; Sat, 29 Aug 2026 23:45:38 -0700 (PDT) Received: from localhost.localdomain ([185.98.168.14]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-85e5e1802ecsm30634927b3.2.2026.08.29.23.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Aug 2026 23:45:37 -0700 (PDT) From: Demi Marie Obenour Date: Sun, 30 Aug 2026 02:06:47 -0400 Subject: [PATCH v8 13/18] 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: <20260830-cgroups-v8-13-239b09ba7013@gmail.com> References: <20260830-cgroups-v8-0-239b09ba7013@gmail.com> In-Reply-To: <20260830-cgroups-v8-0-239b09ba7013@gmail.com> To: Spectrum OS Development X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788069995; l=997; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=zWwGP10Mj8TlhVZ57+4nY1Pi3zcuVKQj1zbxKkNFkN4=; b=KLB1c2CIwhVADlZ/vpileh/0iH0KChC8xq9j8ntU9XV2F46AH7q0wnD0y80KrTIwo3TIOkywM 7cNBq5CnhK6Awz7lVXBDsBtLresKyPVzARwuQTkiJ2XavXpuwWVC3ti X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: K5PHWZBBHSNTJSEEPWM4HQB4WTHC3XGY X-Message-ID-Hash: K5PHWZBBHSNTJSEEPWM4HQB4WTHC3XGY 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