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 49BD266417 for ; Fri, 6 Nov 2020 09:25:06 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 47F171EA84 for ; Fri, 6 Nov 2020 09:25:06 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE56B1EA59 for ; Fri, 6 Nov 2020 09:25:04 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 3EFD3713849; Fri, 6 Nov 2020 09:24:56 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 6 Nov 2020 09:24:53 +0100 Message-Id: <20201106082455.3288332-3-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201106082455.3288332-1-aderumier@odiso.com> References: <20201106082455.3288332-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.234 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.276 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cgroup.pm] Subject: [pve-devel] [PATCH V2 pve-common 2/4] Cgroups: remove specific lxc code 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: Fri, 06 Nov 2020 08:25:06 -0000 --- src/PVE/CGroup.pm | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/src/PVE/CGroup.pm b/src/PVE/CGroup.pm index 7e12af9..45b9e7c 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) = @_; @@ -163,39 +162,10 @@ sub cpuset_controller_path() { } # 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 { +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; + die "implement in subclass"; } # Get path and version for a controller. @@ -205,12 +175,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 +484,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 +501,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