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 494AC9C5DA for ; Tue, 24 Oct 2023 13:55:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 334E81F98C for ; Tue, 24 Oct 2023 13:55:37 +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, 24 Oct 2023 13:55:36 +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 EDD7C44B2E for ; Tue, 24 Oct 2023 13:55:35 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 24 Oct 2023 13:55:21 +0200 Message-ID: <20231024115530.1101733-6-c.heiss@proxmox.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231024115530.1101733-1-c.heiss@proxmox.com> References: <20231024115530.1101733-1-c.heiss@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.021 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 Subject: [pve-devel] [PATCH installer v2 5/6] fix #4829: tui: setup: add new ZFS `arc_max` 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, 24 Oct 2023 11:55:37 -0000 Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * Updated comment for ZfsBootdiskOptions::defaults_from() accordingly proxmox-tui-installer/src/options.rs | 52 +++++++++++++++++++-- proxmox-tui-installer/src/setup.rs | 2 + proxmox-tui-installer/src/views/bootdisk.rs | 8 +++- 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/proxmox-tui-installer/src/options.rs b/proxmox-tui-installer/src/options.rs index abc8c7b..fbed8d9 100644 --- a/proxmox-tui-installer/src/options.rs +++ b/proxmox-tui-installer/src/options.rs @@ -1,7 +1,7 @@ use std::net::{IpAddr, Ipv4Addr}; use std::{cmp, fmt}; -use crate::setup::{LocaleInfo, NetworkInfo, RuntimeInfo}; +use crate::setup::{LocaleInfo, NetworkInfo, ProxmoxProduct, RuntimeInfo}; use crate::utils::{CidrAddress, Fqdn}; use crate::SummaryOption; @@ -190,21 +190,23 @@ pub struct ZfsBootdiskOptions { pub compress: ZfsCompressOption, pub checksum: ZfsChecksumOption, pub copies: usize, + pub arc_max: usize, pub disk_size: f64, pub selected_disks: Vec, } impl ZfsBootdiskOptions { - /// This panics if the provided slice is empty. - pub fn defaults_from(disks: &[Disk]) -> Self { - let disk = &disks[0]; + /// Panics if the disk list is empty. + pub fn defaults_from(runinfo: &RuntimeInfo) -> Self { + let disk = &runinfo.disks[0]; Self { ashift: 12, compress: ZfsCompressOption::default(), checksum: ZfsChecksumOption::default(), copies: 1, + arc_max: default_zfs_arc_max(crate::current_product(), runinfo.total_memory), disk_size: disk.size, - selected_disks: (0..disks.len()).collect(), + selected_disks: (0..runinfo.disks.len()).collect(), } } } @@ -451,6 +453,24 @@ impl InstallerOptions { } } +/// Calculates the default upper limit for the ZFS ARC size. +/// See also and +/// https://openzfs.github.io/openzfs-docs/Performance%20and%20Tuning/Module%20Parameters.html#zfs-arc-max +/// +/// # Arguments +/// * `product` - The product to be installed +/// * `total_memory` - Total memory installed in the system, in MiB +fn default_zfs_arc_max(product: ProxmoxProduct, total_memory: usize) -> usize { + if product != ProxmoxProduct::PVE { + // Use ZFS default for non-PVE + 0 + } else { + ((total_memory as f64) / 10.) + .round() + .clamp(64., 16. * 1024.) as usize + } +} + #[cfg(test)] mod tests { use super::*; @@ -460,6 +480,28 @@ mod tests { }; use std::{collections::HashMap, path::PathBuf}; + #[test] + fn zfs_arc_limit() { + const TESTS: &[(usize, usize)] = &[ + (16, 64), // at least 64 MiB + (1024, 102), + (4 * 1024, 410), + (8 * 1024, 819), + (150 * 1024, 15360), + (160 * 1024, 16384), + (1024 * 1024, 16384), // maximum of 16 GiB + ]; + + for (total_memory, expected) in TESTS { + assert_eq!( + default_zfs_arc_max(ProxmoxProduct::PVE, *total_memory), + *expected + ); + assert_eq!(default_zfs_arc_max(ProxmoxProduct::PBS, *total_memory), 0); + assert_eq!(default_zfs_arc_max(ProxmoxProduct::PMG, *total_memory), 0); + } + } + fn fill_setup_info() { crate::init_setup_info(SetupInfo { config: ProductConfig { diff --git a/proxmox-tui-installer/src/setup.rs b/proxmox-tui-installer/src/setup.rs index 7238131..25504fe 100644 --- a/proxmox-tui-installer/src/setup.rs +++ b/proxmox-tui-installer/src/setup.rs @@ -114,6 +114,7 @@ struct InstallZfsOption { #[serde(serialize_with = "serialize_as_display")] checksum: ZfsChecksumOption, copies: usize, + arc_max: usize, } impl From for InstallZfsOption { @@ -123,6 +124,7 @@ impl From for InstallZfsOption { compress: opts.compress, checksum: opts.checksum, copies: opts.copies, + arc_max: opts.arc_max, } } } diff --git a/proxmox-tui-installer/src/views/bootdisk.rs b/proxmox-tui-installer/src/views/bootdisk.rs index dbd13ea..e8322db 100644 --- a/proxmox-tui-installer/src/views/bootdisk.rs +++ b/proxmox-tui-installer/src/views/bootdisk.rs @@ -139,6 +139,11 @@ impl AdvancedBootdiskOptionsView { } fn fstype_on_submit(siv: &mut Cursive, disks: &[Disk], fstype: &FsType) { + let runinfo = siv + .user_data::() + .map(|state| state.runtime_info.clone()) + .unwrap(); + siv.call_on_name("advanced-bootdisk-options-dialog", |view: &mut Dialog| { if let Some(AdvancedBootdiskOptionsView { view }) = view.get_content_mut().downcast_mut() @@ -150,7 +155,7 @@ impl AdvancedBootdiskOptionsView { )), FsType::Zfs(_) => view.add_child(ZfsBootdiskOptionsView::new( disks, - &ZfsBootdiskOptions::defaults_from(disks), + &ZfsBootdiskOptions::defaults_from(&runinfo), )), FsType::Btrfs(_) => view.add_child(BtrfsBootdiskOptionsView::new( disks, @@ -541,6 +546,7 @@ impl ZfsBootdiskOptionsView { compress, checksum, copies, + arc_max: 0, // use built-in ZFS default value disk_size, selected_disks, }, -- 2.42.0