From nobody Sun Sep 24 21:46:54 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 4Rv02k5jgvz4tX5r; Sun, 24 Sep 2023 21:46:54 +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 4Rv02k540tz4ZdB; Sun, 24 Sep 2023 21:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695592014; 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=XKddRBsCjmynQZduCxMigkMi0rlW1+07q8j3+RzMcqg=; b=XnAN1fQ/y6/F0kxczFj5RNUsEtSfOmcrq7Z3YDEzOhjjq4UYvqYhYKhDzZvnN5yVvpFRpH 5f6IBEjPDQi9LBbz+bX9r4VxF/BSlvrArkvlXo31zjtGkruidYId9pgsZ1AVUeHPVYfWn+ TK7dDs88Yq4iQG2nf9nF1G0vXWRtoyIrWxxELqLTC8TnyR4hhN4Hr8E08TaDIZ98J+DXoD RH/56jF0f2VytK/iAjbZBk4qEZtJFMeOl2jkBC0wa20WuUAxiSY1eztrsS50KcBiSbxXEX LfMQ8c4M8NJet6RTVO3WwVsAAlW62Hm1nz03Z4+VoICFa+CqVjOr0i46P9auVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695592014; a=rsa-sha256; cv=none; b=fLmhSjGi6I05RawIgHu0J8GSVXQQBrv/1tyc1IpfFM3MqkCfSuAaLPGLVnA/aLQQqrMNAd Mc3p/jqCiSzvu/rkGAiGBBIJkgpNFo0755lQ1d7BUOHs7PP0MGOOUZm3VUgVod3JtOaf97 jyE/sMA92V8hpMZXCNQNE8VkrYp+WuC/+THqMgZj499DeGLVQNPqfJ/Ku1VVhg+qqiT+D4 vQe0i+6mqwI9PgSXpuEc+/yEKJ/DQv5dhUnU92wurUnp2PNobBpMW5EgkJiI48XwfLJyax RaLYU13zO6xXTnlS/hhOf1Q8ym7ZbpdZcvXYg5kA2JR9ny0Qz7gEN2Hj9BcbrA== 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=1695592014; 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=XKddRBsCjmynQZduCxMigkMi0rlW1+07q8j3+RzMcqg=; b=NR8dYkaq6qT5t/N/Bkew3o4zliKWhn65jb0eR0+i7tvjt8w+tgEkCuwoYB6207oio9pfy9 x8QbyNT6hb4zRAccScTGps6Frfh8IG3mcEQ3UQ8D7GP0vQrL4dK8mXjUyP+XObNxwbr51I 2l1RQzbUL1tiOxdV4yHk0lVjHFN98qvNpLjcW9oc9ZYuVIjuY6bpR0GChbmDZvkBoHGIsG 45FYJY+GhycFu18KtwU40ZNZdLauOyPwVEWWtcLJEvM0DowhVJCJOjHAZOjc+dBl8r0s79 2idlQSCgCIHwQwU2kq0Dq+zOD2dXqSNVq6dvEZ5WigNllCAc4fb6ku3JVGYjzQ== 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 4Rv02k48dFz13j1; Sun, 24 Sep 2023 21:46:54 +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 38OLksR2030659; Sun, 24 Sep 2023 21:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OLksT7030656; Sun, 24 Sep 2023 21:46:54 GMT (envelope-from git) Date: Sun, 24 Sep 2023 21:46:54 GMT Message-Id: <202309242146.38OLksT7030656@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: f4f4f48e1293 - releng/14.0 - vfs: retire vnlru_under_unlocked 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: f4f4f48e12931f73565790c54f6ae2d54cf92d35 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=f4f4f48e12931f73565790c54f6ae2d54cf92d35 commit f4f4f48e12931f73565790c54f6ae2d54cf92d35 Author: Mateusz Guzik AuthorDate: 2023-09-14 23:05:51 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-24 21:45:56 +0000 vfs: retire vnlru_under_unlocked It only looks at the centralized value which in corner cases can end up being negative. Approved by: re (gjb) (cherry picked from commit ba5dc166e0f390c703042910b637a83c705c8af3) (cherry picked from commit b5210f3fb26031e24f2f4c465aa3eab64002353a) --- sys/kern/vfs_subr.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index ed478d33aed0..84219f3b5c12 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1528,23 +1528,6 @@ vnlru_under(u_long rnumvnodes, u_long limit) return (space < limit); } -static bool -vnlru_under_unlocked(u_long rnumvnodes, u_long limit) -{ - long rfreevnodes, space; - - if (__predict_false(rnumvnodes > desiredvnodes)) - return (true); - - space = desiredvnodes - rnumvnodes; - if (space < limit) { - rfreevnodes = atomic_load_long(&freevnodes); - if (rfreevnodes > wantfreevnodes) - space += rfreevnodes - wantfreevnodes; - } - return (space < limit); -} - static void vnlru_kick_locked(void) { @@ -1826,7 +1809,7 @@ vn_alloc(struct mount *mp) if (__predict_false(vn_alloc_cyclecount != 0)) return (vn_alloc_hard(mp)); rnumvnodes = atomic_fetchadd_long(&numvnodes, 1) + 1; - if (__predict_false(vnlru_under_unlocked(rnumvnodes, vlowat))) { + if (__predict_false(vnlru_under(rnumvnodes, vlowat))) { atomic_subtract_long(&numvnodes, 1); return (vn_alloc_hard(mp)); }