From nobody Sat Oct 14 01:08:51 2023 X-Original-To: dev-commits-src-branches@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 4S6ld00YkHz4x48m; Sat, 14 Oct 2023 01:08: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 4S6lcz5n3Vz3Xc1; Sat, 14 Oct 2023 01:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697245731; 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=MbGDhZu+EmjLLG3A35SUGJHbe+QuKNqjbKud3Hl2Vwc=; b=kC3R20M71cGF6iu7NzSGGjcVFN7tHPAOFRoOxXk6yAQzBdSD1eSBpCmJx7h3irWvkXDJ8F qd9NibSV+cmFIG5sPPubUNPpJWmvyrv9/qr5wbkLnO1HBbwMYo7fpa40KbyYIrw2NtAzhf caMmp82Y2xFtwcn2lxTWAwuTs80hJjxQYtILVzgQC5Rn8zWRy0hsKzzHhsxdDa6EiaxGQ6 dDNpJY5548cdHiCehFuDOUSpnbnySrFv2rl5GZmVoSli4gPVHO59IB4c7cBJA2hgPgLoY+ Ffh+77PX4h266lm8kcCqiBfBpTxjYAHSAW+J2WoHpcFyomdmaD8JH/NrWV1qXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697245731; a=rsa-sha256; cv=none; b=qzziDWqE0xgYPMI3PQ5GBtf4s5F5pJlLQ4Ro9gufBGGX8Hgvd9YGcc0PpgWxtdZaX9bmv1 EHJo4vds7bVb/LfYxRZesp/gUWC3Cy9eTgi+y4sPKME6+Pr+iYQDMDmhWdZb3PxdiBVVgb YE5SifjfkyrJpP8ouqYK0ss6zZG/XkYqEzg4ZRnzhZGUr5Eojb0a1mbYoJ37BDAUNwma4j ARiAyyKER16Ql3x27BkmHQj9NMShsoL4z8PUXgFeXHOzA5NQaEd9sXyO9XSvqe3mvzXmd2 CT8t43qdeMuxHM8nStPnsha33uWDbuu6jUtxVIEyCcyreKBH8P6BDYMvuuVSxg== 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=1697245731; 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=MbGDhZu+EmjLLG3A35SUGJHbe+QuKNqjbKud3Hl2Vwc=; b=nKGu4ouzqUAMcYNOZ9qTUnjfb7b4xl+xLyMIiMSXG+dgvePGk43iOnsaWY2zXpRd+wGiKg LooyHX73PJn7hpn0MXk+L6WfVtnkzxKekPG3khBAr/nCknKQhNDBcveXZpy+4YWfh54WON boHVboaMEJaiBXYgpocbVzg9h47uvTQCyqOWnaZe8VSqgohRZfpMOxjpjRscIQrzadAGGa 1VctAAblY5JXAYFq1bAyfwYx0ZJdl241XybF79bBtik/RmOXnf5h2oVQxObm0Ajcw/zohE QjWiEWO23rseYtgJQrjncmGXSWypwc+A7e28/MZThKCEFzkK3izKJAhfmteOxw== 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 4S6lcz4n3rz193Q; Sat, 14 Oct 2023 01:08:51 +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 39E18p3n052348; Sat, 14 Oct 2023 01:08:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39E18pmV052345; Sat, 14 Oct 2023 01:08:51 GMT (envelope-from git) Date: Sat, 14 Oct 2023 01:08:51 GMT Message-Id: <202310140108.39E18pmV052345@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: 988f3becc6d4 - releng/14.0 - vfs: be less eager to call uma_reclaim(UMA_RECLAIM_DRAIN) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 988f3becc6d4afdb5c12313184515183c3e631db Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=988f3becc6d4afdb5c12313184515183c3e631db commit 988f3becc6d4afdb5c12313184515183c3e631db Author: Mateusz Guzik AuthorDate: 2023-10-10 16:15:53 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-14 01:07:15 +0000 vfs: be less eager to call uma_reclaim(UMA_RECLAIM_DRAIN) In face of vnode shortage the count very easily can go few units above the limit before going back down. Calling uma_reclaim results in massive amount of work which in this case is not warranted. Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 1bf55a739e754765fa2dc15ab6481fe411084be3) (cherry picked from commit 9ff38b3d881ce910803500fe3460f8283c96b4b2) Approved by: re (gjb) --- sys/kern/vfs_subr.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index e37f8697efa2..e7e612254ba2 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1674,7 +1674,12 @@ vnlru_proc(void) target = target / 10 + 1; done = vlrureclaim(reclaim_nc_src, trigger, target); mtx_unlock(&vnode_list_mtx); - if (onumvnodes > desiredvnodes && numvnodes <= desiredvnodes) + /* + * Total number of vnodes can transiently go slightly above the + * limit (see vn_alloc_hard), no need to call uma_reclaim if + * this happens. + */ + if (onumvnodes + 1000 > desiredvnodes && numvnodes <= desiredvnodes) uma_reclaim(UMA_RECLAIM_DRAIN); if (done == 0) { if (force == 0 || force == 1) {