From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH V2 pve-common 2/4] Cgroups: remove specific lxc code
Date: Fri, 6 Nov 2020 09:24:53 +0100 [thread overview]
Message-ID: <20201106082455.3288332-3-aderumier@odiso.com> (raw)
In-Reply-To: <20201106082455.3288332-1-aderumier@odiso.com>
---
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
next prev parent reply other threads:[~2020-11-06 8:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-06 8:24 [pve-devel] [PATCH V2 pve-common 0/4] add generic CGroup module Alexandre Derumier
2020-11-06 8:24 ` [pve-devel] [PATCH V2 pve-common 1/4] move PVE::LXC::CGroup to PVE::CGroup Alexandre Derumier
2020-11-06 8:24 ` Alexandre Derumier [this message]
2020-11-06 8:24 ` [pve-devel] [PATCH V2 pve-common 3/4] bugfix: cpushares : default value is 1024 for cgroup v1 Alexandre Derumier
2020-11-06 8:24 ` [pve-devel] [PATCH V2 pve-common 4/4] systemd: add CPUWeight encoding Alexandre Derumier
2020-11-06 8:31 ` [pve-devel] applied-series: [PATCH V2 pve-common 0/4] add generic CGroup module Thomas Lamprecht
2020-11-08 14:10 ` Alexandre Derumier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201106082455.3288332-3-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox