From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 30 Mar 2020 14:30:35 +0000 (+0200)
Subject: cpuset: cgroupv2 support
X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=commitdiff_plain;h=7c3db4b80cac01c9a5a7ef8fa5ac7a2861c2e0c5;ds=sidebyside

cpuset: cgroupv2 support

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---

diff --git a/src/PVE/CpuSet.pm b/src/PVE/CpuSet.pm
index 1f41e8f..297e995 100644
--- a/src/PVE/CpuSet.pm
+++ b/src/PVE/CpuSet.pm
@@ -25,9 +25,17 @@ sub new_from_cgroup {
 sub new_from_path {
     my ($class, $path, $effective) = @_;
 
-    my $kind = $effective ? 'effective_cpus' : 'cpus';
+    my $filename;
+    if ($effective) {
+	$filename = "$path/cpuset.effective_cpus";
+	if (!-e $filename) {
+	    # cgroupv2:
+	    $filename = "$path/cpuset.cpus.effective";
+	}
+    } else {
+	$filename = "$path/cpuset.cpus";
+    }
 
-    my $filename = "$path/cpuset.$kind";
     my $set_text = PVE::Tools::file_read_firstline($filename) // '';
 
     my ($count, $members) = parse_cpuset($set_text);