From nobody Sat Oct 14 01:08:55 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 4S6ld32DHRz4x4F3; Sat, 14 Oct 2023 01:08:55 +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 4S6ld31hvpz3XtR; Sat, 14 Oct 2023 01:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697245735; 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=KchxW948RNWM+2SjIwxgLhfdhnmgGnIqdC3ZxLsANro=; b=mFECYLbFC+Y2v44iXlryLSl9tAoyK3s0dg8KOV3slbMfVBwxL+99eXL1NCs3QhKAvvJuPo G4d2aR4+7KG9SqHlKA45Zq2Pgr5cVXzf0MFt44ynXY78H4zLXP/VXpkzpxvWt8lUIZpJg6 XsYFJlVIiR2ObUJc7vdBNh3X843KCl8pOV6omZAjyCQzhyK/Zn1K1WX07tZt8kY8C4vrdU IkG6xylM6FqtKllTY8Jsvc9jbnQq05z0aNuzlJJLUm37zHTrsllYxVvLCayshW2zBgpMRw cfgVj12zsFpkQrGUX7IsH1ReIwhMJK4gIuRObcLqAcZ/K+CxNH1/WzG82Y5C0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697245735; a=rsa-sha256; cv=none; b=Owo3WbPIUKo47MZdr+Or+rIXuNrUg22bx6He5RTbtlHjXPLruNPQAzVXEQF89z5NC7Clb5 GZuoohDgmW7mkfDZ4tAvdvnjt8nwXqYiAdpEOrCBYA/ZQds3+skudhaeKTFQXIb3vwfWgw lrqRlIhRRRhDvbWYPH12akPIXfJObGjpp3vV4mfYyvsmOavh4CXsfZwZEvOveBIm8Pme02 0iJugImQfgxbWu3o7CRYVGBX4YMNw2O+HlESADsnwsQHBBCwLaI3+2ZwKBOEtdevbCT8P5 eI2gwxwTieV9GL1y3/1YUmL5kVx/ScrXElgNdyCGxrWZ68Jp4dkErmp4YTe6Vg== 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=1697245735; 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=KchxW948RNWM+2SjIwxgLhfdhnmgGnIqdC3ZxLsANro=; b=eVIrfq6IgtMJUg5xd2F+wuJN9WAa3tTwxOKoesLwJsT/xqVIh94eW6FSJZ3DY9z08dO3VU BCOka68hEent3q+6DNaEVv991TrdLyhMzT3njW57ICpDuwY3K14LAvIxlLpOWXVPGcC43D Zvahw3E/1FSwQhqbyfp3cPOgM/Wg9XBc2R8DP3PXKH5R2xkIqJVTzI9CDKL6+/EemDCyFg xqrLTniHEcNlGeWZc5cLOz9cwnHQnMjoTMLPHy2dAdaOEMzEgQcVPke8IW6N9PGNxdMDJS oJMySjrIvEegYYbVA8G9+hW5fbHEX2lTJp17knSTniRP9xgvt60zMWQPt1bSzg== 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 4S6ld30dQpz19Fn; Sat, 14 Oct 2023 01:08:55 +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 39E18tAB052497; Sat, 14 Oct 2023 01:08:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39E18tnM052494; Sat, 14 Oct 2023 01:08:55 GMT (envelope-from git) Date: Sat, 14 Oct 2023 01:08:55 GMT Message-Id: <202310140108.39E18tnM052494@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: 421857921ab1 - releng/14.0 - vfs: don't recycle transiently excess vnodes 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: 421857921ab1a6219d665605b2c76ff4272e788a Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=421857921ab1a6219d665605b2c76ff4272e788a commit 421857921ab1a6219d665605b2c76ff4272e788a Author: Mateusz Guzik AuthorDate: 2023-10-11 06:39:48 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-14 01:07:42 +0000 vfs: don't recycle transiently excess vnodes Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit a4f753e812d8913e9be481c6dfa1574c7f032a56) (cherry picked from commit e3b2372a76c18551529e1aa43d185f602dccdbf1) Approved by: re (gjb) --- sys/kern/vfs_subr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 5834feff080c..52c14b4a234a 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1656,8 +1656,12 @@ vnlru_proc_light_pick(void) /* * vnode limit might have changed and now we may be at a significant * excess. Bail if we can't sort it out with free vnodes. + * + * Due to atomic updates the count can legitimately go above + * the limit for a short period, don't bother doing anything in + * that case. */ - if (rnumvnodes > desiredvnodes) { + if (rnumvnodes > desiredvnodes + 10) { if (rnumvnodes - rfreevnodes >= desiredvnodes || rfreevnodes <= wantfreevnodes) { return (-1); @@ -1734,7 +1738,7 @@ vnlru_proc(void) * adjusted using its sysctl, or emergency growth), first * try to reduce it by discarding from the free list. */ - if (rnumvnodes > desiredvnodes) { + if (rnumvnodes > desiredvnodes + 10) { vnlru_free_locked(rnumvnodes - desiredvnodes); mtx_lock(&vnode_list_mtx); rnumvnodes = atomic_load_long(&numvnodes);