From nobody Fri Oct 13 23:43:10 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 4S6jk642CJz4wxrr; Fri, 13 Oct 2023 23:43:10 +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 4S6jk63Rd3z3FTf; Fri, 13 Oct 2023 23:43:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697240590; 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=6QTwsIPll5T9oRNpKZONgSR+hQiQolKgFw3gKNsO5og=; b=SWWJaNkloGKG8mwDKd3TlDXyj/WMTHz55rKX3tLcjL22DWcVDZEBEWIstqM4uGlEMcArbo 1l0oRBd1mAqVjSKvb7YybetrY8aWpOPDJUG/lANzlbjJD6lncJuJIg5hYeU2konS/Jxw/m 4cvKpARVriWIhTM4S25AyDlCuIYPJWG/3+mbDxcuyeKMR+7x6PegtOJak9TSAdrrGjNZ2d H3sPAoaJD7nEKihnpctEbrvc18LtFx+WBTu5O90Q6t0h0Dy/aUknfWOlu/rnC5IG5fZejL dwGvyoDSVzDpydJpXWxy+1+5PntN7SSV8ijUtwz4iK67avApTmPZQ2FCyK14BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697240590; a=rsa-sha256; cv=none; b=YzgYS22q/oH59wAigL2xv8JhfVQbfzBljro9kNEReQfPewNSGOK/wWJxymI/gpxmv0FGnu xLTAFbBoEwiGPZ2vRbtqdkoOSNMKtwRxrXhtXZ+Dvx2N4uuKsJRlYYsF4TI8bg+xTob370 MlV+VoDRuzSOhT8Pm5CwzyMsOOHnnx+9GnJ4oLy1NtcN9wpqI6p1fHza6ylll3DppTPY5t tk3D4a11LULfxjQIYUtR2Z7IlQdlIhb3rEcnBsbO3BsGvo3ttdnKn9Vv5JluH6Rb29O+EQ 6/lGM+MiLnFjCIQW1ksHIJ9NA0GvdCG+DUhzeSTO+7g8ans5liOjsnBereTMMA== 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=1697240590; 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=6QTwsIPll5T9oRNpKZONgSR+hQiQolKgFw3gKNsO5og=; b=QABeU7KdVOnojNRmuq+4f+HNWnpShuQY4Rjfm7vgeU+Y5j3tIOnzODVeF0AEcGcym4p0hr Taz063UgMZ2ThTs8OFjnjNrwNz69846cZSv9W5N2VtxVsqGxPTQUZDNAuCnE51ETSaB2IN do2aXD1fZ/JQrX/YqkeCrjAA2H1GE1SCunzk7DfOXOw6LB/ndiChQJ2teJmCm5wJWu0igq uht70fntbkh8UHLg473yDQBaGK69F6WL/SAZXqSImGSBXQA6Gyfnd1Zts7xeQ7aPMyQOWd 76zfj6RtS4oNuZ+nYrlEGEPuF5QEiAfilGNHYo9G4aqUHAkXGXalHA1XS3OCyw== 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 4S6jk62Tbsz17K2; Fri, 13 Oct 2023 23:43:10 +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 39DNhAjb014723; Fri, 13 Oct 2023 23:43:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DNhAEp014720; Fri, 13 Oct 2023 23:43:10 GMT (envelope-from git) Date: Fri, 13 Oct 2023 23:43:10 GMT Message-Id: <202310132343.39DNhAEp014720@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: 9ff38b3d881c - stable/14 - vfs: be less eager to call uma_reclaim(UMA_RECLAIM_DRAIN) 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: 9ff38b3d881ce910803500fe3460f8283c96b4b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=9ff38b3d881ce910803500fe3460f8283c96b4b2 commit 9ff38b3d881ce910803500fe3460f8283c96b4b2 Author: Mateusz Guzik AuthorDate: 2023-10-10 16:15:53 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-13 23:41:46 +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) --- 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) {