From nobody Mon Oct 20 16:03:45 2025 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 4cr0bP2xztz6Cfsb; Mon, 20 Oct 2025 16:03:45 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cr0bP2MLBz3QW7; Mon, 20 Oct 2025 16:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976225; 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=SzvMiQfqtzytZvxR71v+tctPKN0rPGGKp0x799hKnzs=; b=sCPBUup4k/ibEx8GToqHJVlYBNXmRtfl4Q5FWlsZPn5YoGOhtxGIqnJjUltgUHMO7xvwzK nueI16lwcgXNG3fSJ0GVapTD3hHsEzWpCwo8uLNFIY0VfkGijxeQwM3lPghN3d2ahm9WVn S5EaqI3FhcYoGmN+17Ln4Ki4g2Ow1c2EbCiLrWO1MMDkFUvQwqwZ52T93SGRu08EhEAWRC 3IfTVrYkCLkvW3MHHJLeMninZ357/Wh0IbLm02agU9gQwLGE3/XuEfrF3sMnuURU2GZfvA PJ1Q/mqt837nURMd4FTxyEIOvXvt/HrycNLitALD1Gpzy3GvJmghCm0s/U13CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760976225; 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=SzvMiQfqtzytZvxR71v+tctPKN0rPGGKp0x799hKnzs=; b=wG/56H2BeUQOP93SzfUaS6u4PfP9zRL4IXOwNdrt0d/SPKZbQ35x4I1bfCSFRt+T7gUmkg tIj2194f8m0tDGFQD9KcIj+s3XqEfjfXkMhJ7tLKw9W+BU35D46Tzo6TTRIHnabFoc79Tv Z/Qj6oQK1KRnSNLFY8epo0sgBRpw2aj3K8UPFek1ZERtesp3PxvyTuSrxqsyRwwgR8S4XW dZYaeBWj1dXJUSbv/irrbti/x1wkVzEaoJtaYSpfd8gNwiAg6pUt745Z20fhor+C/SKgo3 YyQrXGXRj/YjOYue38G28QNAmGq94rH/vm+YmyIEYjUC0eHulcNh/DyvfXK3dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760976225; a=rsa-sha256; cv=none; b=S0VWtHAUgrmf1VxXvxQ6ll4vm+05u4BWovbVfgtxvY5RFSyYEG+q9Xwo2vIOeOnhcnT9Hd 0XeFDqqIMHU6zlNn3S2/lHKIv6IAWWVO0lA6JGWU4Kj+sUUMO1+VvW7kpyj0wW1iOGzzk9 rQdN4bHO5gjQrtXvJfX3yIquFU+SVhBFYTI19zlRymeCwRZ6UoxJr3zBPYFUfQ2vnD4b5p SXheROIpbJFAEadqiqgy6YZv4qXJw6vvuXlb2AXsjqoVyIk8ST3nL9X6bRyR0B7QYjMEPE 4vZQpn8mGI5nJ8SkOC0kku4oty/n7nUJBzccQaxIHV4ENZYeDNW6jsdtub/X3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cr0bP1JfNz4xc; Mon, 20 Oct 2025 16:03:45 +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 59KG3jj0022297; Mon, 20 Oct 2025 16:03:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KG3je8022294; Mon, 20 Oct 2025 16:03:45 GMT (envelope-from git) Date: Mon, 20 Oct 2025 16:03:45 GMT Message-Id: <202510201603.59KG3je8022294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: fdf8dc1a01a6 - stable/14 - zfs: Emit warning upon use of legacy sysctls 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fdf8dc1a01a603cbd1f9349068e43c7d8c609969 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fdf8dc1a01a603cbd1f9349068e43c7d8c609969 commit fdf8dc1a01a603cbd1f9349068e43c7d8c609969 Author: Ed Maste AuthorDate: 2025-10-09 15:57:14 +0000 Commit: Ed Maste CommitDate: 2025-10-20 13:40:06 +0000 zfs: Emit warning upon use of legacy sysctls The introduction of OpenZFS moved some sysctls, and legacy compat shims were added. For example: Old (legacy) name: vfs.zfs.min_auto_ashift New name: vfs.zfs.vdev.min_auto_ashift Upstream OpenZFS removed these, but we've temporarily restored them in FreeBSD. Note that l2arc sysctls use generic sysctl functions (e.g. SYSCTL_UQUAD) and thus cannot trivially have warnings added, so they are not handled. PR: 266374 Reviewed by: jlduran Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53033 (cherry picked from commit 654a3aa9a1de176648eec00b3c201c33b10bd325) (cherry picked from commit f0033878b92e1a00120fec4edf590715f7c4ecbc) --- .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 41 +++++++++++++++++----- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c index 55e133c096c1..04c4bac2201c 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c @@ -163,6 +163,13 @@ param_set_arc_int(SYSCTL_HANDLER_ARGS) return (0); } +static void +warn_deprecated_sysctl(const char *old, const char *new) +{ + printf("WARNING: sysctl vfs.zfs.%s is deprecated. Use vfs.zfs.%s instead.\n", + old, new); +} + int param_set_arc_max(SYSCTL_HANDLER_ARGS) { @@ -185,13 +192,16 @@ param_set_arc_max(SYSCTL_HANDLER_ARGS) if (val != 0) zfs_arc_max = arc_c_max; + if (arg2 != 0) + warn_deprecated_sysctl("arc_max", "arc.max"); + return (0); } /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_max, CTLTYPE_ULONG | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, - NULL, 0, param_set_arc_max, "LU", + NULL, 1, param_set_arc_max, "LU", "Maximum ARC size in bytes (LEGACY)"); /* END CSTYLED */ @@ -216,13 +226,16 @@ param_set_arc_min(SYSCTL_HANDLER_ARGS) if (val != 0) zfs_arc_min = arc_c_min; + if (arg2 != 0) + warn_deprecated_sysctl("arc_min", "arc.min"); + return (0); } /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_min, CTLTYPE_ULONG | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, - NULL, 0, param_set_arc_min, "LU", + NULL, 1, param_set_arc_min, "LU", "Minimum ARC size in bytes (LEGACY)"); /* END CSTYLED */ @@ -246,6 +259,9 @@ param_set_arc_free_target(SYSCTL_HANDLER_ARGS) zfs_arc_free_target = val; + if (arg2 != 0) + warn_deprecated_sysctl("arc_free_target", "arc.free_target"); + return (0); } @@ -256,7 +272,7 @@ param_set_arc_free_target(SYSCTL_HANDLER_ARGS) /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_free_target, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_MPSAFE, - NULL, 0, param_set_arc_free_target, "IU", + NULL, 1, param_set_arc_free_target, "IU", "Desired number of free pages below which ARC triggers reclaim" " (LEGACY)"); /* END CSTYLED */ @@ -276,13 +292,16 @@ param_set_arc_no_grow_shift(SYSCTL_HANDLER_ARGS) arc_no_grow_shift = val; + if (arg2 != 0) + warn_deprecated_sysctl("arc_no_grow_shift", "arc.no_grow_shift"); + return (0); } /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, arc_no_grow_shift, CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, - NULL, 0, param_set_arc_no_grow_shift, "I", + NULL, 1, param_set_arc_no_grow_shift, "I", "log2(fraction of ARC which must be free to allow growing) (LEGACY)"); /* END CSTYLED */ @@ -775,13 +794,16 @@ param_set_min_auto_ashift(SYSCTL_HANDLER_ARGS) zfs_vdev_min_auto_ashift = val; + if (arg2 != 0) + warn_deprecated_sysctl("min_auto_ashift", + "vdev.min_auto_ashift"); + return (0); } /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, min_auto_ashift, - CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, - &zfs_vdev_min_auto_ashift, sizeof (zfs_vdev_min_auto_ashift), + CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, NULL, 1, param_set_min_auto_ashift, "IU", "Min ashift used when creating new top-level vdev. (LEGACY)"); /* END CSTYLED */ @@ -802,13 +824,16 @@ param_set_max_auto_ashift(SYSCTL_HANDLER_ARGS) zfs_vdev_max_auto_ashift = val; + if (arg2 != 0) + warn_deprecated_sysctl("max_auto_ashift", + "vdev.max_auto_ashift"); + return (0); } /* BEGIN CSTYLED */ SYSCTL_PROC(_vfs_zfs, OID_AUTO, max_auto_ashift, - CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, - &zfs_vdev_max_auto_ashift, sizeof (zfs_vdev_max_auto_ashift), + CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, NULL, 1, param_set_max_auto_ashift, "IU", "Max ashift used when optimizing for logical -> physical sector size on" " new top-level vdevs. (LEGACY)");