From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E824794162 for ; Wed, 21 Sep 2022 09:53:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E628524760 for ; Wed, 21 Sep 2022 09:53:14 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 21 Sep 2022 09:53:14 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1A7BD44221 for ; Wed, 21 Sep 2022 09:53:14 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Wed, 21 Sep 2022 09:53:13 +0200 Message-Id: <20220921075313.65674-2-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220921075313.65674-1-w.bumiller@proxmox.com> References: <20220921075313.65674-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.265 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH common 2/2] cgroup: get mode by checking /sys/fs/cgroup mount point X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Sep 2022 07:53:14 -0000 Since even in pure unified layouts there may be a `name=systemd` v1 cgroup mounted additionally (manually or potentially via systemd-nspawn apparently), we should check what's actually mounted at `/sys/fs/cgroup` rather than whether v1 cgroups exist. Signed-off-by: Wolfgang Bumiller --- src/PVE/CGroup.pm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/PVE/CGroup.pm b/src/PVE/CGroup.pm index 92a0654..45c0788 100644 --- a/src/PVE/CGroup.pm +++ b/src/PVE/CGroup.pm @@ -86,21 +86,30 @@ sub get_cgroup_controllers() { my $CGROUP_MODE = undef; # Figure out which cgroup mode we're operating under: # -# Returns 1 if cgroupv1 controllers exist (hybrid or legacy mode), and 2 in a -# cgroupv2-only environment. +# For this we check the file system type of `/sys/fs/cgroup` as it may well be possible that some +# additional cgroupv1 mount points have been created by tools such as `systemd-nspawn`, or +# manually. +# +# Returns 1 for what we consider the hybrid layout, 2 for what we consider the unified layout. # # NOTE: To fully support a hybrid layout it is better to use functions like -# `cpuset_controller_path`. +# `cpuset_controller_path` and not rely on this value for anything involving paths. # # This is a function, not a method! sub cgroup_mode() { if (!defined($CGROUP_MODE)) { - my ($v1, $v2) = get_cgroup_controllers(); - if (keys %$v1) { - # hybrid or legacy mode - $CGROUP_MODE = 1; - } elsif ($v2) { - $CGROUP_MODE = 2; + my $mounts = PVE::ProcFSTools::parse_proc_mounts(); + for my $entry (@$mounts) { + my ($what, $dir, $fstype, $opts) = @$entry; + if ($dir eq '/sys/fs/cgroup') { + if ($fstype eq 'cgroup2') { + $CGROUP_MODE = 2; + last; + } else { + $CGROUP_MODE = 1; + last; + } + } } } -- 2.30.2