From nobody Fri Oct 13 23:53:52 2023 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 4S6jyS2mDnz4wyGB; Fri, 13 Oct 2023 23:53:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S6jyS22QHz3K4J; Fri, 13 Oct 2023 23:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697241232; 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=jDOGzXEp6kayZEXoFarpTwsMC6rbxIVPnkFy0cqaPj4=; b=vD1DEoghSMnVmQmedQNUYJb5Su6rr1uF4ilbyAXBuNHkFZuK/BTRnWWQW0ph9a5v+rXU0/ mMTi86fGRJGkEA51kPuHTSh4vwxkVB5y9mog+SLNS7/pvQ+wl7YVs/hrdkxQFi/MxPNDrV TQDVrq4rq8emffvA1bC+Ef/3TpHkYzHmKZ6ySE7XC2AX4jDa+GsK5CdB+7MDdvYFcZgpW1 nzQc1s2tLdQODWtTBgaI4OjqLH3zHkC0vqAmj7aLjmKvJrAWRhROVxRoShXTKMens+stn+ DFU1GDTxPlkhx7nuBf40xVOrc9MYkHTjkcERQY/6qd0ONgpXAu8fwC3qZJhJhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697241232; a=rsa-sha256; cv=none; b=Kg2E3byQpwqbZhMr+gSGqb/QWd7XjgGhEHpjXtPbpsPicdQFUq+hBGjjxjCB4niP3wOwJs jP3utYKltANjsvmIJxdgUSwZKvkflZNeBU4V9OSw/toZEVWWgH7uOVgUTcV1Pe2++C6Bp1 1rzJTnlofd4QfGnewLMERE0DZDb6u4I/2PkYXchyVFr5q0L6m+Tff7RZnyDfObsdWzbCRJ coF5C6zeabR6Nrjr7w4RY049lMbVpWo1Xt4K2tox/rZ6ngk28y+/GM+hEyOl5Wy3LZxlZ8 FOJ7R+JFwAx5ARPgA/LXovmHUe1+s9YcwOwBt6Fh3uF9rIC9bwowyUGvwlye9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697241232; 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=jDOGzXEp6kayZEXoFarpTwsMC6rbxIVPnkFy0cqaPj4=; b=b0sOg/GOq5czcR57ZnmA0rVFU1OPqqoYr2uPfHSAJxspZKe7j5g35qy6mzjTLDA9Dw1lw5 QynoeWrxeNq/r+9vzTdhMhpa5JvbR102Lzjh1z1nzBL6dW1vvoezrPXPa6J6lpqnPutYDv H41xRdD7rtjADirC+Pmt0itkpp3utcqIbsgLum8wEChfIWGD+WitfmIckTqaqBV3NgknAD i9idgmYix4AgOEP9WDOUXnSTV94HEd/uCsLY3/A0tqWjMwnLrfLjQLSQyyruBOgnBnN1M3 8sM6X+KG/d/ZCU2D4BCvTcpMojOwA3evFfeF4dy+62ynzKLasmaFTmUo+CR9Ng== 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 4S6jyS10X3z17ff; Fri, 13 Oct 2023 23:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39DNrqO4032114; Fri, 13 Oct 2023 23:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DNrq1v032111; Fri, 13 Oct 2023 23:53:52 GMT (envelope-from git) Date: Fri, 13 Oct 2023 23:53:52 GMT Message-Id: <202310132353.39DNrq1v032111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 233167b270c8 - stable/13 - vfs: don't provoke recycling non-free vnodes without a good reason 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 233167b270c828f63f9b724f0955ef7fd6484fb2 Auto-Submitted: auto-generated The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=233167b270c828f63f9b724f0955ef7fd6484fb2 commit 233167b270c828f63f9b724f0955ef7fd6484fb2 Author: Mateusz Guzik AuthorDate: 2023-09-14 16:13:01 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-13 23:48:13 +0000 vfs: don't provoke recycling non-free vnodes without a good reason If the total number of free vnodes is at or above target, there is no point creating more of them. Tested by: pho (in a bigger patch) (cherry picked from commit 8733bc277a383cf59f38a83956f4f523869cfc90) --- sys/kern/vfs_subr.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 7d8e6c6c6cc5..c5a99179af36 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1820,11 +1820,19 @@ vn_alloc_hard(struct mount *mp) mtx_unlock(&vnode_list_mtx); goto alloc; } - rfreevnodes = vnlru_read_freevnodes(); - if (vn_alloc_cyclecount++ >= rfreevnodes) { - vn_alloc_cyclecount = 0; - vstir = true; + + if (vn_alloc_cyclecount != 0) { + rfreevnodes = vnlru_read_freevnodes(); + if (rfreevnodes < wantfreevnodes) { + if (vn_alloc_cyclecount++ >= rfreevnodes) { + vn_alloc_cyclecount = 0; + vstir = true; + } + } else { + vn_alloc_cyclecount = 0; + } } + /* * Grow the vnode cache if it will not be above its target max * after growing. Otherwise, if the free list is nonempty, try