From nobody Wed May 28 00:27:05 2025 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 4b6VgZ1r3bz5wcQJ; Wed, 28 May 2025 00:27:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6VgY4sYPz3cj4; Wed, 28 May 2025 00:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748392025; 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=5EUsJ8RmDCHdNGGvYijDRKI5rDAlLbaC1QiNtGjuqYo=; b=m8PWno5FpDieuaLkaP+xBhjp49x8a8kLZYRodqP3W5+JNUfRFPQFgYjIFR0LshrN4CrBZx 9R+ZP1K8b83GRNaMPzZwrfPzxjXiZa00k79yVxSVdvwsLjcDbjEmgPvpusjs51Gk8Qwghg aVg4piHLWXUT7HUIpfHyLY6UYh2pj2Eip5DGdCXMUM+ed1IGgRoCuABoCevngxh3bLmvie 6wuyqaEWhX02sx8FRpB9plq2TVXkESnN/bcmUSRNVHt5hR2ZTqSNILRaWjae59s9o1sUuy kciERpRlE6Vzox8drevTKjYLF8kgH2ca5DeoA5GyT44yhxIfpagVZ66iYWa1Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748392025; a=rsa-sha256; cv=none; b=GHqQYs8uqLAlWGbLiGMjri3JhEjIFIkbQ+SYL7VFPYcm4T32xzcpN2GLGtLvNES3o9vNZS w4Yph93VdJHDU4SmsOAzgbB2n0RrJdYTl6iDyHatXOOv1BkUqwhaXR7gpjy0Vsnbl7SY+B OYmINFJIQ1dLo8+cI9k8UMNMN8rP8FcjApX/8P9T65Dx5s+uxemvRgeGV0x6z25UaXh7Tg K77anI7k5ImRPKwYpMNbuCYv9JZgkTJeXO9xSLaHSH8g5vV2dK/5Vu8R2ynZ6V/zeY007y iWsTMp3u+y0zKMnzvkxxeZGcsWVQ1aVFeDySYmm3wCHecf3AGTZIQQi4Axyugg== 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=1748392025; 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=5EUsJ8RmDCHdNGGvYijDRKI5rDAlLbaC1QiNtGjuqYo=; b=I03kziEk7SIyRPyenONId98SyckuuYi7p8D2BvsmlFUy4ZCE3moI66KVim6v2YS/FSoByt 1j/McAGs90+x324p+SDIB9So6GJZ5o/HcQ3D/AexEmaxjUEmLVmOYsfOYRMRNCUFCT10Ky UuQ9VewXBZSXGEbq9RyiAUOMoRQfF/MWGFp6nyjI8Gzilv9+6sqsW2xhPp3AlB8ESNwumr 7dvg4nEYjCy6gxhwCV4kLJEA/7/e/a1K1Hzo1slOL/tSEmMUfI0PKRISadKPR2X9rz0J7w UaLy44Y/OX77sPaXzX6SMgdrZCFnPI1nWhhht6snFl65HxQZuyNBEpurrNZBEA== 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 4b6VgY4SzzzYw; Wed, 28 May 2025 00:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54S0R5gr036270; Wed, 28 May 2025 00:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S0R5X4036267; Wed, 28 May 2025 00:27:05 GMT (envelope-from git) Date: Wed, 28 May 2025 00:27:05 GMT Message-Id: <202505280027.54S0R5X4036267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: f23326ff2c7c - stable/14 - systat/top: Update ZFS sysctl names 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f23326ff2c7cad9579061291b6de7feb5ea7302a Auto-Submitted: auto-generated The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f23326ff2c7cad9579061291b6de7feb5ea7302a commit f23326ff2c7cad9579061291b6de7feb5ea7302a Author: Alexander Motin AuthorDate: 2025-05-25 18:23:54 +0000 Commit: Alexander Motin CommitDate: 2025-05-28 00:26:52 +0000 systat/top: Update ZFS sysctl names Some of ARC statistic sysctls changed years ago, but those tools are still using legacy shims, that are going to be removed. MFC after: 3 days (cherry picked from commit 8aad1e6148d3389df100bb0391e2d3a909f26ecf) --- usr.bin/systat/main.c | 6 +++--- usr.bin/top/machine.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index 889ce39a6c32..ade0f41b0b2a 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -304,9 +304,9 @@ display(void) size_t size = sizeof(arc[0]); if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arc[0], &size, NULL, 0) == 0 ) { - GETSYSCTL("vfs.zfs.mfu_size", arc[1]); - GETSYSCTL("vfs.zfs.mru_size", arc[2]); - GETSYSCTL("vfs.zfs.anon_size", arc[3]); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc[1]); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc[2]); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc[3]); GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc[4]); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc[5]); GETSYSCTL("kstat.zfs.misc.arcstats.bonus_size", arc[6]); diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index a76d77a80ce4..07a7119ad0c2 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -537,11 +537,11 @@ get_system_info(struct system_info *si) if (arc_enabled) { GETSYSCTL("kstat.zfs.misc.arcstats.size", arc_stat); arc_stats[0] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mfu_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mfu_size", arc_stat); arc_stats[1] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.mru_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.mru_size", arc_stat); arc_stats[2] = arc_stat >> 10; - GETSYSCTL("vfs.zfs.anon_size", arc_stat); + GETSYSCTL("kstat.zfs.misc.arcstats.anon_size", arc_stat); arc_stats[3] = arc_stat >> 10; GETSYSCTL("kstat.zfs.misc.arcstats.hdr_size", arc_stat); GETSYSCTL("kstat.zfs.misc.arcstats.l2_hdr_size", arc_stat2);