From nobody Thu May 15 14:28:04 2025 X-Original-To: dev-commits-src-main@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 4Zysxx3ZGsz5wQqv; Thu, 15 May 2025 14:28:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zysxx0LTZz3fDG; Thu, 15 May 2025 14:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747319285; 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=se1Y/2bO+dvWwehIubJiA1Cr7vj3B340IG6FkDAap40=; b=lJ0jiQTmr+z+44wGxGAmkPYiMIHSUczKBoBtvu+Bt5ET65pEwVgUS8JjEiuCjA0WGtkcIw rvdpDkqm1UHEh9fiZLpPj2s2FR7yVm3+B2MPiWPH4dPx9zwrwyxMRb/aEFEBD1FNTVzBp0 jRK9KMAjoQX3kf6k0NCxtzm+lv/dnGGoPken27upXBwNHjDs2iFhmRwa033jUBVhzJc36G OnNJdBU7G2GmRWqV2aTOz+ekgKq/DXnQkmb63OHj0toDCwApR0hIGbklvh6FsiC17PAGWG A3VAT13fRITa9dBOAKY1dSn0nRKcw4ZxfesdE5N9V6rIf7z61y8UiPVk622gcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747319285; 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=se1Y/2bO+dvWwehIubJiA1Cr7vj3B340IG6FkDAap40=; b=b5Yklpiz5ERxYndMLh/o1HbOAF2+DTA81b+OEcOViHV0vEQ04QXrSb7J4IsFBTvNkXUn6S sg3o7pSgqjmkIlJ3LIDub8Dhht6eeMf6peLbURbSFivx+EMl2lv9e2uTi6ikBXfCrssi4r /jdoT6062kiZ2cXGwJx8QOoZFrdfsBw2vCodMvUwgL0ii0AvUT7NuaAd/hfdRn20pvQ4Uz UTaQO7MVPw1Mg9kRNcWiix9b8opoqV5YH1pJbxulr7ohkVuW8EL2ezz13gDgwbBJ9BEDEW 8k7F9Yjfz9IO0J76Rk7p/7Icp588Hb7vSAxKFnsCe0juYbExnl0BHuk1K0OoLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747319285; a=rsa-sha256; cv=none; b=f2QkGvV014yXOd2j/USqTvqzmnmsiE4GFA/V+meucXqlaX/oxHiJJ4jju6AHcgT0M1deVO 1v+zWUVz8SnAyKrWoO57L/dPnEMDVn2FsxGQP4RAc9jdhlI/nxGedsdkUeUy9P+i63JEGr fUCebom/2Mdcb+/kFcEqqbUA2AA4U1mYgYIhDN5Rt9RyvoXlkI6adlyqaP1ZORAMwQOjbx NjXMqAcXWNXtlRGQq12hGJsKY5huB75dmq8HAKczj41jV4kUWFbp4XzgjMQ8oxCjTnfqqq AC5LJeVCdY4nrXYoLbp5Sp3hAkpenJMNoyD/YAyTl8CDnfrZN7stv1JM3A85Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zysxw6h8sz6NM; Thu, 15 May 2025 14:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54FES4lo059289; Thu, 15 May 2025 14:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FES4lx059286; Thu, 15 May 2025 14:28:04 GMT (envelope-from git) Date: Thu, 15 May 2025 14:28:04 GMT Message-Id: <202505151428.54FES4lx059286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 1fd80186c91d - main - Revert commit 1935cc945642 ("vfs: vntblinit(): Rework comments on...") List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fd80186c91d847532e8354b81d03f17c9fcf650 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1fd80186c91d847532e8354b81d03f17c9fcf650 commit 1fd80186c91d847532e8354b81d03f17c9fcf650 Author: Olivier Certner AuthorDate: 2025-05-15 14:26:02 +0000 Commit: Olivier Certner CommitDate: 2025-05-15 14:27:23 +0000 Revert commit 1935cc945642 ("vfs: vntblinit(): Rework comments on...") This is because the Differential Revision tag was wrong. Will be recommitted shortly. --- sys/kern/vfs_subr.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 769586ad0d6b..5fdd4b6c2474 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -757,15 +757,15 @@ vntblinit(void *dummy __unused) int cpu, physvnodes, virtvnodes; /* - * 'desiredvnodes' is the minimum of a function of the physical memory - * size and another of the kernel heap size (UMA limit, a portion of the - * KVA). - * - * Currently, on 64-bit platforms, 'desiredvnodes' is set to - * 'virtvnodes' up to a physical memory cutoff of ~1674MB, after which - * 'physvnodes' applies instead. With the current automatic tuning for - * 'maxfiles' (32 files/MB), 'desiredvnodes' becomes smaller than it at - * ~5136MB. + * Desiredvnodes is a function of the physical memory size and the + * kernel's heap size. Generally speaking, it scales with the + * physical memory size. The ratio of desiredvnodes to the physical + * memory size is 1:16 until desiredvnodes exceeds 98,304. + * Thereafter, the + * marginal ratio of desiredvnodes to the physical memory size is + * 1:64. However, desiredvnodes is limited by the kernel's heap + * size. The memory required by desiredvnodes vnodes and vm objects + * must not exceed 1/10th of the kernel's heap size. */ physvnodes = maxproc + pgtok(vm_cnt.v_page_count) / 64 + 3 * min(98304 * 16, pgtok(vm_cnt.v_page_count)) / 64;