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 C049F88D6 for ; Tue, 22 Aug 2023 12:25:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A9C27ADCD for ; Tue, 22 Aug 2023 12:25:41 +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 ; Tue, 22 Aug 2023 12:25:39 +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 01ADC432DB for ; Tue, 22 Aug 2023 12:25:39 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 22 Aug 2023 12:24:49 +0200 Message-ID: <20230822102533.295530-2-c.heiss@proxmox.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230822102533.295530-1-c.heiss@proxmox.com> References: <20230822102533.295530-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.039 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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. [proxmox.com, config.pm, github.io, runenv.pm, install.pm] Subject: [pve-devel] [PATCH installer 1/6] fix #4829: install: add new ZFS `arc_max` setup option 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: Tue, 22 Aug 2023 10:25:41 -0000 Signed-off-by: Christoph Heiss --- Proxmox/Install.pm | 4 ++++ Proxmox/Install/Config.pm | 1 + Proxmox/Install/RunEnv.pm | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm index 1c4811d..d23a04b 100644 --- a/Proxmox/Install.pm +++ b/Proxmox/Install.pm @@ -1137,6 +1137,10 @@ _EOD file_write_all("$targetdir/etc/kernel/cmdline", "root=ZFS=$zfs_pool_name/ROOT/$zfs_root_volume_name boot=zfs\n"); + my $arc_max = Proxmox::Install::RunEnv::clamp_zfs_arc_max( + Proxmox::Install::Config::get_zfs_opt('arc_max')) * 1024 * 1024; + file_write_all("$targetdir/etc/modprobe.d/zfs.conf", "options zfs zfs_arc_max=$arc_max\n") + if $arc_max > 0; } diversion_remove($targetdir, "/usr/sbin/update-grub"); diff --git a/Proxmox/Install/Config.pm b/Proxmox/Install/Config.pm index 024f62a..f12ae67 100644 --- a/Proxmox/Install/Config.pm +++ b/Proxmox/Install/Config.pm @@ -72,6 +72,7 @@ my sub init_cfg { compress => 'on', checksum => 'on', copies => 1, + arc_max => Proxmox::Install::RunEnv::default_zfs_arc_max(), }, # TODO: single disk selection config target_hd => undef, diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm index 9878f55..fded45a 100644 --- a/Proxmox/Install/RunEnv.pm +++ b/Proxmox/Install/RunEnv.pm @@ -296,6 +296,44 @@ sub query_installation_environment : prototype() { return $output; } +our $ZFS_ARC_MIN_SIZE = 64; # 64 MiB + +# Calculates the default upper limit for the ZFS ARC size. +# See also https://bugzilla.proxmox.com/show_bug.cgi?id=4829 and +# https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Module%20Parameters.html#zfs-arc-max +sub default_zfs_arc_max { + # Use ZFS default on non-PVE + return 0 if Proxmox::Install::ISOEnv::get('product') ne 'pve'; + + my $max = 16 * 1024; # 16 GiB + + my $rounded = int(sprintf('%.0f', get('total_memory') / 10)); + if ($rounded > $max) { + return $max; + } elsif ($rounded < $ZFS_ARC_MIN_SIZE) { + return $ZFS_ARC_MIN_SIZE; + } + + return $rounded; +} + +# Clamps the provided ZFS arc_max value to the accepted bounds. See also +# https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Module%20Parameters.html#zfs-arc-max +sub clamp_zfs_arc_max { + my ($value) = @_; + + return $value if $value == 0; + + my $total_mem = get('total_memory'); + if ($value > $total_mem) { + return $total_mem; + } elsif ($value < $ZFS_ARC_MIN_SIZE) { + return $ZFS_ARC_MIN_SIZE; + } + + return $value; +} + my $_env = undef; sub get { my ($k) = @_; -- 2.41.0