3 files changed, 33 insertions, 6 deletions
diff --git a/man/man4/zfs.4 b/man/man4/zfs.4
index 5a47cbbe2..cf6720317 100644
--- a/man/man4/zfs.4
+++ b/man/man4/zfs.4
@@ -16,7 +16,9 @@
 .\" own identifying information:
 .\" Portions Copyright [yyyy] [name of copyright owner]
 .\"
-.Dd June 27, 2024
+.\" Copyright (c) 2024, Klara, Inc.
+.\"
+.Dd October 2, 2024
 .Dt ZFS 4
 .Os
 .
@@ -614,7 +616,11 @@ However, this is limited by
 .
 .It Sy zap_micro_max_size Ns = Ns Sy 131072 Ns B Po 128 KiB Pc Pq int
 Maximum micro ZAP size.
-A micro ZAP is upgraded to a fat ZAP, once it grows beyond the specified size.
+A "micro" ZAP is upgraded to a "fat" ZAP once it grows beyond the specified
+size.
+Sizes higher than 128KiB will be clamped to 128KiB unless the
+.Sy large_microzap
+feature is enabled.
 .
 .It Sy zap_shrink_enabled Ns = Ns Sy 1 Ns | Ns 0 Pq int
 If set, adjacent empty ZAP blocks will be collapsed, reducing disk space.
diff --git a/man/man7/zpool-features.7 b/man/man7/zpool-features.7
index ad9755ba5..7b392a896 100644
--- a/man/man7/zpool-features.7
+++ b/man/man7/zpool-features.7
@@ -14,12 +14,11 @@
 .\" CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your
 .\" own identifying information:
 .\" Portions Copyright [yyyy] [name of copyright owner]
-.\" Copyright (c) 2019, Klara Inc.
+.\" Copyright (c) 2019, 2023, 2024, Klara, Inc.
 .\" Copyright (c) 2019, Allan Jude
 .\" Copyright (c) 2021, Colm Buckley <[email protected]>
-.\" Copyright (c) 2023, Klara Inc.
 .\"
-.Dd February 14, 2024
+.Dd October 2, 2024
 .Dt ZPOOL-FEATURES 7
 .Os
 .
@@ -706,6 +705,24 @@ are destroyed.
 Large dnodes allow more data to be stored in the bonus buffer,
 thus potentially improving performance by avoiding the use of spill blocks.
 .
+.feature com.klarasystems large_microzap yes extensible_dataset large_blocks
+This feature allows "micro" ZAPs to grow larger than 128 KiB without being
+upgraded to "fat" ZAPs.
+.Pp
+This feature becomes
+.Sy active
+the first time a micro ZAP grows larger than 128KiB.
+It will only be returned to the
+.Sy enabled
+state when all datasets that ever had a large micro ZAP are destroyed.
+.Pp
+Note that even when this feature is enabled, micro ZAPs cannot grow larger
+than 128 KiB without also changing the
+.Sy zap_micro_max_size
+module parameter.
+See
+.Xr zfs 4 .
+.
 .feature com.delphix livelist yes extensible_dataset
 This feature allows clones to be deleted faster than the traditional method
 when a large number of random/sparse writes have been made to the clone.
diff --git a/man/man8/zfs-send.8 b/man/man8/zfs-send.8
index ba604bf77..877d95414 100644
--- a/man/man8/zfs-send.8
+++ b/man/man8/zfs-send.8
@@ -28,8 +28,9 @@
 .\" Copyright 2019 Richard Laager. All rights reserved.
 .\" Copyright 2018 Nexenta Systems, Inc.
 .\" Copyright 2019 Joyent, Inc.
+.\" Copyright (c) 2024, Klara, Inc.
 .\"
-.Dd July 27, 2023
+.Dd October 2, 2024
 .Dt ZFS-SEND 8
 .Os
 .
@@ -111,6 +112,9 @@ property of this filesystem has never been set above 128 KiB.
 The receiving system must have the
 .Sy large_blocks
 pool feature enabled as well.
+This flag is required if the
+.Sy large_microzap
+pool feature is active.
 See
 .Xr zpool-features 7
 for details on ZFS feature flags and the