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 1f41e8f6825b6f63b9d5a06d0b70481ddc4e4d84..297e995ab5983a7cc60962d83b916c43cbb121c3 100644 (file)
--- 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) = @_;
 
 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);
     my $set_text = PVE::Tools::file_read_firstline($filename) // '';
 
     my ($count, $members) = parse_cpuset($set_text);