From nobody Thu May 15 15:57:29 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 4Zyvx53SF2z5wXSC; Thu, 15 May 2025 15:57:29 +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 4Zyvx52WhPz4NlB; Thu, 15 May 2025 15:57:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747324649; 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=Z7BOYFQORHdw6Xt6R4FEJFBcE8g47YF39RihnW1YzZY=; b=f7IdgZ6TWlMukCwjFFTCPCKSytr9pK+zhQvLnmEGLwuoJTNfRMYXpx838KzYI5FmZkc5gg HgKJW6vuZj787AMGEUrk6vVlAJkJijIT+6rdZf7h+3vDlSYkb/CC2Kah1kgklUlc7oodL0 YTm6oEG5T3pYynFMr8YrvEJgpt0Qldcekx1WDiLstpSQi0KlQG5oroid9XTIlgtuKk5EnP kltPV2NuCxzEad6BT4X4fvFwsirzIDj0DOfEp/awuaJ3tUrxyy0dsK/p6R/0VvOMId7gXQ JCJ4Dz+Ijn4vqBG0hmQd5JzHHvWulYIpVxYP8um74CXJ1/1A3VguFdXXqGJUuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747324649; 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=Z7BOYFQORHdw6Xt6R4FEJFBcE8g47YF39RihnW1YzZY=; b=qRBWoZZZfcSW5X/s3ruJvM88FE2zB1o0zVfkWK/GP7TUtHjSpXp3QRpdFbc/fnHDzFo+vJ cpeN1ICqf/pRY9aqdu6yt4jKaO9gVAbI1J/BGTHzo0gSocr8vPM9dMv11RToH/No4GnduI yxZ/Ds0sdeqehKV/CoU8ubnIUOYe+vUf0qXekYn5zjd68dgh970vf2tHTDLQJBQY4jUJfj A0mZ3ibadG74nSYdKoopZHfnLZIfz3qpzRFoii8KO4VIE+EJ5c/eCMJEgzoSm8MjXaOmKP OyYuF5pDdSsh4ETjRKnfBDIE1Ozj1TsiIqxg61ZWFzn+YRTwY4qc2XgelSYWrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747324649; a=rsa-sha256; cv=none; b=yHkOqki5MMT00+JVleybEItMu2aDnYglDrvCKbBBJfH39gWY5WrfFCtady9A6CXfw2fHbP i+ru6Pm2pBjG1sIBwPETTD9odHCrKL1vJ+Xp8jkcynKVenFB17FoX01D10ZxRF4/6/Si1l m/cAkK0D51VRYcnCcBweTUfYaBby5JRuIYsOru1zcaH/Z6z+9mhkXjCjwRfItA4Tdfrt9l gLGHDKb0Hx4z5S2kJlRyBaVPXy0w7zqOZ2ffyvPMfA7mL5D8bQPJFg5ln/z5lEvid+DE2m D872gaM8DLYFHdrN/mSjjHdzdKgwNC+jmB4DN8pICWFxVd3VMJ9PtUd350ltOg== 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 4Zyvx51wtkz8f8; Thu, 15 May 2025 15:57:29 +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 54FFvT4M027766; Thu, 15 May 2025 15:57:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FFvT3t027763; Thu, 15 May 2025 15:57:29 GMT (envelope-from git) Date: Thu, 15 May 2025 15:57:29 GMT Message-Id: <202505151557.54FFvT3t027763@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: e9baf472a6d2 - main - vfs: vntblinit(): Raise default 'kern.maxvnodes' higher than 'kern.maxfiles' 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9baf472a6d228a16be19a11150d41cff29affe8 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=e9baf472a6d228a16be19a11150d41cff29affe8 commit e9baf472a6d228a16be19a11150d41cff29affe8 Author: Olivier Certner AuthorDate: 2025-05-12 12:19:56 +0000 Commit: Olivier Certner CommitDate: 2025-05-15 15:53:21 +0000 vfs: vntblinit(): Raise default 'kern.maxvnodes' higher than 'kern.maxfiles' Having 'kern.maxvnodes' higher than 'kern.maxfiles' mitigates a scenario where some processes can eat up all vnodes in the system, causing a deadlock, as long as the kernel itself does not create too many vnodes without creating some file descriptor in some process' FD table. A very small percentage (~0.6%) of excess vnodes at infinity, coupled with a large difference near the origin, should cover basic cases more than enough. Note however that this measure can be defeated, e.g., by using nullfs mounts with non-trivial file hierarchies. MFC after: 5 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50314 --- sys/kern/vfs_subr.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 769586ad0d6b..0464df2f5ad9 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -762,13 +762,12 @@ vntblinit(void *dummy __unused) * KVA). * * Currently, on 64-bit platforms, 'desiredvnodes' is set to - * 'virtvnodes' up to a physical memory cutoff of ~1674MB, after which + * 'virtvnodes' up to a physical memory cutoff of ~1722MB, after which * 'physvnodes' applies instead. With the current automatic tuning for - * 'maxfiles' (32 files/MB), 'desiredvnodes' becomes smaller than it at - * ~5136MB. + * 'maxfiles' (32 files/MB), 'desiredvnodes' is always greater than it. */ - physvnodes = maxproc + pgtok(vm_cnt.v_page_count) / 64 + - 3 * min(98304 * 16, pgtok(vm_cnt.v_page_count)) / 64; + physvnodes = maxproc + pgtok(vm_cnt.v_page_count) / 32 + + min(98304 * 16, pgtok(vm_cnt.v_page_count)) / 32; virtvnodes = vm_kmem_size / (10 * (sizeof(struct vm_object) + sizeof(struct vnode) + NC_SZ * ncsizefactor + NFS_NCLNODE_SZ)); desiredvnodes = min(physvnodes, virtvnodes);