From nobody Sat Oct 14 01:08:50 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 4S6lcy5NXGz4x46M; Sat, 14 Oct 2023 01:08:50 +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 4S6lcy4bZJz3XQT; Sat, 14 Oct 2023 01:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697245730; 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=97KLi29q3OMK6UAL7v/TWN6A6QNPIyuSI/U6tWFwBW4=; b=UHEq46yQyB/O40v7UpOadIQSO4fpUb3Z9n5mQgEFGE7AApoKUKhSR0xnr5yMvPAOS0XmyK AGg9SKZ3bdyAzfGdiVd9KfICJAsS9dgD+EoJIeXx/SUCI9HliGBS7q+4NWzpzfK7+Af34D SWZ7m2ET5exAMCWY+9JYXzWYQkje/nD6lyr+iwSrs8ShcgIIRTJfZGdek+9KxfwxQHV21J k7GwVjJ0jCyygKDFmH/OHDvqLlnFnCY56R1tIwGzcKaz3vF9BUTzd93jN7j2JpmaqYuDLX H7fBReInX0zsRc2SKeWbFHJtHdJ+EJUxzTe95sQjetz4k9Cf2etpsDVchwGtmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697245730; a=rsa-sha256; cv=none; b=NojSJxK7bzJZThfxL76OZ8tJcAsIHo+Yny9EEpIV24t6tkecVs5q6h2bGoqFnsgpJm2IbD ueAVUG7dkN78ZCWcwNYKS+kJ611kbPzXzrQfbgjeRsrTm2lajHVN9JkKDEQcN0k/Q/Zmpj aF5jnYIZp7cEBivSI6zLhZiIaCeHPI4Imt8k/fdmrC3ECqgP7FcW5IfLj5Usbsbq6VjD8o 7KoV4H4Od5wLIEqoCVAJOlvVEWtMROGe6opDsleGtw9f/FxdOZUptQCnHfYHwvpmOEG37V hZ/+i3pk5vyLmXOGLpFladPRGPxpZF4oPjgisT8bGeYGXknaVr7el9/ATEXunQ== 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=1697245730; 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=97KLi29q3OMK6UAL7v/TWN6A6QNPIyuSI/U6tWFwBW4=; b=yXxWlo69+0MXJtggnBk/XKK8zv+OnsQX2I/e/74DlTtrC2vYvo3oWo9hAy09vptkv9MTgP 8pdVRQ+GOvELa+aEGxh0a8E06TLXLZJMFzYGO6gDd2y9ERmkj9fVZvJFrO/K34yDYVEuzz UgPUppOQBgB0Wm93jCDq77TCHpkON6iamVoGv5d9ujSMwWWcaxu5jvkQXJtZCC9/hMBZyb VM+I/76sv//xOUEKlI4Y8e2tWBMQT62bitpzEnN/nlCbx+ClnHAjZJb62Hnk7DNIrZPdAQ d5CHPWESTN+VHALNGCj2WXwLuQ2VEm/tnKcYdXqu69CSORHobmANVefLSjp8fQ== 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 4S6lcy3j4Jz191L; Sat, 14 Oct 2023 01:08:50 +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 39E18ouY052300; Sat, 14 Oct 2023 01:08:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39E18oNi052297; Sat, 14 Oct 2023 01:08:50 GMT (envelope-from git) Date: Sat, 14 Oct 2023 01:08:50 GMT Message-Id: <202310140108.39E18oNi052297@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: 3e0c37999a5e - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 3e0c37999a5e6bd10819140e52a481cb798f82d9 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=3e0c37999a5e6bd10819140e52a481cb798f82d9 commit 3e0c37999a5e6bd10819140e52a481cb798f82d9 Author: Mateusz Guzik AuthorDate: 2023-09-14 16:13:01 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-14 01:07:07 +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) (cherry picked from commit 71a06765dc67090735293027136c8a0b5fc8c173) Approved by: re (gjb) --- 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 0251525a50c7..e37f8697efa2 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1802,11 +1802,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