From nobody Fri Oct 13 23:43:09 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 4S6jk52pP2z4wxlR; Fri, 13 Oct 2023 23:43:09 +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 4S6jk52NP1z3FNF; Fri, 13 Oct 2023 23:43:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697240589; 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=oS3S4jF46L0nNeT5ouqlpGRG1ZMdDZbFtLzsofIudr8=; b=mTon1p+GfeemulyC0euXxlfS+eeIiFrf4swomsDIvgogDAxA/XcXUSZU/RgEWuOUYa1nav 5LG/afSrkT+vTPNSRhBKSNrOeht+8cltSW7iiDxBscDN5v7tdT14djWa+X3i+KdUgBU+HE /Byz3ocI0avVb8ab7GFuC6pEJW+5ilZRU6UYSZ5V2ywtf8JWsy/AYDlnI5N9qNvjUKvvBV kLx1/Igp3nfwN1+3YL555FNrEqVVvJVC1akzencm6pv5EH9JWQFsQTP2CmV91gy2P8Rtjr aNQ+JETcV7V/mGZAfeIHX/tW7zdjRD9OQl7fCY1hLw1oQMjKoYviRjAcPvSohQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697240589; a=rsa-sha256; cv=none; b=fEfNlYNrx3bqKrUSx2E+zSZQTICeAUE+CBNcSKVGA6KYnuSFt1CSdZ6rQnpQLGDp1MzgFW 12gC/MB0Uui98qDAfRLR9GstyjQW4zKQw6SoXGkYq+oSl+fLNNjOa/G0eCDpbkJOIPEoqZ vRtp5KwXxdS3WcQUcWQoW5Dzpqk1Tih3sYTKlfY+9NY2sd5znRjqnStA3mgKFoIjZRcmB1 EBQ4LkP8TspeSfcLotkv7n4CVsm5EhscyK8BZy4cIonEhv1n3QeVM0vpnSdc+8CG/tYPn7 gkIeyb2ggU7QBpVi5zl8Mm8hFTJLCAMN6bQ0Hz9WWINIEve0XQeytAdz5Ej72g== 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=1697240589; 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=oS3S4jF46L0nNeT5ouqlpGRG1ZMdDZbFtLzsofIudr8=; b=IGKNDJ5xsFau9lFke0sMH6MsD8oTQ6u946UBPRQ/53VD1q6EJH18t2Rn8V5Ag1VmzqrqTs td8YFbBs3GdVADYghizThisZrE6zkMQo8PNS0G+f2Y7msEjussRyESN38Cbr6lVilLwpmT 7/uqmrSrDceosb2d5onbxo1ucP+FhAmSMjqpIOFHABqdM7cxwJ7hGk6dVFQoxCJuIXKuaE j4MwQ8lxibIJaZUQtFQMSfSvd059nRwaI7CxYA3wdBwrR3h6CY5D0ClsaTcvyCelizz6Dw 730AoatHVMTTauzlSBGVOohlcg8LK6O0ffkmVL+T5mU3c4xb92R6RgzwlQyOog== 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 4S6jk51Ry3z17Xj; Fri, 13 Oct 2023 23:43:09 +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 39DNh9sO014674; Fri, 13 Oct 2023 23:43:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DNh9FY014671; Fri, 13 Oct 2023 23:43:09 GMT (envelope-from git) Date: Fri, 13 Oct 2023 23:43:09 GMT Message-Id: <202310132343.39DNh9FY014671@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: 71a06765dc67 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 71a06765dc67090735293027136c8a0b5fc8c173 Auto-Submitted: auto-generated The branch stable/14 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=71a06765dc67090735293027136c8a0b5fc8c173 commit 71a06765dc67090735293027136c8a0b5fc8c173 Author: Mateusz Guzik AuthorDate: 2023-09-14 16:13:01 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-13 23:41:46 +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 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