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 EEE909180E for ; Fri, 7 Oct 2022 14:42:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1A8F925ED1 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 24E5544853 for ; Fri, 7 Oct 2022 14:42:05 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 7 Oct 2022 14:41:47 +0200 Message-Id: <20221007124156.110246-11-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] [RFC container 7/7] api: create/update vm: clamp cpuunit value 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:43 -0000 While the clamping already happens before setting the actual cpu.weight lxc config key, it can be done here too, to avoid writing new out-of-range values into the config. Can't use a validator enforcing this, because existing out-of-range values should not become errors on parsing the config. Signed-off-by: Fiona Ebner --- src/PVE/API2/LXC.pm | 3 +++ src/PVE/API2/LXC/Config.pm | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index 589f96f..8282850 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -221,6 +221,9 @@ __PACKAGE__->register_method({ my $restore = extract_param($param, 'restore'); my $unique = extract_param($param, 'unique'); + $param->{cpuunits} = PVE::GuestHelpers::get_cpuunits($param->{cpuunits}) + if defined($param->{cpuunits}); # clamp value depending on cgroup version + # used to skip firewall config restore if user lacks permission my $skip_fw_config_restore = 0; diff --git a/src/PVE/API2/LXC/Config.pm b/src/PVE/API2/LXC/Config.pm index 1fec048..a27be56 100644 --- a/src/PVE/API2/LXC/Config.pm +++ b/src/PVE/API2/LXC/Config.pm @@ -10,6 +10,7 @@ use PVE::INotify; use PVE::Cluster qw(cfs_read_file); use PVE::AccessControl; use PVE::Firewall; +use PVE::GuestHelpers; use PVE::Storage; use PVE::RESTHandler; use PVE::RPCEnvironment; @@ -144,6 +145,9 @@ __PACKAGE__->register_method({ my $revert_str = extract_param($param, 'revert'); my @revert = PVE::Tools::split_list($revert_str); + $param->{cpuunits} = PVE::GuestHelpers::get_cpuunits($param->{cpuunits}) + if defined($param->{cpuunits}); # clamp value depending on cgroup version + my $code = sub { my $conf = PVE::LXC::Config->load_config($vmid); -- 2.30.2