From nobody Wed May 21 10:08:32 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 4b2Rvh4Mb5z5x9B6; Wed, 21 May 2025 10:08:32 +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 4b2Rvh32ZLz3DZT; Wed, 21 May 2025 10:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747822112; 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=Rt+zudFvqoqt4kBX9fPWd0AIZu/QUiM6fgllP8BKEC8=; b=V42D4IgNRoV8KtNfrvataNNQlEt6o5J38Xg+sy4cLn8aUyB91eEKUoRbMB/m7mU/6J5RlK Gb8n7EofkQlS5zG2fad0qVviEREyIwCi8r2y3Qvv9P+i5Kxlym0HL2erocbWq+S+lJ1Kyo WbtjSPnK7VC5GyITOKrjENiD3GodhtISqEO3vmxNxZy+TFAQ5GtmoGfRsmv2nFZj8+EU0T WUMhCgpGRR7N7HhZNyr8Qv47FXIAJ7CnwRMPMXDYHYVa0VqPppGpaquzkmSLU9TpRXM7sy 5CX2G6dJTovyDwvhsjHqkOxVgev4mpE/hWoKZXNXZZeJw7Fq3Lk7fkgMxc3CEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747822112; 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=Rt+zudFvqoqt4kBX9fPWd0AIZu/QUiM6fgllP8BKEC8=; b=PFKyXApUhHkKQfQPnoz0iUtjQl8mXTLExmW/gq2I/P0OHLlN6qpIqVFTtcBI8gxsJtvxWM JVnu8h/buBf/ncTMEF3EgL8O3ymoYCwMIZFNyIZTvjyv8awBsZPbURjz0gmvpjUpSKYOMd mXzPD+5EtGHtwZYm30/tV0L2c7w3rJCO/NGbxL3MMfG9DGTXVEPr7wx/sFGPbVoT4yPatW WhTJVfHeJZrFhFUR1M5QhuDA5pJCXgfYh9/oeCyuePDZ/70/soJkbzFMpqFMUAeAvaDNJu ODnXYNVF9z6Xzpu4MiYban2gnD7G7xm3vtJ1QH6dlmjxWxRqBCGBPFrOesVYww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747822112; a=rsa-sha256; cv=none; b=g6qFSX/62ZSiVBv3rD7glybRBpFVx68ivKbf18U0asdPINfJz/zNKSYBEMin2KYopTk7iP 2gc8DC9alPoELSulaQfvdwEDSD+saG157GOu+6/yPxYvCiyj15iJNtks9NAgM35RxcMCEB OaEEdvRRzZLGJOuROVLaieDnvC+I6UnMGcjj1cQNvud99PhATTjVw7SLKf2+fW9vWoE5Ib Ke4KdVsXSuuQ0zLprHeSAu7DDfT5aBPGAX9XrYFnPBk23o+/gX4LIIgPiUa1w+/R9biEvW 3LXDOa+Cw5haIxnU+fWyzPdLhBZD8+xESnUGEByAogPAsZhutetxuq5eTFqFgg== 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 4b2Rvh2WLgzVQx; Wed, 21 May 2025 10:08:32 +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 54LA8WHp011871; Wed, 21 May 2025 10:08:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LA8WPS011868; Wed, 21 May 2025 10:08:32 GMT (envelope-from git) Date: Wed, 21 May 2025 10:08:32 GMT Message-Id: <202505211008.54LA8WPS011868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 6b6d6448feff - releng/14.3 - 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/releng/14.3 X-Git-Reftype: branch X-Git-Commit: 6b6d6448feff482a8dc022d1992e7f602522d4fa Auto-Submitted: auto-generated The branch releng/14.3 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6b6d6448feff482a8dc022d1992e7f602522d4fa commit 6b6d6448feff482a8dc022d1992e7f602522d4fa Author: Olivier Certner AuthorDate: 2025-05-12 12:19:56 +0000 Commit: Olivier Certner CommitDate: 2025-05-21 10:07:52 +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 (cherry picked from commit e9baf472a6d228a16be19a11150d41cff29affe8) (cherry picked from commit a6b05a35ce3c516cadfca49c310dffaabbe40440) Approved by: re (cperciva) --- 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 62ae987a3084..7ff6ac5f5b44 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -727,13 +727,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);