From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer 1/6] fix #4829: install: add new ZFS `arc_max` setup option
Date: Tue, 22 Aug 2023 12:24:49 +0200 [thread overview]
Message-ID: <20230822102533.295530-2-c.heiss@proxmox.com> (raw)
In-Reply-To: <20230822102533.295530-1-c.heiss@proxmox.com>
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
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
next prev parent reply other threads:[~2023-08-22 10:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-22 10:24 [pve-devel] [PATCH installer 0/6] fix #4829: set up a lower default limit for the ZFS ARC in the installer Christoph Heiss
2023-08-22 10:24 ` Christoph Heiss [this message]
2023-08-22 10:24 ` [pve-devel] [PATCH installer 2/6] fix #4829: proxinstall: expose new `arc_max` ZFS option for PVE installations Christoph Heiss
2023-08-22 10:24 ` [pve-devel] [PATCH installer 3/6] fix #4829: test: add tests for new zfs_arc_max calculations Christoph Heiss
2023-08-22 10:24 ` [pve-devel] [PATCH installer 4/6] fix #4829: tui: views: add optional suffix label for `NumericEditView`s Christoph Heiss
2023-08-22 10:24 ` [pve-devel] [PATCH installer 5/6] fix #4829: tui: setup: add new ZFS `arc_max` option Christoph Heiss
2023-08-22 10:24 ` [pve-devel] [PATCH installer 6/6] fix #4829: tui: bootdisk: expose new `arc_max` ZFS option for PVE installations Christoph Heiss
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=20230822102533.295530-2-c.heiss@proxmox.com \
--to=c.heiss@proxmox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.