From nobody Fri Oct 13 23:54: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 4S6jyc2N4zz4wyQN; Fri, 13 Oct 2023 23:54: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 4S6jyc1nhwz3KWj; Fri, 13 Oct 2023 23:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697241240; 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=3lcwD7zOWSFc603hIGOuTYygnqx0pPK1jQRa3XZCZ7c=; b=AolNkOw9bZj6iCd8OIE6mufNKiTkC0JzDl5Tm1GRQD3Cc0pjZA5MskdPP/JOzsnUIVYE9n 1YuJPqLwrD/MtJ8e6qnCpd6qe54oTfO4v0F111fTq0LQOT7KWMS7lpBxo3OKUjcMCfbjAQ 5JNrXHY6yStTNHhkXh94CgaU7dmTOdWhhqi2w9cnzHuaDqyTQ7Y/SDopeioUEdKjB0GoV0 y68e23Sbj+N7TyjMf31YLvna+Afkezf64e+hI14q+K94Rk878uv+Fpcd6yJUSoa+BoE5C4 3ik7lB0mk7rgvk8+Xvr+s2wa4I+OFoYL0vBTiaAweCk9z/81oXDw0R09f+Ljig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697241240; a=rsa-sha256; cv=none; b=LArDykcMe/AUgkYJBbUAFNESKY3U6+7T91FyTjB36ol0fokwFNcPyL0UkYaNQpNJeDe6D/ QDXiethWUcOJQQ15E99/LD/nDVyNw3gYktGeFwUfoenPxBn0mKeDf+z+yQ60jZ/SbN3L9L ciDMr/hwENmPLkgQzNuxa6W3eCSW1bIWGSl8d0hl2iRehlclSC1uzQDD1+MHogaGOGL485 3MFDYmTnzcA/yfqXZb2yr4JB5A7oceIzM6rR7FpekERJSCNfUDwksDsgcvNNcrD4rQyDZI MfvSbFgXJKxhuwDLoFJytHLBj+FJ1yiqA7BXCxqPK3M4ca9y7DuzatuyjwemPw== 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=1697241240; 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=3lcwD7zOWSFc603hIGOuTYygnqx0pPK1jQRa3XZCZ7c=; b=B5fPfgBC4winElRAGVBeXUXtO6Mdd8/lG3sh9YW0qZLFjpC8sKlWhsjaVePPx3avjytY0g OGZqMuixpNhwf+dMBQeKgRb40rIxlIBs9MQukV84YZ4jSHkGK/3oPppDtX2eldjRm+jgWb gcwdxPdRNKvx361D1fIRWHLVMcXhVHcDN37Fonq/ie0kUDgodOZSOh2ZBEe2XXMHZo6I1C XbNohDm10qK6Pz8WSiJ3GT+Dd7pAYg71eLrGLxORs+5pJAyp3/moQLXB46vAgZNIHkSpcz vsf6wpVhfTjoeOh69oL8OFGxMiXRY6BFnEgOYgCrLrHjXGoVVRFrofKQ0T95SQ== 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 4S6jyc0k4pz17Vs; Fri, 13 Oct 2023 23:54: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 39DNs0AF032494; Fri, 13 Oct 2023 23:54:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DNs0Fe032485; Fri, 13 Oct 2023 23:54:00 GMT (envelope-from git) Date: Fri, 13 Oct 2023 23:54:00 GMT Message-Id: <202310132354.39DNs0Fe032485@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: 46d5611b8796 - stable/13 - vfs: count calls to uma_reclaim in vnlru 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/13 X-Git-Reftype: branch X-Git-Commit: 46d5611b8796328b4e326c319cd896f6cd1600f4 Auto-Submitted: auto-generated The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=46d5611b8796328b4e326c319cd896f6cd1600f4 commit 46d5611b8796328b4e326c319cd896f6cd1600f4 Author: Mateusz Guzik AuthorDate: 2023-10-11 22:48:03 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-13 23:48:14 +0000 vfs: count calls to uma_reclaim in vnlru (cherry picked from commit bb679b0c49094757f2aef3d8fe46c41dc8192fea) --- sys/kern/vfs_subr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index a8e4714a7a79..2be83da5d73f 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1728,6 +1728,10 @@ vnlru_proc_light(void) return (true); } +static u_long uma_reclaim_calls; +SYSCTL_ULONG(_vfs_vnode_vnlru, OID_AUTO, uma_reclaim_calls, CTLFLAG_RD | CTLFLAG_STATS, + &uma_reclaim_calls, 0, "Number of calls to uma_reclaim"); + static void vnlru_proc(void) { @@ -1818,8 +1822,10 @@ vnlru_proc(void) * this happens. */ if (onumvnodes + VNLRU_COUNT_SLOP + 1000 > desiredvnodes && - numvnodes <= desiredvnodes) + numvnodes <= desiredvnodes) { + uma_reclaim_calls++; uma_reclaim(UMA_RECLAIM_DRAIN); + } if (done == 0) { if (force == 0 || force == 1) { force = 2;