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 1C5C394F6; Thu, 06 Aug 2026 01:20:24 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 4BAFB944C; Thu, 06 Aug 2026 01:20:20 +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-x112d.google.com (mail-yw1-x112d.google.com [IPv6:2607:f8b0:4864:20::112d]) by atuin.qyliss.net (Postfix) with ESMTPS id 1F9B09420 for ; Thu, 06 Aug 2026 01:20:19 +0000 (UTC) Received: by mail-yw1-x112d.google.com with SMTP id 00721157ae682-81f36179d72so25110607b3.2 for ; Wed, 05 Aug 2026 18:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785979218; x=1786584018; 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=8T8Di0Tj90nZOQambT3SaUTJpl3EV3HhL72AzQeZFw0=; b=Qwl1MZEcnoeIMqVfWD7hJ+N4wnJeB+FS91kxkHcBq4EAywBxkRMXdmM8Z0sL8LTAj4 FYtADxHPbQvXU3QFbtT2e+cC6l7xNJ/mGCTP4CObD4XbhwisKL8IMEqNm809WC8sBIk5 o0+xYr/FSjTAb2c6zjzuS1BCtxRiqLbIbW4t6qcOn34CZDUwELo+y87V7KPRjDFGvaqA bw3aUGNPJw47PStZFDs+UgxIHfLGcHhzdvf8H1L3X+3OlMSdri1fZwByZzPp8JbfZpkS jSvcGaPXOLzWA8mgndXyrVSSQfKb5YWSbPkAkwZACoIcEaj4KzM7gqnRXMa48VjALIrC QwEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785979218; x=1786584018; 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=8T8Di0Tj90nZOQambT3SaUTJpl3EV3HhL72AzQeZFw0=; b=VsUHKTKGcUj+FH3AZY0NDUvmPuHE8vsBcYz9v7KUgAs6XQp5UXjigIfN59aoEHMml/ l2l10B46yZaMu7uZ84ARWoDKFXBUX4iov6EAADArXwvGDUkOa5vwazTEayatV/AKfR9x TMLlGurG2iAZYFXmIiAgCIHBaPikeMhf32TN40qYTxRruhHp7/Pu0YN5huILpOEzuhHN YGULo7HkGyZqmWpWL70PYx28Co/89G8x7Tgq6jyRQWJKe0z3UP3zhLtCqw0wJBeANSr5 106MIkZSlVQbNt7IXLCqT3n2Mf7OpwPEDdAM7cVWgGp4DqdwG3Z67m3Asvw+sy65e6rQ pzjw== X-Gm-Message-State: AOJu0YzHStlCpa+bjyg1qpZirCZaV5zdZG3WU+zQRdtpBWAix4a3IhdU SLvqTQcIuv107TvCvpeOSAP8MMhFmX0dKS2t0oDtlGC7khAT4Lhtu25Po87aNw== X-Gm-Gg: AR+sD10zEP2jXkfQpW0InrLhxPmERQ5PM4yPRoC3bdxRM9k6QOUpwZF7hTonnyqulLL DZNoaa1dZy+GWHuT1cbBQVgYY4I5BHBM2uaO21ibiJccO9EIyX/qSyZDB4r/o8NMxeCmdO2hRnv ZcktIFMvxK9DW4PrgKHa6Atw+J+OZ4YSHTgwCawDxIkOiRblWktfsnwfpPaqyhVCqmef1gh/ntM mhCUTWD8DALtpjM2cghn49aWoSMvZnPvCL1l2GavhBZQ8kIuRx6fulT/1xPa85Vb4TXP+q/b5Zl aKQ467v696OIHnoNvHACpkel/KbQyqjNo0c6uqjXlQsLQ1Lv2fkP9BXC941ed99x5GYBeU6zu5x /byd7UxoksXcfv8oA9fFXM2hr2BpxfltPlZExyRpnvbCiTtEn4GZdEfeZElejSSZWuIN8INhYKi X1TUgSJHZVLIjQskVa9sjgkkAKgs5HqwSgkDLtj7dhXDYRjSGe2IZ7+1r9fIHMBYpYjD2Ceit5c w== X-Received: by 2002:a05:690c:e3f1:b0:80e:1ad2:afc3 with SMTP id 00721157ae682-8202232979bmr69726897b3.15.1785979217994; Wed, 05 Aug 2026 18:20:17 -0700 (PDT) Received: from localhost.localdomain ([185.98.168.14]) by smtp.gmail.com with UTF8SMTPSA id 00721157ae682-82013452634sm31157127b3.34.2026.08.05.18.20.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2026 18:20:17 -0700 (PDT) From: Demi Marie Obenour Date: Wed, 05 Aug 2026 21:16:19 -0400 Subject: [PATCH v6 12/19] host/rootfs: run-vmm: Create per-VM cgroup MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260805-cgroups-v6-12-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=3225; i=demiobenour@gmail.com; s=20250729; h=from:subject:message-id; bh=aWDj7nKOTLYX0NggBU9dauZnHCW4WI3FIlZTCEx654k=; b=3CGHRNzCFcCnNInXBxIR0ouRL2KvGSAstC9l7UHvaDuOXSZIhpgjqFZA6ojhfEjQyiUMN5XuL jJ7krO//5ENDM7lTq/SEUPvRYT/l4F2qWPRGe5z+3wfIVJlTohxTnk6 X-Developer-Key: i=demiobenour@gmail.com; a=ed25519; pk=X57Q4/YQDj9t4SBeKaDwvXYKB6quZJVx/DE2Ly2out0= Message-ID-Hash: QXAQMNY2IXLMQL2COYGY4PYGHOD3LBWD X-Message-ID-Hash: QXAQMNY2IXLMQL2COYGY4PYGHOD3LBWD 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 --- host/rootfs/file-list.mk | 1 + .../image/etc/s6-linux-init/run-image/service/vmm/template/finish | 5 +++++ host/rootfs/image/usr/bin/run-vmm | 4 ++++ host/rootfs/image/usr/bin/vm-stop | 5 ++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/host/rootfs/file-list.mk b/host/rootfs/file-list.mk index 36f508962c0515b2132aa9ab30cde929e2de100e..5f7b0c3fc1d7d7f8dc184ecc991126a793e316c6 100644 --- a/host/rootfs/file-list.mk +++ b/host/rootfs/file-list.mk @@ -44,6 +44,7 @@ FILES = \ image/etc/s6-linux-init/run-image/service/vm-services/template/run \ image/etc/s6-linux-init/run-image/service/vmm/notification-fd \ image/etc/s6-linux-init/run-image/service/vmm/run \ + image/etc/s6-linux-init/run-image/service/vmm/template/finish \ image/etc/s6-linux-init/run-image/service/vmm/template/notification-fd \ image/etc/s6-linux-init/scripts/rc.init \ image/etc/s6-linux-init/scripts/rc.shutdown \ diff --git a/host/rootfs/image/etc/s6-linux-init/run-image/service/vmm/template/finish b/host/rootfs/image/etc/s6-linux-init/run-image/service/vmm/template/finish new file mode 100755 index 0000000000000000000000000000000000000000..e316407f3a9cdee6961191480c5cab124254be02 --- /dev/null +++ b/host/rootfs/image/etc/s6-linux-init/run-image/service/vmm/template/finish @@ -0,0 +1,5 @@ +#!/usr/bin/execlineb -WS3 +# SPDX-FileCopyrightText: 2026 Demi Marie Obenour +# SPDX-License-Identifier: EUPL-1.2+ + +cgroup-purge /vm-services.slice/vm-${3}.slice/vmm diff --git a/host/rootfs/image/usr/bin/run-vmm b/host/rootfs/image/usr/bin/run-vmm index 6967dc5586335d999f8030371fe0f38502409919..12896c276fbffa024fa0f89f42a2967506b1cb74 100755 --- a/host/rootfs/image/usr/bin/run-vmm +++ b/host/rootfs/image/usr/bin/run-vmm @@ -5,6 +5,7 @@ if { backtick -D "" mnt { importas -Siu 1 + if { cgroup-setup --no-wait /vm-services.slice/vm-${1}.slice } nsenter --mount=/run/vm/by-id/${1}/ns/mnt findmnt -no FSTYPE,SOURCE /run/fs/${1}/disk } @@ -33,6 +34,8 @@ if { elgetpositionals +if { rm -f /run/vsock/${1}/vsock } + s6-ipcserver-socketbinder -B /run/vm/by-id/${1}/vmm getpid -E vmm_pid @@ -86,6 +89,7 @@ redirfd -r 0 /dev/null s6-softlimit -H -l 18446744073709551615 if { udevadm wait /dev/kvm } +cgroup-setup --leaf /vm-services.slice/vm-${1}.slice/vmm s6-envuidgid vmm-${1} s6-applyuidgid -Uz bwrap diff --git a/host/rootfs/image/usr/bin/vm-stop b/host/rootfs/image/usr/bin/vm-stop index 6fb6aaed46de684eb035243e4f7c79111e93bf8c..23a815c0c260452ff9b1bcce7a091519b7420196 100755 --- a/host/rootfs/image/usr/bin/vm-stop +++ b/host/rootfs/image/usr/bin/vm-stop @@ -2,4 +2,7 @@ # SPDX-License-Identifier: EUPL-1.2+ # SPDX-FileCopyrightText: 2023 Alyssa Ross -ch-remote --api-socket /run/vm/by-id/${1}/vmm shutdown +foreground { ch-remote --api-socket /run/vm/by-id/${1}/vmm shutdown } +if { cgroup-purge /vm-services.slice/vm-${1}.slice/vmm } +importas -iS ? +exit $? -- 2.55.0