From nobody Fri Oct 13 23:43:19 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 4S6jkH50YWz4wy0p; Fri, 13 Oct 2023 23:43:19 +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 4S6jkH4QK8z3G7T; Fri, 13 Oct 2023 23:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697240599; 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=XjvxXVjYfB5QEcpXXTUD8O1y8y36LJ7GIkqD2ghEGgQ=; b=DzICAtFngWswChI3q1Qh/6x52YgmxGsmZvrzX9y9juvb6lqXWjZf2f85DQ7DUz5Lk/Ei3c UUNxzdR5VKBxuuto3qsrJanhyTLrsZTUtj8JqcEBebez2PyAYw7AEvFE1FdOIxtPdzyVg8 L8vROFd6E6z30hHlhgMrOUaj9PAmM9NT81+CuJpuWixU1Fyh4nWFztaGwsYM0A7KfGBC1p 2z/DxMlWUyOCei4eP/Uy7BfDTre3rkLqS/iGuTo09Jkb75SLpHfUEyXvtagmHrod8Ioy4O poAgYa+Awrz8IDJKs80N6bwiiMtml6Z2RDALfaMVsu5/RY3JH8pf3nHmT0n7Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697240599; a=rsa-sha256; cv=none; b=f6V//Ukv/qvqkvFndBu8/r0nLCz+zYHpg6HB26DhV/+sUODZfgBe7f/0XaGsWI16t89V3+ j4zI8mzNO+bKypSux9CmMCPoOiwchlgM+f+DZeknIh8jKCblr68bJROrLrjrNTRaR0+z3B iMXhrddeWQrNsIbK+ivFp7NtlZyznGkJIxSXOM6tbV/Ekeqj8azpMgsE9nwaYsIlrIXseh CE7tgrvkFsotteFeyu7AkKGD5wlr0XF+PGOQydcUlHSS4fz92kPfpGlHsYIblBjw02yplD 8cQU9jj6qcL3qaqIIZpZjy/nuCumOkvsfK+Xg53gSeAB/3OccMRqGEuDF0gg8w== 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=1697240599; 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=XjvxXVjYfB5QEcpXXTUD8O1y8y36LJ7GIkqD2ghEGgQ=; b=B29ro1D0YxM7RG8B5GfnhQWV1mSf2g6gWo5DZxpE81ynLnSssZXLm4PS0TtKgMuTsJh4O8 z4/Y5rVJoIbkx+nhB/GjlAh8Nc0RDyO0uF3elWgdpp/7p2VcaiqF7JtEo0Kh5h3H37pwtz NiSq6JKrn6jjnM/AdY4NY7mLL2Zm/iEwN7QUM7LCUPQhksSGCptzfgldt+joY/1NBAX1Tg oQT99K/get06XbnqERL4PYbpU4KE5eQxQjcj/1P/KBZACWTD82ol1Mi13LAWsKMNz92cme MkRp8QxiSNpnOhbL7IHZ1SM9chQMAblB+V0x3EiQpsVwt8nxI4Mj7/4JQ68ooA== 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 4S6jkH3VsKz17K6; Fri, 13 Oct 2023 23:43:19 +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 39DNhJpx015150; Fri, 13 Oct 2023 23:43:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DNhJhU015147; Fri, 13 Oct 2023 23:43:19 GMT (envelope-from git) Date: Fri, 13 Oct 2023 23:43:19 GMT Message-Id: <202310132343.39DNhJhU015147@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: bdd19ce53c07 - stable/14 - vfs: convert recycles_count and recycles_free_count to mere u_long 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/stable/14 X-Git-Reftype: branch X-Git-Commit: bdd19ce53c07bc44b9d8f46dcedda0fceca8e069 Auto-Submitted: auto-generated The branch stable/14 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=bdd19ce53c07bc44b9d8f46dcedda0fceca8e069 commit bdd19ce53c07bc44b9d8f46dcedda0fceca8e069 Author: Mateusz Guzik AuthorDate: 2023-10-12 06:57:59 +0000 Commit: Mateusz Guzik CommitDate: 2023-10-13 23:41:48 +0000 vfs: convert recycles_count and recycles_free_count to mere u_long Only vnlru ever updates them. This also removes recycles_count updates from hand-rolled debug vnode recycling via sysctl. Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 37544d9768110fd67527db7f2a3f7bb6fc977582) --- sys/kern/vfs_subr.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index b14793ccd84e..0fe2bc46446c 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -199,16 +199,19 @@ static long wantfreevnodes; static long __exclusive_cache_line freevnodes; static long freevnodes_old; -static counter_u64_t recycles_count; -SYSCTL_COUNTER_U64(_vfs, OID_AUTO, recycles, CTLFLAG_RD, &recycles_count, +static u_long recycles_count; +SYSCTL_ULONG(_vfs, OID_AUTO, recycles, CTLFLAG_RD | CTLFLAG_STATS, &recycles_count, 0, "Number of vnodes recycled to meet vnode cache targets (legacy)"); -SYSCTL_COUNTER_U64(_vfs_vnode_vnlru, OID_AUTO, recycles, CTLFLAG_RD, &recycles_count, +SYSCTL_ULONG(_vfs_vnode_vnlru, OID_AUTO, recycles, CTLFLAG_RD | CTLFLAG_STATS, + &recycles_count, 0, "Number of vnodes recycled to meet vnode cache targets"); -static counter_u64_t recycles_free_count; -SYSCTL_COUNTER_U64(_vfs, OID_AUTO, recycles_free, CTLFLAG_RD, &recycles_free_count, +static u_long recycles_free_count; +SYSCTL_ULONG(_vfs, OID_AUTO, recycles_free, CTLFLAG_RD | CTLFLAG_STATS, + &recycles_free_count, 0, "Number of free vnodes recycled to meet vnode cache targets (legacy)"); -SYSCTL_COUNTER_U64(_vfs_vnode_vnlru, OID_AUTO, recycles_free, CTLFLAG_RD, &recycles_free_count, +SYSCTL_ULONG(_vfs_vnode_vnlru, OID_AUTO, recycles_free, CTLFLAG_RD | CTLFLAG_STATS, + &recycles_free_count, 0, "Number of free vnodes recycled to meet vnode cache targets"); static counter_u64_t direct_recycles_free_count; @@ -458,7 +461,6 @@ sysctl_try_reclaim_vnode(SYSCTL_HANDLER_ARGS) goto putvnode; } - counter_u64_add(recycles_count, 1); vgone(vp); putvnode: vput(vp); @@ -492,7 +494,6 @@ sysctl_ftry_reclaim_vnode(SYSCTL_HANDLER_ARGS) if (error != 0) goto drop; - counter_u64_add(recycles_count, 1); vgone(vp); VOP_UNLOCK(vp); drop: @@ -774,8 +775,6 @@ vntblinit(void *dummy __unused) uma_prealloc(buf_trie_zone, nbuf); vnodes_created = counter_u64_alloc(M_WAITOK); - recycles_count = counter_u64_alloc(M_WAITOK); - recycles_free_count = counter_u64_alloc(M_WAITOK); direct_recycles_free_count = counter_u64_alloc(M_WAITOK); vnode_skipped_requeues = counter_u64_alloc(M_WAITOK); @@ -1282,7 +1281,7 @@ restart: vn_finished_write(mp); goto next_iter_unlocked; } - counter_u64_add(recycles_count, 1); + recycles_count++; vgonel(vp); VOP_UNLOCK(vp); vdropl_recycle(vp); @@ -1911,7 +1910,7 @@ vtryrecycle(struct vnode *vp, bool isvnlru) } if (!VN_IS_DOOMED(vp)) { if (isvnlru) - counter_u64_add(recycles_free_count, 1); + recycles_free_count++; else counter_u64_add(direct_recycles_free_count, 1); vgonel(vp);