From nobody Sun Sep 24 21:47:00 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 4Rv02r3ygRz4tX8V; Sun, 24 Sep 2023 21:47:00 +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 4Rv02r3GV5z4ZlT; Sun, 24 Sep 2023 21:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695592020; 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=IkOOMavPEF2MoCTd1EjBLxVTuZyUHv46UiBPaxpquwU=; b=NErU4Xx5qcYLg+ScnTiml8w1GulXJn7kqsSgsYDj0HMwelUdFv+qe79EqBkjdLmVqyv7SQ BqOkmGjzfP6FU0VmE0gFgPbVChiyGjc2K5VeDE7FUFmou0CtIDRFMSz01FhFRdJBrf05t8 vVv9grZxxFgZoe7ELj5Py2SGOZw2kBCC6CqFvB4X190RpqUBZ0WIZhj6RlBWMy+vR4Dx4W 2Q66gi/hsEXANgGVGGk4mMGF7q0aTGJS06woc15RaDfvKy7l7A8Qnf03zj8pJ23R+wmFAL x+ybXphzBLp6Z2cupgpWlOnXkTrRE/rIjczj+lxpFimeQL0ALY2uypqq3D8VRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695592020; a=rsa-sha256; cv=none; b=PHmhkTfotLaxOalIF9+BnlnWIZ7mM5ifliED35OASIBWjDgdM+wmFamwGKuPa/5X9r3plF 5zwdqhBTZTw8OoE/mwpgss8VPEokzu2msDI3mMmoKMdpZUMBF+N7qoohtr8OCVcF5mjDvc X8jLWP3b2r+oQJ49jJqLqWdR3jpHArsQJhaKHYJ9MPpf+pzkHl8JwDes2uIxRr5FmNXSiF Cdi6c0PJg6Bw6p+vLCXVZdlGUv2l0MZh/1otr2b7iki8zCxF8pACtfrOtxjeoiV2JilXlh EH1nuZi0JFtYbouhmeTuXE84gB30b/ZykMx7banHF+MgSDBcZU6isDR1Igk7HA== 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=1695592020; 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=IkOOMavPEF2MoCTd1EjBLxVTuZyUHv46UiBPaxpquwU=; b=UH/C8xa5lkvX4/Wj2dbU1jp5GgNjEkeYxMI/4vMqb20ywS1QFSCeaYdoy9T4pLFzkrfkod T9je6MC9M8BXe/qie6R1xIHWzVtv8QnSEo9XtAjTVSswo+2wbOI85Q+DyvNF5kFyNkugBi xEKLTVYowhL+sFMp9VlUfVMujtuPrHethBHKyGGXn7EDTg6uns1xtS8R4dKtriJYTH0Xrm y4XK9u2Nsj+P9zU9udPut++iySd2c9gij3GaTkpfR5dsPfwIVzwt6kgrOa767LDl3Iorlf R0qK0SsaUQFXqdVJaJz6lXjLKcDLXp5WhPcl8Z+tnwGDP0bH0fHvrupoTqvNHA== 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 4Rv02r27l5z13dQ; Sun, 24 Sep 2023 21:47:00 +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 38OLl0b2030882; Sun, 24 Sep 2023 21:47:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OLl0pp030879; Sun, 24 Sep 2023 21:47:00 GMT (envelope-from git) Date: Sun, 24 Sep 2023 21:47:00 GMT Message-Id: <202309242147.38OLl0pp030879@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: 0e60950b4a44 - releng/14.0 - vfs: stabilize freevnodes_old 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: 0e60950b4a44bf10b4994c256546d0820f9fe137 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=0e60950b4a44bf10b4994c256546d0820f9fe137 commit 0e60950b4a44bf10b4994c256546d0820f9fe137 Author: Mateusz Guzik AuthorDate: 2023-09-16 15:41:12 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-24 21:46:17 +0000 vfs: stabilize freevnodes_old In face of parallel callers. Approved by: re (gjb) (cherry picked from commit ef89b78bb1f60484cc743fa590d623ad896ca8e9) (cherry picked from commit 873b6cd6204376e844815b4698e0f674634bc1c0) --- sys/kern/vfs_subr.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 9d5b1b7e472e..11cdea5a7dc1 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1528,21 +1528,22 @@ vfs_freevnodes_dec(void) static u_long vnlru_read_freevnodes(void) { - long slop, rfreevnodes; + long slop, rfreevnodes, rfreevnodes_old; int cpu; rfreevnodes = atomic_load_long(&freevnodes); + rfreevnodes_old = atomic_load_long(&freevnodes_old); - if (rfreevnodes > freevnodes_old) - slop = rfreevnodes - freevnodes_old; + if (rfreevnodes > rfreevnodes_old) + slop = rfreevnodes - rfreevnodes_old; else - slop = freevnodes_old - rfreevnodes; + slop = rfreevnodes_old - rfreevnodes; if (slop < VNLRU_FREEVNODES_SLOP) return (rfreevnodes >= 0 ? rfreevnodes : 0); - freevnodes_old = rfreevnodes; CPU_FOREACH(cpu) { - freevnodes_old += cpuid_to_pcpu[cpu]->pc_vfs_freevnodes; + rfreevnodes += cpuid_to_pcpu[cpu]->pc_vfs_freevnodes; } + atomic_store_long(&freevnodes_old, rfreevnodes); return (freevnodes_old >= 0 ? freevnodes_old : 0); }