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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 61B8491755 for ; Fri, 7 Oct 2022 14:42:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 20B4725D8D for ; Fri, 7 Oct 2022 14:42:05 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 7 Oct 2022 14:42:04 +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 BB6C04482D for ; Fri, 7 Oct 2022 14:42:03 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 7 Oct 2022 14:41:40 +0200 Message-Id: <20221007124156.110246-4-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. [guesthelpers.pm] Subject: [pve-devel] [PATCH guest-common 1/1] helpers: move get_cpuunits helper from qemu-server 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:05 -0000 while making it take the value directly instead of the config. Signed-off-by: Fiona Ebner --- src/PVE/GuestHelpers.pm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/PVE/GuestHelpers.pm b/src/PVE/GuestHelpers.pm index 0fe3fd6..f3a4202 100644 --- a/src/PVE/GuestHelpers.pm +++ b/src/PVE/GuestHelpers.pm @@ -3,6 +3,7 @@ package PVE::GuestHelpers; use strict; use warnings; +use PVE::CGroup; use PVE::Tools; use PVE::Storage; @@ -246,4 +247,19 @@ sub config_with_pending_array { return $res; } +sub get_cpuunits { + my ($cpuunits) = @_; + + my $is_cgroupv2 = PVE::CGroup::cgroup_mode() == 2; + + return $is_cgroupv2 ? 100 : 1024 if !defined($cpuunits); + + if ($is_cgroupv2) { + $cpuunits = 10000 if $cpuunits >= 10000; # v1 can be higher, so clamp v2 there + } else { + $cpuunits = 2 if $cpuunits < 2; # v2 can be lower, so clamp v1 there + } + return $cpuunits; +} + 1; -- 2.30.2