[pve-devel] [PATCH pve-common 2/4] Cgroups: remove specific lxc code

[Alexandre Derumier]

---
 src/PVE/CGroup.pm | 46 ++++------------------------------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/src/PVE/CGroup.pm b/src/PVE/CGroup.pm
index 7e12af9..f542b3a 100644
--- a/src/PVE/CGroup.pm
+++ b/src/PVE/CGroup.pm
@@ -22,8 +22,6 @@ use PVE::Tools qw(
     file_read_firstline
 );
 
-use PVE::LXC::Command;
-
 # We don't want to do a command socket round trip for every cgroup read/write,
 # so any cgroup function needs to have the container's path cached, so this
 # package has to be instantiated.
@@ -130,6 +128,7 @@ sub cgroupv2_base_path() {
 # available via both we favor cgroupv2 here as well.
 #
 # Returns nothing if the controller is not available.
+
 sub find_cgroup_controller($) {
     my ($controller) = @_;
 
@@ -162,42 +161,6 @@ sub cpuset_controller_path() {
     return wantarray ? ($CG_PATH_CPUSET, $CG_VER_CPUSET) : $CG_PATH_CPUSET;
 }
 
-# Get a subdirectory (without the cgroup mount point) for a controller.
-#
-# If `$controller` is `undef`, get the unified (cgroupv2) path.
-#
-# Note that in cgroup v2, lxc uses the activated controller names
-# (`cgroup.controllers` file) as list of controllers for the unified hierarchy,
-# so this returns a result when a `controller` is provided even when using
-# a pure cgroupv2 setup.
-my sub get_subdir {
-    my ($self, $controller, $limiting) = @_;
-
-    my $entry_name = $controller || 'unified';
-    my $entry = ($self->{controllers}->{$entry_name} //= {});
-
-    my $kind = $limiting ? 'limit' : 'ns';
-    my $path = $entry->{$kind};
-
-    return $path if defined $path;
-
-    $path = PVE::LXC::Command::get_cgroup_path(
-	$self->{vmid},
-	$controller,
-	$limiting,
-    ) or return undef;
-
-    # untaint:
-    if ($path =~ /\.\./) {
-	die "lxc returned suspicious path: '$path'\n";
-    }
-    ($path) = ($path =~ /^(.*)$/s);
-
-    $entry->{$kind} = $path;
-
-    return $path;
-}
-
 # Get path and version for a controller.
 #
 # `$controller` may be `undef`, see get_subdir above for details.
@@ -205,12 +168,11 @@ my sub get_subdir {
 # Returns either just the path, or the path and cgroup version as a tuple.
 sub get_path {
     my ($self, $controller, $limiting) = @_;
-
     # Find the controller before querying the lxc monitor via a socket:
     my ($cgpath, $ver) = find_cgroup_controller($controller)
 	or return undef;
 
-    my $path = get_subdir($self, $controller, $limiting)
+    my $path = $self->get_subdir($controller, $limiting)
 	or return undef;
 
     $path = "$cgpath/$path";
@@ -515,7 +477,7 @@ sub change_cpu_shares {
 
 my sub v1_freeze_thaw {
     my ($self, $controller_path, $freeze) = @_;
-    my $path = get_subdir($self, 'freezer', 1)
+    my $path = $self->get_subdir('freezer', 1)
 	or die "trying to freeze container: container not running\n";
     $path = "$controller_path/$path/freezer.state";
 
@@ -532,7 +494,7 @@ my sub v1_freeze_thaw {
 
 my sub v2_freeze_thaw {
     my ($self, $controller_path, $freeze) = @_;
-    my $path = get_subdir($self, undef, 1)
+    my $path = $self->get_subdir(undef, 1)
 	or die "trying to freeze container: container not running\n";
     $path = "$controller_path/$path";
 
-- 
2.20.1