From nobody Tue Dec 16 15:40:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dW1Nm2MZSz6L7tb for ; Tue, 16 Dec 2025 15:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dW1Ng1n4jz3w1h for ; Tue, 16 Dec 2025 15:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765899651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFTz8abbeh2d/3cfx+dt3Qm2oHX+R9xyOS839pFCUng=; b=IGilcszHMrkehfa7gl21UcktDkSwoYyCoIVVrHxX61ULUDYA/23aPyJdzG9VPjQju1Vqax WTFAwBxXKBpI9mpeh6saej8LD0azzCMfInv5m4EBd/+sit95uSc5gwCmCi5xn6+JRaw+aK CZfpovS1zSzcB3JKxORvWk2mdIE5ScCLO188ST8GpUBdyiFyaOUoM9WIRR3WdLpDnhSb2j cQMsHzpgu1VVgdVqvVCpvs5HEjgcqu7YnVH1K9+g0sqg4fJLTELvq+7sTuMURl8KzqQZk0 FCxjndmSyS7s4VLufWrOzuhMdJG5X7KP7YiTFXutQB6Vjrq2ptucRET+usdHSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765899651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cFTz8abbeh2d/3cfx+dt3Qm2oHX+R9xyOS839pFCUng=; b=Oo4l2l+w8lqOsPkNoHz5mzJZsqTJ/c+Ju4JRMg+FoM3S5YEnhdVmmNZSxq2jTL3LRBBalG lE0Kc8EWAuJq+Pj7A30uvQjbSJcYoS6G5dceXrXedNi0dFL6QahVlXmMoXcviFA4uqWgyP iIM/cjL/2JWDZQ9WR1Xq0j3s8qAZ51o+kctmYwnc8r2kG3ka/g3wwb8UfpIPPHbJejkIKW lQHuTJhaUdfYZdwZmlAJmXquZiDra2/V6SjjjmHQGVEreAfasIgHjMEaRVQd9LUNjyWMyb vKxDjj/RRRc9waFV6sQXPeZaYqcsmEVndAI51r3WvmumfWlvdjIcjLJ6JDVhpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765899651; a=rsa-sha256; cv=none; b=vkJX7wDBVomUV2yIvGSbOSOfjol+mn7VDHIiMjpeercEsH7S3/vFp+5zkw9p+hfbgU6rIT CgGL3mxsbm/Oehf4qYqNXjmZufa9jhrO3yf+kCd02rXn+jemK2PkhQ9algyBcnkors72OK hXxiqxL4zMNwPcytQcj0BnWto5omVDmRrLM+vcWWMWbyjQhTapYEXguqZln/DVkGQsn4/+ UQ8zx7fOVDE6fuRb3oa44/gOCWH59xTIt2c9INIFXD04uR4K+/I81RD7gnkcHNXXtyrM/N nSY4nI9aXgESMM0qg4qhWJsJVONUrcWbik8g2vfHANoO+VZxZv1vKwjd1OdBxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dW1Ng19Yrz19GT for ; Tue, 16 Dec 2025 15:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44603 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Dec 2025 15:40:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8f84fdda4c78 - stable/15 - bsdinstall: Limit default swap to maximum supported by kernel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8f84fdda4c788d63cf0bb0bb19962a0ebcf2e6a4 Auto-Submitted: auto-generated Date: Tue, 16 Dec 2025 15:40:51 +0000 Message-Id: <69417d83.44603.48566f9c@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8f84fdda4c788d63cf0bb0bb19962a0ebcf2e6a4 commit 8f84fdda4c788d63cf0bb0bb19962a0ebcf2e6a4 Author: Ed Maste AuthorDate: 2023-03-06 20:24:05 +0000 Commit: Ed Maste CommitDate: 2025-12-16 15:40:40 +0000 bsdinstall: Limit default swap to maximum supported by kernel PR: 251993 Reviewed by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53106 (cherry picked from commit 52f9722e6ffff6fee309e6040b7b5313499a03ef) --- usr.sbin/bsdinstall/partedit/part_wizard.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c index 90a8da1c3c9b..9146a2af782f 100644 --- a/usr.sbin/bsdinstall/partedit/part_wizard.c +++ b/usr.sbin/bsdinstall/partedit/part_wizard.c @@ -27,6 +27,7 @@ */ #include +#include #include #include @@ -34,6 +35,7 @@ #include #include #include +#include #include #include @@ -41,10 +43,29 @@ #include "partedit.h" #define MIN_FREE_SPACE (1023*1024*1024) /* Just under 1 GB */ -#define SWAP_SIZE(available) MIN(available/20, 4*1024*1024*1024LL) static char *wizard_partition(struct gmesh *mesh, const char *disk); +/* + * Determine default swap (partition) size in bytes for a given amount of free + * disk space in bytes. The algorithm should likely be revisited in light of + * contemporary memory and disk sizes. + */ +static intmax_t +swap_size(intmax_t available) +{ + intmax_t swapsize; + unsigned long swap_maxpages; + size_t sz; + + swapsize = MIN(available/20, 4*1024*1024*1024LL); + sz = sizeof(swap_maxpages); + if (sysctlbyname("vm.swap_maxpages", &swap_maxpages, &sz, NULL, 0) == 0) + swapsize = MIN(swapsize, (intmax_t)swap_maxpages * getpagesize()); + + return (swapsize); +} + int part_wizard(const char *fsreq) { @@ -383,7 +404,7 @@ wizard_makeparts(struct gmesh *mesh, const char *disk, const char *fstype, return (!retval); /* Editor -> return 0 */ } - swapsize = SWAP_SIZE(available); + swapsize = swap_size(available); humanize_number(swapsizestr, 7, swapsize, "B", HN_AUTOSCALE, HN_NOSPACE | HN_DECIMAL); humanize_number(rootsizestr, 7, available - swapsize - 1024*1024,