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 162669181B for ; Fri, 7 Oct 2022 14:42:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C520025F19 for ; Fri, 7 Oct 2022 14:42:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 7 Oct 2022 14:42:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DDFC744877 for ; Fri, 7 Oct 2022 14:42:04 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 7 Oct 2022 14:41:44 +0200 Message-Id: <20221007124156.110246-8-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221007124156.110246-1-f.ebner@proxmox.com> References: <20221007124156.110246-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches 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. [lxc.pm, config.pm] Subject: [pve-devel] [PATCH container 4/7] use helper from guest-common for cpuunits 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, 07 Oct 2022 12:42:44 -0000 to make behavior more consistent with what we do for VMs. The helper will clamp the value as needed, rather than dying. Allows starting existing containers with an out-of-range (for the relevant cgroup version) value. It's also possible to end up with out-of-range values via update/create API. Signed-off-by: Fiona Ebner --- Dependency bump for guest-common needed. src/PVE/LXC.pm | 5 ++--- src/PVE/LXC/Config.pm | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index fe63087..e143855 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -699,7 +699,7 @@ sub update_lxc_config { $raw .= "lxc.cgroup.cpu.cfs_quota_us = $value\n"; } - my $shares = $conf->{cpuunits} || 1024; + my $shares = PVE::GuestHelpers::get_cpuunits($conf->{cpuunits}); $raw .= "lxc.cgroup.cpu.shares = $shares\n"; } elsif ($cgv2->{cpu}) { # See PVE::CGroup @@ -709,8 +709,7 @@ sub update_lxc_config { } if (defined(my $shares = $conf->{cpuunits})) { - die "cpu weight (shares) must be in range [1, 10000]\n" - if $shares < 1 || $shares > 10000; + $shares = PVE::GuestHelpers::get_cpuunits($shares); $raw .= "lxc.cgroup2.cpu.weight = $shares\n"; } } diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index b32eff6..7be6be1 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -504,7 +504,10 @@ my $confdesc = { cpuunits => { optional => 1, type => 'integer', - description => "CPU weight for a VM. Argument is used in the kernel fair scheduler. The larger the number is, the more CPU time this VM gets. Number is relative to the weights of all the other running VMs.", + description => "CPU weight for a container, will be clamped to [1, 10000] in cgroup v2.", + verbose_description => "CPU weight for a container. Argument is used in the kernel fair " + ."scheduler. The larger the number is, the more CPU time this container gets. Number " + ."is relative to the weights of all the other running guests.", minimum => 0, maximum => 500000, default => 'cgroup v1: 1024, cgroup v2: 100', -- 2.30.2