From nobody Sat Oct 14 01:08:58 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 4S6ld66GgHz4x46f; Sat, 14 Oct 2023 01:08:58 +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 4S6ld65Ds1z3YDM; Sat, 14 Oct 2023 01:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697245738; 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=9YW5Ze8cWpaZGNLNloJ0rpmAboxr7SDnJi9wYl/czTk=; b=duDFDcOpRNZJflsLi0GsTl6VKXoyRH56Kj4hcDSKTC7sJ8swTTNlvXHEwaVWQ9UnlAObAE Xd4REFEuHJa4ogxlpB4uYHc48EkIm+yv8U/txYZsAY0fdQUiRNfeV/7gFYKowEQovIN+8k FSN5iy1+a/2jal16km4uM+MtEeQeRbwM2KsHp2jbknSAT6uosXTK7atEor36Eve6IqaXwA N58z65PpSSnFXUjpBby5JBlXzgycbB0wpLm7PTP+VAn6587YB60vOgoWVS8sommreVFTaB BEUV9AtmGqj5ILYJNLt3bx4h92NT/3dnK5E23sjbm4ZMV+RBUo1+VKCW6Utd6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697245738; a=rsa-sha256; cv=none; b=l4obSg1MKwnpl1ICSid9yp9OPVLSVYOLDmKKM901Hu/vzTexiYYoQmLZr0B0Gq0QQHkOz7 G0iVrccW7OJtc1VYHGApQL4y2ndOKn8ia3ralrHH8HK5mNX6+Jdsf2GYhc4067oqM6cbsy F9NavVIE9t19ql0vwJeabliDiAgdhDjSeBKe5umA/qVF391qAawPp3cq6mYp60HnfeRC8C I1IDRaprLppn7IkZ/yHYWZSJjgOWdLSIvcU9E1p1zmtWKffLbs3D+uhkpLI2AdByy7aR69 gC2BFUS74Rpjrmkb8Ar4dpM818Uw/WivUAYuj4jebxCCWKdwI1ENzajFbhaOHA== 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=1697245738; 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=9YW5Ze8cWpaZGNLNloJ0rpmAboxr7SDnJi9wYl/czTk=; b=RRm0R7YgZoqRjHR05X9lnK8qZGOE9xMIyoxJdJCLx5WG6IAjzNzgJJxBJ62Dwe/ezJjD3R ZMzefeAnA4k3Z7iFLppa6BrVmZ+PvYGTrfNNlt10dY5QcCNx27bsk1CQw5puegBROg8zX+ dlqR0KY2ABJEgH0KzfGbIqkXDl4MHcS49ujjrD1sdtiMLCGL1p5sOuJwcIrmGYd3OQlA/n D2ZDhVXDWOT4SOEBnmOkbi3PVx0aokKgNrFTujI6LH3eQuhOH9GWQBpyFSeaUFTCbI3xTE kgCxmPlCzet2MA55pJ+5esgLW41fCGGKBDeoUL0s7wQ1t/9geKXQZ35ASBelNw== 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 4S6ld64Bb3z19RN; Sat, 14 Oct 2023 01:08:58 +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 39E18wWN052647; Sat, 14 Oct 2023 01:08:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39E18wPc052644; Sat, 14 Oct 2023 01:08:58 GMT (envelope-from git) Date: Sat, 14 Oct 2023 01:08:58 GMT Message-Id: <202310140108.39E18wPc052644@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: decacbe47c3e - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: decacbe47c3e5948638bf368a3ac3d68a5a9b95f Auto-Submitted: auto-generated The branch releng/14.0 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=decacbe47c3e5948638bf368a3ac3d68a5a9b95f commit decacbe47c3e5948638bf368a3ac3d68a5a9b95f Author: Mateusz Guzik AuthorDate: 2023-10-11 22:48:03 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-14 01:08:09 +0000 vfs: count calls to uma_reclaim in vnlru (cherry picked from commit bb679b0c49094757f2aef3d8fe46c41dc8192fea) (cherry picked from commit c1ffb1ffeeac1b3968bf3eae5195b49e1c33b542) Approved by: re (gjb) --- 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 d21ccb4251cd..01585ac9eefd 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1711,6 +1711,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) { @@ -1801,8 +1805,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;