diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 19a7b45f4b6a..81108f29f0bb 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -1,350 +1,349 @@
 
 # Part of a unified Makefile for building kernels.  This part contains all
 # of the definitions that need to be before %BEFORE_DEPEND.
 
 # Allow user to configure things that only effect src tree builds.
 # Note: This is duplicated from src.sys.mk to ensure that we include
 # /etc/src.conf when building the kernel. Kernels can be built without
 # the rest of /usr/src, but they still always process SRCCONF even though
 # the normal mechanisms to prevent that (compiling out of tree) won't
 # work. To ensure they do work, we have to duplicate thee few lines here.
 .if exists(${SRCTOP}/src.conf)
 SRCCONF?=	${SRCTOP}/src.conf
 .else
 SRCCONF?=	/etc/src.conf
 .endif
 .if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_)
 .include "${SRCCONF}"
 _srcconf_included_:
 .endif
 
 .include <bsd.own.mk>
 .include <bsd.compiler.mk>
 .include "kern.opts.mk"
 .-include <local.kern.pre.mk>
 
 # The kernel build always occurs in the object directory which is .CURDIR.
 .if ${.MAKE.MODE:Unormal:Mmeta}
 .MAKE.MODE+=	curdirOk=yes
 .endif
 
 # The kernel build always expects .OBJDIR=.CURDIR.
 .OBJDIR: ${.CURDIR}
 
 .if defined(NO_OBJWALK) || ${MK_AUTO_OBJ} == "yes"
 NO_OBJWALK=		t
 NO_MODULES_OBJ=	t
 .endif
 .if !defined(NO_OBJWALK)
 _obj=		obj
 .endif
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel
 KERNEL?=	kernel
 KODIR?=		/boot/${KERNEL}
 LDSCRIPT_NAME?=	ldscript.$M
 LDSCRIPT?=	$S/conf/${LDSCRIPT_NAME}
 
 M=		${MACHINE}
 
 AWK?=		awk
 CP?=		cp
 ELFDUMP?=	elfdump
 NM?=		nm
 OBJCOPY?=	objcopy
 SIZE?=		size
 
 .if defined(DEBUG)
 CTFFLAGS+=	-g
 .endif
 .if ${MACHINE_CPUARCH} == "amd64" && ${COMPILER_TYPE} != "clang"
 _COPTFLAGS_EXTRA=-frename-registers
 .else
 _COPTFLAGS_EXTRA=
 .endif
 COPTFLAGS?=-O2 -pipe ${_COPTFLAGS_EXTRA}
 .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing)
 COPTFLAGS+= -fno-strict-aliasing
 .endif
 .if !defined(NO_CPU_COPTFLAGS)
 COPTFLAGS+= ${_CPUCFLAGS}
 .endif
 NOSTDINC= -nostdinc
 
 INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S -I$S/contrib/ck/include
 
 CFLAGS=	${COPTFLAGS} ${DEBUG}
 CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
 CFLAGS_PARAM_INLINE_UNIT_GROWTH?=100
 CFLAGS_PARAM_LARGE_FUNCTION_GROWTH?=1000
 CFLAGS.gcc+= -finline-limit=${INLINE_LIMIT}
 CFLAGS.gcc+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH}
 CFLAGS.gcc+= --param large-function-growth=${CFLAGS_PARAM_LARGE_FUNCTION_GROWTH}
 .if defined(CFLAGS_ARCH_PARAMS)
 CFLAGS.gcc+=${CFLAGS_ARCH_PARAMS}
 .endif
 WERROR?=	-Werror
 # The following should be removed no earlier than LLVM11 being imported into the
 # tree, to ensure we don't regress the build.  LLVM11 and GCC10 will switch the
 # default over to -fno-common, making this redundant.
 CFLAGS+=	-fno-common
 
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} ${ASM_CFLAGS.${.IMPSRC:T}}
 
 COMPAT_FREEBSD32_ENABLED!= grep COMPAT_FREEBSD32 opt_global.h || true ; echo
 
 KASAN_ENABLED!=	grep KASAN opt_global.h || true ; echo
 KCSAN_ENABLED!= grep KCSAN opt_global.h || true ; echo
 KMSAN_ENABLED!= grep KMSAN opt_global.h || true ; echo
 KUBSAN_ENABLED!=	grep KUBSAN opt_global.h || true ; echo
 COVERAGE_ENABLED!=	grep COVERAGE opt_global.h || true ; echo
 
 GCOV_ENABLED!=	grep GCOV opt_global.h || true ; echo
 .if !empty(GCOV_ENABLED)
 .if ${COMPILER_TYPE} == "gcc"
 GCOV_CFLAGS+=	 -fprofile-arcs -ftest-coverage
 .endif
 .endif
 
 CFLAGS+=	${GCOV_CFLAGS}
 
 # Put configuration-specific C flags last so that they can override
 # the others.
 CFLAGS+=	${CONF_CFLAGS}
 
 LDFLAGS+=	--build-id=sha1
 
 .if ${MACHINE_CPUARCH} == "amd64"
 LDFLAGS+=	-z max-page-size=2097152
 .if ${LINKER_TYPE} != "lld"
 LDFLAGS+=	-z common-page-size=4096
 .else
 .if defined(LINKER_FEATURES) && !${LINKER_FEATURES:Mifunc-noplt}
 .warning "Linker ${LD} does not support -z ifunc-noplt -> ifunc calls are unoptimized."
 .else
 LDFLAGS+=	-z notext -z ifunc-noplt
 .endif
 .endif
 .endif  # ${MACHINE_CPUARCH} == "amd64"
 
 .if ${MACHINE_CPUARCH} == "riscv"
 # Hack: Work around undefined weak symbols being out of range when linking with
 # LLD (address is a PC-relative calculation, and BFD works around this by
 # rewriting the instructions to generate an absolute address of 0); -fPIE
 # avoids this since it uses the GOT for all extern symbols, which is overly
 # inefficient for us. Drop once undefined weak symbols work with medany.
 .if ${LINKER_TYPE} == "lld"
 CFLAGS+=	-fPIE
 .endif
 .endif
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${WERROR} ${.IMPSRC}
 NORMAL_S= ${CC:N${CCACHE_BIN}} -c ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}
 NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${.IMPSRC}
 
 NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
 	  ${CC} -c ${CFLAGS} ${WERROR} ${.PREFIX}.c
 
 NORMAL_FW= uudecode -o ${.TARGET} ${.ALLSRC}
 NORMAL_FWO= ${CC:N${CCACHE_BIN}} -c ${ASM_CFLAGS} ${WERROR} -o ${.TARGET} \
 	$S/kern/firmw.S -DFIRMW_FILE=\""${.ALLSRC:M*.fw}"\" \
 	-DFIRMW_SYMBOL="${.ALLSRC:M*.fw:C/[-.\/]/_/g}"
 
 # Remove sanitizer arguments. Some -fno-sanitize* and -fasan-shadow-offset*
 # arguments become an error if the appropriate sanitizer is not enabled.
 NOSAN_C= ${NORMAL_C:N-fsanitize*:N-fno-sanitize*:N-fasan-shadow-offset*}
 
 # for ZSTD in the kernel (include zstd/lib/freebsd before other CFLAGS)
 ZSTD_C= ${CC} -c -DZSTD_HEAPMODE=1 -I$S/contrib/zstd/lib/freebsd ${CFLAGS} \
 	-I$S/contrib/zstd/lib -I$S/contrib/zstd/lib/common ${WERROR} \
 	-Wno-missing-prototypes -U__BMI__ -DZSTD_NO_INTRINSICS ${.IMPSRC}
 # https://github.com/facebook/zstd/commit/812e8f2a [zstd 1.4.1]
 # "Note that [GCC] autovectorization still does not do a good job on the
 # optimized version, so it's turned off via attribute and flag.  I found
 # that neither attribute nor command-line flag were entirely successful in
 # turning off vectorization, which is why there were both."
 .if ${COMPILER_TYPE} == "gcc"
 ZSTD_DECOMPRESS_BLOCK_FLAGS= -fno-tree-vectorize
 .endif
 
 ZINCDIR=$S/contrib/openzfs/include
 # Common for dtrace / zfs
 CDDL_CFLAGS=	\
 	-DFREEBSD_NAMECACHE \
 	-D_SYS_VMEM_H_ \
 	-D__KERNEL \
 	-D__KERNEL__ \
 	-nostdinc \
 	-include $S/modules/zfs/static_ccompile.h \
 	-I${ZINCDIR} \
 	-I${ZINCDIR}/os/freebsd \
 	-I${ZINCDIR}/os/freebsd/spl \
 	-I${ZINCDIR}/os/freebsd/zfs  \
 	-I$S/modules/zfs \
 	-I$S/contrib/openzfs/module/zstd/include \
 	${CFLAGS} \
 	-Wno-cast-qual \
 	-Wno-duplicate-decl-specifier \
 	-Wno-missing-braces \
 	-Wno-missing-prototypes \
 	-Wno-parentheses \
 	-Wno-pointer-arith \
 	-Wno-strict-prototypes \
 	-Wno-switch \
 	-Wno-undef \
 	-Wno-uninitialized \
 	-Wno-unknown-pragmas \
 	-Wno-unused \
 	-include ${ZINCDIR}/os/freebsd/spl/sys/ccompile.h \
 	-I$S/cddl/contrib/opensolaris/uts/common \
 	-I$S -I$S/cddl/compat/opensolaris
 CDDL_C=		${CC} -c ${CDDL_CFLAGS} ${WERROR} ${.IMPSRC}
 
 # Special flags for managing the compat compiles for ZFS
 ZFS_CFLAGS+=	-I$S/contrib/openzfs/module/icp/include \
 	-include $S/contrib/openzfs/include/sys/simd_config.h \
 	${CDDL_CFLAGS} -DBUILDING_ZFS -DHAVE_UIO_ZEROCOPY \
 	-DWITH_NETDUMP -D__KERNEL__ -D_SYS_CONDVAR_H_ -DSMP
 
 .if ${MACHINE_ARCH} == "amd64"
 ZFS_CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3 \
 	-DHAVE_TOOLCHAIN_SSE4_1 -DHAVE_TOOLCHAIN_AVX -DHAVE_TOOLCHAIN_AVX2 \
 	-DHAVE_TOOLCHAIN_AVX512F -DHAVE_TOOLCHAIN_AVX512VL \
-	-DHAVE_TOOLCHAIN_AVX512BW \
-	-DHAVE_TOOLCHAIN_VAES -DHAVE_TOOLCHAIN_VPCLMULQDQ
+	-DHAVE_TOOLCHAIN_AVX512BW -DHAVE_TOOLCHAIN_SHA512EXT
 .endif
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
 	${MACHINE_ARCH} == "arm"
 ZFS_CFLAGS+= -DBITS_PER_LONG=32
 .else
 ZFS_CFLAGS+= -DBITS_PER_LONG=64
 .endif
 
 
 ZFS_ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${ZFS_CFLAGS}
 ZFS_C=		${CC} -c ${ZFS_CFLAGS} ${WERROR} ${.IMPSRC}
 ZFS_RPC_C=	${CC} -c ${ZFS_CFLAGS} -DHAVE_RPC_TYPES ${WERROR} ${.IMPSRC}
 ZFS_S=		${CC} -c ${ZFS_ASM_CFLAGS} ${WERROR} ${.IMPSRC}
 
 # ATH driver
 ATH_CFLAGS=	-I${SRCTOP}/sys/dev/ath ${NO_WUNUSED_BUT_SET_VARIABLE}
 ATH_C=		${CC} -c ${CFLAGS} ${WERROR} ${ATH_CFLAGS} ${.IMPSRC}
 
 # Special flags for managing the compat compiles for DTrace
 DTRACE_CFLAGS=	-DBUILDING_DTRACE ${CDDL_CFLAGS} -I$S/cddl/dev/dtrace -I$S/cddl/dev/dtrace/${MACHINE_CPUARCH}
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 DTRACE_CFLAGS+=	-I$S/cddl/contrib/opensolaris/uts/intel -I$S/cddl/dev/dtrace/x86
 .endif
 DTRACE_CFLAGS+=	-I$S/cddl/contrib/opensolaris/common/util -I$S -DDIS_MEM -DSMP -I$S/cddl/compat/opensolaris
 DTRACE_CFLAGS+=	-I$S/cddl/contrib/opensolaris/uts/common
 DTRACE_ASM_CFLAGS=	-x assembler-with-cpp -DLOCORE ${DTRACE_CFLAGS}
 DTRACE_C=	${CC} -c ${DTRACE_CFLAGS}	${WERROR} ${.IMPSRC}
 DTRACE_S=	${CC} -c ${DTRACE_ASM_CFLAGS}	${WERROR} ${.IMPSRC}
 
 # zlib code supports systems that are quite old, but will fix this issue once C2x gets radified.
 # see https://github.com/madler/zlib/issues/633 for details
 ZLIB_CFLAGS=	-Wno-cast-qual ${NO_WDEPRECATED_NON_PROTOTYPE} ${NO_WSTRICT_PROTOTYPES}
 ZLIB_C=		${CC} -c ${CFLAGS} ${WERROR} ${ZLIB_CFLAGS} ${.IMPSRC}
 
 # Special flags for managing the compat compiles for DTrace/FBT
 FBT_CFLAGS=	-DBUILDING_DTRACE -nostdinc -I$S/cddl/dev/fbt/${MACHINE_CPUARCH} -I$S/cddl/dev/fbt ${CDDL_CFLAGS} -I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common  
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 FBT_CFLAGS+=	-I$S/cddl/dev/fbt/x86
 .endif
 FBT_C=		${CC} -c ${FBT_CFLAGS}		${WERROR} ${.IMPSRC}
 
 .if ${MK_CTF} != "no"
 NORMAL_CTFCONVERT=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .elif ${MAKE_VERSION} >= 5201111300
 NORMAL_CTFCONVERT=
 .else
 NORMAL_CTFCONVERT=	@:
 .endif
 
 # Linux Kernel Programming Interface C-flags
 LINUXKPI_INCLUDES=	-I$S/compat/linuxkpi/common/include \
 			-I$S/compat/linuxkpi/dummy/include \
 			-include $S/compat/linuxkpi/common/include/linux/kconfig.h
 LINUXKPI_C=		${NORMAL_C} ${LINUXKPI_INCLUDES}
 
 # Infiniband C flags.  Correct include paths and omit errors that linux
 # does not honor.
 OFEDINCLUDES=	-I$S/ofed/include -I$S/ofed/include/uapi ${LINUXKPI_INCLUDES}
 OFEDNOERR=	-Wno-cast-qual -Wno-pointer-arith
 OFEDCFLAGS=	${CFLAGS:N-I*} -DCONFIG_INFINIBAND_USER_MEM \
 		${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR}
 OFED_C_NOIMP=	${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR}
 OFED_C=		${OFED_C_NOIMP} ${.IMPSRC}
 
 # mlxfw C flags.
 MLXFW_C=	${OFED_C_NOIMP} \
 		-I${SRCTOP}/sys/contrib/xz-embedded/freebsd \
 		-I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz \
 		${.IMPSRC}
 # BNXT Driver
 BNXT_CFLAGS=	-I$S/dev/bnxt/bnxt_en ${OFEDCFLAGS}
 BNXT_C_NOIMP=	${CC} -c -o ${.TARGET} ${BNXT_CFLAGS} ${WERROR}
 BNXT_C=		${BNXT_C_NOIMP} ${.IMPSRC}
 
 # IP Filter
 IPFILTER_CFLAGS=	-I$S/netpfil/ipfilter
 IPFILTER_C=		${NORMAL_C} ${IPFILTER_CFLAGS}
 
 GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/}
 SYSTEM_CFILES= config.c env.c hints.c vnode_if.c
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
 SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
 SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
 SYSTEM_OBJS+= force-dynamic-hack.pico
 
 KEYMAP=kbdcontrol -P ${SRCTOP}/share/vt/keymaps -P ${SRCTOP}/share/syscons/keymaps
 KEYMAP_FIX=sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /'
 
 MD_ROOT_SIZE_CONFIGURED!=	grep MD_ROOT_SIZE opt_md.h || true ; echo
 .if ${MFS_IMAGE:Uno} != "no"
 .if empty(MD_ROOT_SIZE_CONFIGURED)
 SYSTEM_OBJS+= embedfs_${MFS_IMAGE:T:R}.o
 .endif
 .endif
 SYSTEM_LD_BASECMD= \
 	${LD} -m ${LD_EMULATION} -Bdynamic -L $S/conf -T ${LDSCRIPT} ${_LDFLAGS} \
 	--no-warn-mismatch --warn-common --export-dynamic \
 	--dynamic-linker /red/herring -X
 SYSTEM_LD= @${SYSTEM_LD_BASECMD} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} ${.TARGET} ; chmod 755 ${.TARGET}
 SYSTEM_DEP+= ${LDSCRIPT}
 
 # Calculate path for .m files early, if needed.
 .if !defined(NO_MODULES) && !defined(__MPATH) && !make(install) && \
     (empty(.MAKEFLAGS:M-V) || defined(NO_SKIP_MPATH))
 __MPATH!=find ${S:tA}/ -name \*_if.m
 .endif
 
 # MKMODULESENV is set here so that port makefiles can augment
 # them.
 
 MKMODULESENV+=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 MKMODULESENV+=	MACHINE_CPUARCH=${MACHINE_CPUARCH}
 MKMODULESENV+=	MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH}
 MKMODULESENV+=	MODULES_EXTRA="${MODULES_EXTRA}" WITHOUT_MODULES="${WITHOUT_MODULES}"
 MKMODULESENV+=	ARCH_FLAGS="${ARCH_FLAGS}"
 .if (${KERN_IDENT} == LINT)
 MKMODULESENV+=	ALL_MODULES=LINT
 .endif
 .if defined(MODULES_OVERRIDE)
 MKMODULESENV+=	MODULES_OVERRIDE="${MODULES_OVERRIDE}"
 .endif
 .if defined(DEBUG)
 MKMODULESENV+=	DEBUG_FLAGS="${DEBUG}"
 .endif
 .if !defined(NO_MODULES)
 MKMODULESENV+=	__MPATH="${__MPATH}"
 .endif
 
 # Detect kernel config options that force stack frames to be turned on.
 DDB_ENABLED!=	grep DDB opt_ddb.h || true ; echo
 DTRACE_ENABLED!=grep KDTRACE_FRAME opt_kdtrace.h || true ; echo
 HWPMC_ENABLED!=	grep HWPMC opt_hwpmc_hooks.h || true ; echo
diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h
index c562fb0171d0..ced6ac1f9eab 100644
--- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h
+++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/simd_x86.h
@@ -1,315 +1,329 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
  * Copyright (c) 2020 iXsystems, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 
 #include <machine/pcb.h>
 #include <x86/x86_var.h>
 #include <x86/specialreg.h>
 
 #define	kfpu_init()		(0)
 #define	kfpu_fini()		do {} while (0)
 #define	kfpu_allowed()		1
 #define	kfpu_initialize(tsk)	do {} while (0)
 
 #define	kfpu_begin() {					\
 	if (__predict_false(!is_fpu_kern_thread(0)))		\
 		fpu_kern_enter(curthread, NULL, FPU_KERN_NOCTX);\
 }
 
 #ifndef PCB_FPUNOSAVE
 #define	PCB_FPUNOSAVE	PCB_NPXNOSAVE
 #endif
 
 #define	kfpu_end()	{			\
 	if (__predict_false(curpcb->pcb_flags & PCB_FPUNOSAVE))	\
 		fpu_kern_leave(curthread, NULL);	\
 }
 
 /*
  * Check if OS supports AVX and AVX2 by checking XCR0
  * Only call this function if CPUID indicates that AVX feature is
  * supported by the CPU, otherwise it might be an illegal instruction.
  */
 static inline uint64_t
 xgetbv(uint32_t index)
 {
 	uint32_t eax, edx;
 	/* xgetbv - instruction byte code */
 	__asm__ __volatile__(".byte 0x0f; .byte 0x01; .byte 0xd0"
 	    : "=a" (eax), "=d" (edx)
 	    : "c" (index));
 
 	return ((((uint64_t)edx)<<32) | (uint64_t)eax);
 }
 
 
 /*
  * Detect register set support
  */
 static inline boolean_t
 __simd_state_enabled(const uint64_t state)
 {
 	boolean_t has_osxsave;
 	uint64_t xcr0;
 
 	has_osxsave = (cpu_feature2 & CPUID2_OSXSAVE) != 0;
 
 	if (!has_osxsave)
 		return (B_FALSE);
 
 	xcr0 = xgetbv(0);
 	return ((xcr0 & state) == state);
 }
 
 #define	_XSTATE_SSE_AVX		(0x2 | 0x4)
 #define	_XSTATE_AVX512		(0xE0 | _XSTATE_SSE_AVX)
 
 #define	__ymm_enabled() __simd_state_enabled(_XSTATE_SSE_AVX)
 #define	__zmm_enabled() __simd_state_enabled(_XSTATE_AVX512)
 
 
 /*
  * Check if SSE instruction set is available
  */
 static inline boolean_t
 zfs_sse_available(void)
 {
 	return ((cpu_feature & CPUID_SSE) != 0);
 }
 
 /*
  * Check if SSE2 instruction set is available
  */
 static inline boolean_t
 zfs_sse2_available(void)
 {
 	return ((cpu_feature & CPUID_SSE2) != 0);
 }
 
 /*
  * Check if SSE3 instruction set is available
  */
 static inline boolean_t
 zfs_sse3_available(void)
 {
 	return ((cpu_feature2 & CPUID2_SSE3) != 0);
 }
 
 /*
  * Check if SSSE3 instruction set is available
  */
 static inline boolean_t
 zfs_ssse3_available(void)
 {
 	return ((cpu_feature2 & CPUID2_SSSE3) != 0);
 }
 
 /*
  * Check if SSE4.1 instruction set is available
  */
 static inline boolean_t
 zfs_sse4_1_available(void)
 {
 	return ((cpu_feature2 & CPUID2_SSE41) != 0);
 }
 
 /*
  * Check if SSE4.2 instruction set is available
  */
 static inline boolean_t
 zfs_sse4_2_available(void)
 {
 	return ((cpu_feature2 & CPUID2_SSE42) != 0);
 }
 
 /*
  * Check if AVX instruction set is available
  */
 static inline boolean_t
 zfs_avx_available(void)
 {
 	boolean_t has_avx;
 
 	has_avx = (cpu_feature2 & CPUID2_AVX) != 0;
 
 	return (has_avx && __ymm_enabled());
 }
 
 /*
  * Check if AVX2 instruction set is available
  */
 static inline boolean_t
 zfs_avx2_available(void)
 {
 	boolean_t has_avx2;
 
 	has_avx2 = (cpu_stdext_feature & CPUID_STDEXT_AVX2) != 0;
 
 	return (has_avx2 && __ymm_enabled());
 }
 
 /*
  * Check if SHA_NI instruction set is available
  */
 static inline boolean_t
 zfs_shani_available(void)
 {
 	boolean_t has_shani;
 
 	has_shani = (cpu_stdext_feature & CPUID_STDEXT_SHA) != 0;
 
 	return (has_shani && __ymm_enabled());
 }
 
+/*
+ * Check if SHA-512 extension is available
+ */
+static inline boolean_t
+zfs_sha512ext_available(void)
+{
+#if defined(CPUID_STDEXT4_SHA512)
+	return ((cpu_stdext_feature4 & CPUID_STDEXT4_SHA512) != 0 &&
+	    __ymm_enabled());
+#else
+	return (B_FALSE);
+#endif
+}
+
 /*
  * AVX-512 family of instruction sets:
  *
  * AVX512F	Foundation
  * AVX512CD	Conflict Detection Instructions
  * AVX512ER	Exponential and Reciprocal Instructions
  * AVX512PF	Prefetch Instructions
  *
  * AVX512BW	Byte and Word Instructions
  * AVX512DQ	Double-word and Quadword Instructions
  * AVX512VL	Vector Length Extensions
  *
  * AVX512IFMA	Integer Fused Multiply Add (Not supported by kernel 4.4)
  * AVX512VBMI	Vector Byte Manipulation Instructions
  */
 
 
 /* Check if AVX512F instruction set is available */
 static inline boolean_t
 zfs_avx512f_available(void)
 {
 	boolean_t has_avx512;
 
 	has_avx512 = (cpu_stdext_feature & CPUID_STDEXT_AVX512F) != 0;
 
 	return (has_avx512 && __zmm_enabled());
 }
 
 /* Check if AVX512CD instruction set is available */
 static inline boolean_t
 zfs_avx512cd_available(void)
 {
 	boolean_t has_avx512;
 
 	has_avx512 = (cpu_stdext_feature & CPUID_STDEXT_AVX512F) != 0 &&
 	    (cpu_stdext_feature & CPUID_STDEXT_AVX512CD) != 0;
 
 	return (has_avx512 && __zmm_enabled());
 }
 
 /* Check if AVX512ER instruction set is available */
 static inline boolean_t
 zfs_avx512er_available(void)
 {
 	boolean_t has_avx512;
 
 	has_avx512 = (cpu_stdext_feature & CPUID_STDEXT_AVX512F) != 0 &&
 	    (cpu_stdext_feature & CPUID_STDEXT_AVX512CD) != 0;
 
 	return (has_avx512 && __zmm_enabled());
 }
 
 /* Check if AVX512PF instruction set is available */
 static inline boolean_t
 zfs_avx512pf_available(void)
 {
 	boolean_t has_avx512;
 
 	has_avx512 = (cpu_stdext_feature & CPUID_STDEXT_AVX512F) != 0 &&
 	    (cpu_stdext_feature & CPUID_STDEXT_AVX512PF) != 0;
 
 	return (has_avx512 && __zmm_enabled());
 }
 
 /* Check if AVX512BW instruction set is available */
 static inline boolean_t
 zfs_avx512bw_available(void)
 {
 	boolean_t has_avx512 = B_FALSE;
 
 	has_avx512 = (cpu_stdext_feature & CPUID_STDEXT_AVX512BW) != 0;
 
 	return (has_avx512 && __zmm_enabled());
 }
 
 /* Check if AVX512DQ instruction set is available */
 static inline boolean_t
 zfs_avx512dq_available(void)
 {
 	boolean_t has_avx512;
 
 	has_avx512 = (cpu_stdext_feature & CPUID_STDEXT_AVX512F) != 0 &&
 	    (cpu_stdext_feature & CPUID_STDEXT_AVX512DQ) != 0;
 
 	return (has_avx512 && __zmm_enabled());
 }
 
 /* Check if AVX512VL instruction set is available */
 static inline boolean_t
 zfs_avx512vl_available(void)
 {
 	boolean_t has_avx512;
 
 	has_avx512 = (cpu_stdext_feature & CPUID_STDEXT_AVX512F) != 0 &&
 	    (cpu_stdext_feature & CPUID_STDEXT_AVX512VL) != 0;
 
 	return (has_avx512 && __zmm_enabled());
 }
 
 /* Check if AVX512IFMA instruction set is available */
 static inline boolean_t
 zfs_avx512ifma_available(void)
 {
 	boolean_t has_avx512;
 
 	has_avx512 = (cpu_stdext_feature & CPUID_STDEXT_AVX512F) != 0 &&
 	    (cpu_stdext_feature & CPUID_STDEXT_AVX512IFMA) != 0;
 
 	return (has_avx512 && __zmm_enabled());
 }
 
 /* Check if AVX512VBMI instruction set is available */
 static inline boolean_t
 zfs_avx512vbmi_available(void)
 {
 	boolean_t has_avx512;
 
 	has_avx512 = (cpu_stdext_feature & CPUID_STDEXT_AVX512F) != 0 &&
 	    (cpu_stdext_feature & CPUID_STDEXT_BMI1) != 0;
 
 	return (has_avx512 && __zmm_enabled());
 }
diff --git a/sys/contrib/openzfs/module/Makefile.bsd b/sys/contrib/openzfs/module/Makefile.bsd
index a0ddbeb9ae68..436b090d9a00 100644
--- a/sys/contrib/openzfs/module/Makefile.bsd
+++ b/sys/contrib/openzfs/module/Makefile.bsd
@@ -1,549 +1,549 @@
 .if !defined(WITH_CTF)
 WITH_CTF=1
 .endif
 
 .include <bsd.sys.mk>
 
 SRCDIR=${.CURDIR}
 INCDIR=${.CURDIR:H}/include
 
 KMOD=	openzfs
 
 .PATH:	${SRCDIR}/avl \
 	${SRCDIR}/lua \
 	${SRCDIR}/nvpair \
 	${SRCDIR}/icp/algs/blake3 \
 	${SRCDIR}/icp/algs/edonr \
 	${SRCDIR}/icp/algs/sha2 \
 	${SRCDIR}/icp/asm-aarch64/blake3 \
 	${SRCDIR}/icp/asm-aarch64/sha2 \
 	${SRCDIR}/icp/asm-arm/sha2 \
 	${SRCDIR}/icp/asm-ppc64/sha2 \
 	${SRCDIR}/icp/asm-ppc64/blake3 \
 	${SRCDIR}/icp/asm-x86_64/blake3 \
 	${SRCDIR}/icp/asm-x86_64/sha2 \
 	${SRCDIR}/os/freebsd/spl \
 	${SRCDIR}/os/freebsd/zfs \
 	${SRCDIR}/unicode \
 	${SRCDIR}/zcommon \
 	${SRCDIR}/zfs \
 	${SRCDIR}/zstd \
 	${SRCDIR}/zstd/lib/common \
 	${SRCDIR}/zstd/lib/compress \
 	${SRCDIR}/zstd/lib/decompress
 
 CFLAGS+= -I${INCDIR}
 CFLAGS+= -I${SRCDIR}/icp/include
 CFLAGS+= -I${INCDIR}/os/freebsd
 CFLAGS+= -I${INCDIR}/os/freebsd/spl
 CFLAGS+= -I${INCDIR}/os/freebsd/zfs
 CFLAGS+= -I${SRCDIR}/zstd/include
 CFLAGS+= -include ${INCDIR}/sys/simd_config.h
 CFLAGS+= -include ${INCDIR}/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -I${.CURDIR}
 
 CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D__BSD_VISIBLE=1 \
 	-DHAVE_UIO_ZEROCOPY -DWITHOUT_NETDUMP -D__KERNEL -D_SYS_CONDVAR_H_ \
 	-D_SYS_VMEM_H_ -DKDTRACE_HOOKS -DCOMPAT_FREEBSD11
 
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3 \
 	-DHAVE_TOOLCHAIN_SSE4_1 -DHAVE_TOOLCHAIN_AVX -DHAVE_TOOLCHAIN_AVX2 \
 	-DHAVE_TOOLCHAIN_AVX512F -DHAVE_TOOLCHAIN_AVX512VL \
-	-DHAVE_TOOLCHAIN_AVX512BW
+	-DHAVE_TOOLCHAIN_AVX512BW -DHAVE_TOOLCHAIN_SHA512EXT
 .endif
 
 .if defined(WITH_DEBUG) && ${WITH_DEBUG} == "true"
 CFLAGS+= -DZFS_DEBUG -g
 .if defined(WITH_INVARIANTS) && ${WITH_INVARIANTS} == "true"
  CFLAGS+= -DINVARIANTS -DWITNESS -DOPENSOLARIS_WITNESS
 .endif
 .if defined(WITH_O0) && ${WITH_O0} == "true"
  CFLAGS+= -O0
 .endif
 .else
 CFLAGS += -DNDEBUG
 .endif
 
 .for _SAN in KASAN KMSAN KUBSAN
 .if defined(WITH_${_SAN}) && ${WITH_${_SAN}} == "true"
 KERN_OPTS_EXTRA+= ${_SAN}
 .endif
 .endfor
 
 .if defined(WITH_GCOV) && ${WITH_GCOV} == "true"
 CFLAGS+=	 -fprofile-arcs -ftest-coverage
 .endif
 
 DEBUG_FLAGS=-g
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
 	${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm"
 CFLAGS+= -DBITS_PER_LONG=32
 .else
 CFLAGS+= -DBITS_PER_LONG=64
 .endif
 
 SRCS=	vnode_if.h device_if.h bus_if.h
 
 #avl
 SRCS+=	avl.c
 
 #icp/algs/blake3
 SRCS+=	blake3.c \
 	blake3_generic.c \
 	blake3_impl.c
 
 .if ${MACHINE_ARCH} == "aarch64"
 #icp/asm-aarch64/blake3
 SRCS+=	b3_aarch64_sse2.S \
 	b3_aarch64_sse41.S
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64le"
 #icp/asm-ppc64/blake3
 SRCS+=	b3_ppc64le_sse2.S \
 	b3_ppc64le_sse41.S
 .endif
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 #icp/asm-x86_64/blake3
 SRCS+=	blake3_avx2.S \
 	blake3_avx512.S \
 	blake3_sse2.S \
 	blake3_sse41.S
 .endif
 
 #icp/algs/edonr
 SRCS+=	edonr.c
 
 #icp/algs/sha2
 SRCS+=	sha256_impl.c \
 	sha2_generic.c \
 	sha512_impl.c
 
 .if ${MACHINE_ARCH} == "armv7"
 #icp/asm-arm/sha2
 SRCS+=	sha256-armv7.S \
 	sha512-armv7.S
 .endif
 
 .if ${MACHINE_ARCH} == "aarch64"
 #icp/asm-aarch64/sha2
 SRCS+=	sha256-armv8.S \
 	sha512-armv8.S
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le"
 #icp/asm-ppc64/sha2
 SRCS+=	sha256-p8.S \
 	sha256-ppc.S \
 	sha512-p8.S \
 	sha512-ppc.S
 .endif
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 #icp/asm-x86_64/sha2
 SRCS+=	sha256-x86_64.S \
 	sha512-x86_64.S
 .endif
 
 #lua
 SRCS+=	lapi.c \
 	lauxlib.c \
 	lbaselib.c \
 	lcode.c \
 	lcompat.c \
 	lcorolib.c \
 	lctype.c \
 	ldebug.c \
 	ldo.c \
 	lfunc.c \
 	lgc.c \
 	llex.c \
 	lmem.c \
 	lobject.c \
 	lopcodes.c \
 	lparser.c \
 	lstate.c \
 	lstring.c \
 	lstrlib.c \
 	ltable.c \
 	ltablib.c \
 	ltm.c \
 	lvm.c \
 	lzio.c
 
 #nvpair
 SRCS+=	fnvpair.c \
 	nvpair.c \
 	nvpair_alloc_fixed.c \
 	nvpair_alloc_spl.c
 
 #os/freebsd/spl
 SRCS+=	acl_common.c \
 	callb.c \
 	list.c \
 	spl_acl.c \
 	spl_cmn_err.c \
 	spl_dtrace.c \
 	spl_kmem.c \
 	spl_kstat.c \
 	spl_misc.c \
 	spl_policy.c \
 	spl_procfs_list.c \
 	spl_string.c \
 	spl_sunddi.c \
 	spl_sysevent.c \
 	spl_taskq.c \
 	spl_uio.c \
 	spl_vfs.c \
 	spl_vm.c \
 	spl_zlib.c \
 	spl_zone.c
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
 	${MACHINE_ARCH} == "powerpcspe" || ${MACHINE_ARCH} == "arm"
 SRCS+= spl_atomic.c
 .endif
 
 #os/freebsd/zfs
 SRCS+=	abd_os.c \
 	arc_os.c \
 	crypto_os.c \
 	dmu_os.c \
 	event_os.c \
 	hkdf.c \
 	kmod_core.c \
 	spa_os.c \
 	sysctl_os.c \
 	vdev_geom.c \
 	vdev_label_os.c \
 	zfs_acl.c \
 	zfs_ctldir.c \
 	zfs_crrd.c \
 	zfs_debug.c \
 	zfs_dir.c \
 	zfs_file_os.c \
 	zfs_ioctl_compat.c \
 	zfs_ioctl_os.c \
 	zfs_racct.c \
 	zfs_vfsops.c \
 	zfs_vnops_os.c \
 	zfs_znode_os.c \
 	zio_crypt.c \
 	zvol_os.c
 
 #zcommon
 SRCS+=	cityhash.c \
 	zfeature_common.c \
 	zfs_comutil.c \
 	zfs_deleg.c \
 	zfs_fletcher_avx512.c \
 	zfs_fletcher.c \
 	zfs_fletcher_intel.c \
 	zfs_fletcher_sse.c \
 	zfs_fletcher_superscalar4.c \
 	zfs_fletcher_superscalar.c \
 	zfs_namecheck.c \
 	zfs_prop.c \
 	zfs_valstr.c \
 	zpool_prop.c \
 	zprop_common.c
 
 #zfs
 SRCS+=	abd.c \
 	aggsum.c \
 	arc.c \
 	blake3_zfs.c \
 	blkptr.c \
 	bplist.c \
 	bpobj.c \
 	bptree.c \
 	bqueue.c \
 	brt.c \
 	btree.c \
 	dataset_kstats.c \
 	dbuf.c \
 	dbuf_stats.c \
 	ddt.c \
 	ddt_log.c \
 	ddt_stats.c \
 	ddt_zap.c \
 	dmu.c \
 	dmu_direct.c \
 	dmu_diff.c \
 	dmu_object.c \
 	dmu_objset.c \
 	dmu_recv.c \
 	dmu_redact.c \
 	dmu_send.c \
 	dmu_traverse.c \
 	dmu_tx.c \
 	dmu_zfetch.c \
 	dnode.c \
 	dnode_sync.c \
 	dsl_bookmark.c \
 	dsl_crypt.c \
 	dsl_dataset.c \
 	dsl_deadlist.c \
 	dsl_deleg.c \
 	dsl_destroy.c \
 	dsl_dir.c \
 	dsl_pool.c \
 	dsl_prop.c \
 	dsl_scan.c \
 	dsl_synctask.c \
 	dsl_userhold.c \
 	edonr_zfs.c \
 	fm.c \
 	gzip.c \
 	lz4.c \
 	lz4_zfs.c \
 	lzjb.c \
 	metaslab.c \
 	mmp.c \
 	multilist.c \
 	objlist.c \
 	pathname.c \
 	range_tree.c \
 	refcount.c \
 	rrwlock.c \
 	sa.c \
 	sha2_zfs.c \
 	skein_zfs.c \
 	spa.c \
 	space_map.c \
 	space_reftree.c \
 	spa_checkpoint.c \
 	spa_config.c \
 	spa_errlog.c \
 	spa_history.c \
 	spa_log_spacemap.c \
 	spa_misc.c \
 	spa_stats.c \
 	txg.c \
 	u8_textprep.c \
 	uberblock.c \
 	unique.c \
 	vdev.c \
 	vdev_draid.c \
 	vdev_draid_rand.c \
 	vdev_file.c \
 	vdev_indirect_births.c \
 	vdev_indirect.c \
 	vdev_indirect_mapping.c \
 	vdev_initialize.c \
 	vdev_label.c \
 	vdev_mirror.c \
 	vdev_missing.c \
 	vdev_queue.c \
 	vdev_raidz.c \
 	vdev_raidz_math_avx2.c \
 	vdev_raidz_math_avx512bw.c \
 	vdev_raidz_math_avx512f.c \
 	vdev_raidz_math.c \
 	vdev_raidz_math_scalar.c \
 	vdev_raidz_math_sse2.c \
 	vdev_raidz_math_ssse3.c \
 	vdev_rebuild.c \
 	vdev_removal.c \
 	vdev_root.c \
 	vdev_trim.c \
 	zap.c \
 	zap_fat.c \
 	zap_impl.c \
 	zap_leaf.c \
 	zap_micro.c \
 	zcp.c \
 	zcp_get.c \
 	zcp_global.c \
 	zcp_iter.c \
 	zcp_set.c \
 	zcp_synctask.c \
 	zfeature.c \
 	zfs_byteswap.c \
 	zfs_chksum.c \
 	zfs_fm.c \
 	zfs_fuid.c \
 	zfs_impl.c \
 	zfs_ioctl.c \
 	zfs_log.c \
 	zfs_onexit.c \
 	zfs_quota.c \
 	zfs_ratelimit.c \
 	zfs_replay.c \
 	zfs_rlock.c \
 	zfs_sa.c \
 	zfs_vnops.c \
 	zfs_znode.c \
 	zil.c \
 	zio.c \
 	zio_checksum.c \
 	zio_compress.c \
 	zio_inject.c \
 	zle.c \
 	zrlock.c \
 	zthr.c \
 	zvol.c
 
 #zstd
 SRCS+=	zfs_zstd.c
 
 #zstd/common
 SRCS+=	entropy_common.c \
 	error_private.c \
 	fse_decompress.c \
 	pool.c \
 	zstd_common.c \
 
 #zstd/compress
 SRCS+=	fse_compress.c \
 	hist.c \
 	huf_compress.c \
 	zstd_compress.c \
 	zstd_compress_literals.c \
 	zstd_compress_sequences.c \
 	zstd_compress_superblock.c \
 	zstd_double_fast.c \
 	zstd_fast.c \
 	zstd_lazy.c \
 	zstd_ldm.c \
 	zstd_opt.c \
 	zstd_preSplit.c
 
 #zstd/decompress
 SRCS+=	huf_decompress.c \
 	zstd_ddict.c \
 	zstd_decompress_block.c \
 	zstd_decompress.c
 
 beforeinstall:
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -eu \
 	    -f /etc/mtree/BSD.debug.dist \
 	    -p ${DESTDIR}/usr/lib
 .endif
 
 .include <bsd.kmod.mk>
 
 # Generated binary search code is particularly bad with this optimization.
 # Oddly, range_tree.c is not affected when unrolling is not done and dsl_scan.c
 # is not affected when unrolling is done.
 # Disable it until the following upstream issue is resolved:
 # https://github.com/llvm/llvm-project/issues/62790
 .if ${CC} == "clang"
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 CFLAGS.dsl_scan.c= -mllvm -x86-cmov-converter=false
 CFLAGS.metaslab.c= -mllvm -x86-cmov-converter=false
 CFLAGS.range_tree.c= -mllvm -x86-cmov-converter=false
 CFLAGS.zap_micro.c= -mllvm -x86-cmov-converter=false
 .endif
 .endif
 
 CFLAGS.sysctl_os.c= -include ../zfs_config.h
 CFLAGS.xxhash.c+= -include ${SYSDIR}/sys/_null.h
 
 CFLAGS.gcc+= -Wno-pointer-to-int-cast
 
 CFLAGS.abd.c= -Wno-cast-qual
 CFLAGS.ddt.c= -Wno-cast-qual
 CFLAGS.ddt_log.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.ddt_zap.c= -Wno-cast-qual
 CFLAGS.dmu.c= -Wno-cast-qual
 CFLAGS.dmu_traverse.c= -Wno-cast-qual
 CFLAGS.dnode.c= ${NO_WUNUSED_BUT_SET_VARIABLE}
 CFLAGS.dsl_deadlist.c= -Wno-cast-qual
 CFLAGS.dsl_dir.c= -Wno-cast-qual
 CFLAGS.dsl_prop.c= -Wno-cast-qual
 CFLAGS.edonr.c= -Wno-cast-qual
 CFLAGS.fm.c= -Wno-cast-qual
 CFLAGS.hist.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.lapi.c= -Wno-cast-qual
 CFLAGS.lcompat.c= -Wno-cast-qual
 CFLAGS.ldo.c= ${NO_WINFINITE_RECURSION}
 CFLAGS.lobject.c= -Wno-cast-qual
 CFLAGS.ltable.c= -Wno-cast-qual
 CFLAGS.lvm.c= -Wno-cast-qual
 CFLAGS.lz4.c= -Wno-cast-qual
 CFLAGS.lz4_zfs.c= -Wno-cast-qual
 CFLAGS.nvpair.c= -Wno-cast-qual -DHAVE_RPC_TYPES ${NO_WSTRINGOP_OVERREAD}
 CFLAGS.pool.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.pool.c= -U__BMI__ -fno-tree-vectorize
 CFLAGS.spa.c= -Wno-cast-qual
 CFLAGS.spa_misc.c= -Wno-cast-qual
 CFLAGS.spl_string.c= -Wno-cast-qual
 CFLAGS.spl_vm.c= -Wno-cast-qual
 CFLAGS.spl_zlib.c= -Wno-cast-qual
 CFLAGS.u8_textprep.c= -Wno-cast-qual
 CFLAGS.vdev_draid.c= -Wno-cast-qual
 CFLAGS.vdev_raidz.c= -Wno-cast-qual
 CFLAGS.vdev_raidz_math.c= -Wno-cast-qual
 CFLAGS.vdev_raidz_math_avx2.c= -Wno-cast-qual -Wno-duplicate-decl-specifier
 CFLAGS.vdev_raidz_math_avx512f.c= -Wno-cast-qual -Wno-duplicate-decl-specifier
 CFLAGS.vdev_raidz_math_scalar.c= -Wno-cast-qual
 CFLAGS.vdev_raidz_math_sse2.c= -Wno-cast-qual -Wno-duplicate-decl-specifier
 CFLAGS.zap_impl.c= -Wno-cast-qual
 CFLAGS.zap_leaf.c= -Wno-cast-qual
 CFLAGS.zcp.c= -Wno-cast-qual
 CFLAGS.zfs_fletcher.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.zfs_fletcher_avx512.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.zfs_fletcher_intel.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.zfs_fletcher_sse.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.zfs_fm.c= -Wno-cast-qual ${NO_WUNUSED_BUT_SET_VARIABLE}
 CFLAGS.zfs_ioctl.c= -Wno-cast-qual
 CFLAGS.zfs_log.c= -Wno-cast-qual
 CFLAGS.zfs_vnops_os.c= -Wno-pointer-arith
 CFLAGS.zfs_zstd.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.zil.c= -Wno-cast-qual
 CFLAGS.zio.c= -Wno-cast-qual
 CFLAGS.zprop_common.c= -Wno-cast-qual
 CFLAGS.zrlock.c= -Wno-cast-qual
 
 #zstd
 CFLAGS.entropy_common.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.error_private.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.fse_compress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE}
 CFLAGS.fse_decompress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.huf_compress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.huf_decompress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.xxhash.c+= -U__BMI__ -fno-tree-vectorize
 CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_common.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_compress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_compress_literals.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_compress_sequences.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_compress_superblock.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE}
 CFLAGS.zstd_ddict.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_decompress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_decompress_block.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_double_fast.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_fast.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_lazy.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 
 .if ${MACHINE_ARCH} == "aarch64"
 
 sha256-armv8.o: sha256-armv8.S
 	${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \
 	     -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
 sha512-armv8.o: sha512-armv8.S
 	${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \
 	     -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
 b3_aarch64_sse2.o: b3_aarch64_sse2.S
 	${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \
 	     -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
 b3_aarch64_sse41.o: b3_aarch64_sse41.S
 	${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \
 	     -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
 .endif
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index 44a63977f288..32231d10a99a 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -1,544 +1,544 @@
 SRCDIR=${SRCTOP}/sys/contrib/openzfs/module
 
 KMOD=	zfs
 
 .PATH:	${SRCDIR}/avl \
 	${SRCDIR}/lua \
 	${SRCDIR}/nvpair \
 	${SRCDIR}/icp/algs/blake3 \
 	${SRCDIR}/icp/algs/edonr \
 	${SRCDIR}/icp/algs/sha2 \
 	${SRCDIR}/icp/asm-aarch64/blake3 \
 	${SRCDIR}/icp/asm-aarch64/sha2 \
 	${SRCDIR}/icp/asm-arm/sha2 \
 	${SRCDIR}/icp/asm-ppc64/sha2 \
 	${SRCDIR}/icp/asm-ppc64/blake3 \
 	${SRCDIR}/icp/asm-x86_64/blake3 \
 	${SRCDIR}/icp/asm-x86_64/modes \
 	${SRCDIR}/icp/asm-x86_64/sha2 \
 	${SRCDIR}/os/freebsd/spl \
 	${SRCDIR}/os/freebsd/zfs \
 	${SRCDIR}/unicode \
 	${SRCDIR}/zcommon \
 	${SRCDIR}/zfs \
 	${SRCDIR}/zstd \
 	${SRCDIR}/zstd/lib/common \
 	${SRCDIR}/zstd/lib/compress \
 	${SRCDIR}/zstd/lib/decompress
 
 CFLAGS+= -I${ZINCDIR}
 CFLAGS+= -I${SRCDIR}/icp/include
 CFLAGS+= -I${ZINCDIR}/os/freebsd
 CFLAGS+= -I${ZINCDIR}/os/freebsd/spl
 CFLAGS+= -I${ZINCDIR}/os/freebsd/zfs
 CFLAGS+= -I${SRCDIR}/zstd/include
 CFLAGS+= -I${.CURDIR}
 
 CFLAGS+= -D__KERNEL__ -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D__BSD_VISIBLE=1 \
 	-DHAVE_UIO_ZEROCOPY -DWITHOUT_NETDUMP -D__KERNEL -D_SYS_CONDVAR_H_ \
 	-D_SYS_VMEM_H_
 
 .if ${MACHINE_ARCH} == "amd64"
 CFLAGS+= -D__x86_64 -DHAVE_TOOLCHAIN_SSE2 -DHAVE_TOOLCHAIN_SSSE3 \
 	-DHAVE_TOOLCHAIN_SSE4_1 -DHAVE_TOOLCHAIN_AVX -DHAVE_TOOLCHAIN_AVX2 \
 	-DHAVE_TOOLCHAIN_AVX512F -DHAVE_TOOLCHAIN_AVX512VL \
-	-DHAVE_TOOLCHAIN_AVX512BW
+	-DHAVE_TOOLCHAIN_AVX512BW -DHAVE_TOOLCHAIN_SHA512EXT
 .endif
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
 	${MACHINE_ARCH} == "arm"
 CFLAGS+= -DBITS_PER_LONG=32
 .else
 CFLAGS+= -DBITS_PER_LONG=64
 .endif
 
 SRCS=	vnode_if.h device_if.h bus_if.h
 
 #avl
 SRCS+=	avl.c
 
 #icp/algs/blake3
 SRCS+=	blake3.c \
 	blake3_generic.c \
 	blake3_impl.c
 
 .if ${MACHINE_ARCH} == "aarch64"
 #icp/asm-aarch64/blake3
 SRCS+=	b3_aarch64_sse2.S \
 	b3_aarch64_sse41.S
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64le"
 #icp/asm-ppc64/blake3
 SRCS+=	b3_ppc64le_sse2.S \
 	b3_ppc64le_sse41.S
 .endif
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 #icp/asm-x86_64/blake3
 SRCS+=	blake3_avx2.S \
 	blake3_avx512.S \
 	blake3_sse2.S \
 	blake3_sse41.S
 
 #icp/asm-x86_64/modes
 SRCS+=	aesni-gcm-avx2-vaes.S
 .endif
 
 #icp/algs/edonr
 SRCS+=	edonr.c
 
 #icp/algs/sha2
 SRCS+=	sha256_impl.c \
 	sha2_generic.c \
 	sha512_impl.c
 
 .if ${MACHINE_ARCH} == "armv7"
 #icp/asm-arm/sha2
 SRCS+=	sha256-armv7.S \
 	sha512-armv7.S
 .endif
 
 .if ${MACHINE_ARCH} == "aarch64"
 #icp/asm-aarch64/sha2
 OBJS+=	zfs-sha256-armv8.o \
 	zfs-sha512-armv8.o
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc64le"
 #icp/asm-ppc64/sha2
 SRCS+=	sha256-p8.S \
 	sha256-ppc.S \
 	sha512-p8.S \
 	sha512-ppc.S
 .endif
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 #icp/asm-x86_64/sha2
 OBJS+=	zfs-sha256-x86_64.o \
 	zfs-sha512-x86_64.o
 .endif
 
 #lua
 SRCS+=	lapi.c \
 	lauxlib.c \
 	lbaselib.c \
 	lcode.c \
 	lcompat.c \
 	lcorolib.c \
 	lctype.c \
 	ldebug.c \
 	ldo.c \
 	lfunc.c \
 	lgc.c \
 	llex.c \
 	lmem.c \
 	lobject.c \
 	lopcodes.c \
 	lparser.c \
 	lstate.c \
 	lstring.c \
 	lstrlib.c \
 	ltable.c \
 	ltablib.c \
 	ltm.c \
 	lvm.c \
 	lzio.c
 
 #nvpair
 SRCS+=	fnvpair.c \
 	nvpair.c \
 	nvpair_alloc_fixed.c \
 	nvpair_alloc_spl.c
 
 #os/freebsd/spl
 SRCS+=	acl_common.c \
 	callb.c \
 	list.c \
 	spl_acl.c \
 	spl_cmn_err.c \
 	spl_dtrace.c \
 	spl_kmem.c \
 	spl_kstat.c \
 	spl_misc.c \
 	spl_policy.c \
 	spl_procfs_list.c \
 	spl_string.c \
 	spl_sunddi.c \
 	spl_sysevent.c \
 	spl_taskq.c \
 	spl_uio.c \
 	spl_vfs.c \
 	spl_vm.c \
 	spl_zlib.c \
 	spl_zone.c
 
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
 	${MACHINE_ARCH} == "arm"
 SRCS+= spl_atomic.c
 .endif
 
 #os/freebsd/zfs
 SRCS+=	abd_os.c \
 	arc_os.c \
 	crypto_os.c \
 	dmu_os.c \
 	event_os.c \
 	hkdf.c \
 	kmod_core.c \
 	spa_os.c \
 	sysctl_os.c \
 	vdev_geom.c \
 	vdev_label_os.c \
 	zfs_acl.c \
 	zfs_ctldir.c \
 	zfs_crrd.c \
 	zfs_debug.c \
 	zfs_dir.c \
 	zfs_file_os.c \
 	zfs_ioctl_compat.c \
 	zfs_ioctl_os.c \
 	zfs_racct.c \
 	zfs_vfsops.c \
 	zfs_vnops_os.c \
 	zfs_znode_os.c \
 	zio_crypt.c \
 	zvol_os.c
 
 #zcommon
 SRCS+=	cityhash.c \
 	zfeature_common.c \
 	zfs_comutil.c \
 	zfs_deleg.c \
 	zfs_fletcher_avx512.c \
 	zfs_fletcher.c \
 	zfs_fletcher_intel.c \
 	zfs_fletcher_sse.c \
 	zfs_fletcher_superscalar4.c \
 	zfs_fletcher_superscalar.c \
 	zfs_namecheck.c \
 	zfs_prop.c \
 	zfs_valstr.c \
 	zpool_prop.c \
 	zprop_common.c
 
 #zfs
 SRCS+=	abd.c \
 	aggsum.c \
 	arc.c \
 	blake3_zfs.c \
 	blkptr.c \
 	bplist.c \
 	bpobj.c \
 	bptree.c \
 	bqueue.c \
 	brt.c \
 	btree.c \
 	dataset_kstats.c \
 	dbuf.c \
 	dbuf_stats.c \
 	ddt.c \
 	ddt_log.c \
 	ddt_stats.c \
 	ddt_zap.c \
 	dmu.c \
 	dmu_direct.c \
 	dmu_diff.c \
 	dmu_object.c \
 	dmu_objset.c \
 	dmu_recv.c \
 	dmu_redact.c \
 	dmu_send.c \
 	dmu_traverse.c \
 	dmu_tx.c \
 	dmu_zfetch.c \
 	dnode.c \
 	dnode_sync.c \
 	dsl_bookmark.c \
 	dsl_crypt.c \
 	dsl_dataset.c \
 	dsl_deadlist.c \
 	dsl_deleg.c \
 	dsl_destroy.c \
 	dsl_dir.c \
 	dsl_pool.c \
 	dsl_prop.c \
 	dsl_scan.c \
 	dsl_synctask.c \
 	dsl_userhold.c \
 	edonr_zfs.c \
 	fm.c \
 	gzip.c \
 	lz4.c \
 	lz4_zfs.c \
 	lzjb.c \
 	metaslab.c \
 	mmp.c \
 	multilist.c \
 	objlist.c \
 	pathname.c \
 	range_tree.c \
 	refcount.c \
 	rrwlock.c \
 	sa.c \
 	sha2_zfs.c \
 	skein_zfs.c \
 	spa.c \
 	space_map.c \
 	space_reftree.c \
 	spa_checkpoint.c \
 	spa_config.c \
 	spa_errlog.c \
 	spa_history.c \
 	spa_log_spacemap.c \
 	spa_misc.c \
 	spa_stats.c \
 	txg.c \
 	u8_textprep.c \
 	uberblock.c \
 	unique.c \
 	vdev.c \
 	vdev_draid.c \
 	vdev_draid_rand.c \
 	vdev_file.c \
 	vdev_indirect_births.c \
 	vdev_indirect.c \
 	vdev_indirect_mapping.c \
 	vdev_initialize.c \
 	vdev_label.c \
 	vdev_mirror.c \
 	vdev_missing.c \
 	vdev_queue.c \
 	vdev_raidz.c \
 	vdev_raidz_math_avx2.c \
 	vdev_raidz_math_avx512bw.c \
 	vdev_raidz_math_avx512f.c \
 	vdev_raidz_math.c \
 	vdev_raidz_math_scalar.c \
 	vdev_raidz_math_sse2.c \
 	vdev_raidz_math_ssse3.c \
 	vdev_rebuild.c \
 	vdev_removal.c \
 	vdev_root.c \
 	vdev_trim.c \
 	zap.c \
 	zap_fat.c \
 	zap_impl.c \
 	zap_leaf.c \
 	zap_micro.c \
 	zcp.c \
 	zcp_get.c \
 	zcp_global.c \
 	zcp_iter.c \
 	zcp_set.c \
 	zcp_synctask.c \
 	zfeature.c \
 	zfs_byteswap.c \
 	zfs_chksum.c \
 	zfs_fm.c \
 	zfs_fuid.c \
 	zfs_impl.c \
 	zfs_ioctl.c \
 	zfs_log.c \
 	zfs_onexit.c \
 	zfs_quota.c \
 	zfs_ratelimit.c \
 	zfs_replay.c \
 	zfs_rlock.c \
 	zfs_sa.c \
 	zfs_vnops.c \
 	zfs_znode.c \
 	zil.c \
 	zio.c \
 	zio_checksum.c \
 	zio_compress.c \
 	zio_inject.c \
 	zle.c \
 	zrlock.c \
 	zthr.c \
 	zvol.c
 
 #zstd
 SRCS+=	zfs_zstd.c
 
 #zstd/common
 SRCS+=	entropy_common.c \
 	error_private.c \
 	fse_decompress.c \
 	pool.c \
 	zstd_common.c
 
 #zstd/compress
 SRCS+=	fse_compress.c \
 	hist.c \
 	huf_compress.c \
 	zstd_compress.c \
 	zstd_compress_literals.c \
 	zstd_compress_sequences.c \
 	zstd_compress_superblock.c \
 	zstd_double_fast.c \
 	zstd_fast.c \
 	zstd_lazy.c \
 	zstd_ldm.c \
 	zstd_opt.c \
 	zstd_preSplit.c
 
 #zstd/decompress
 SRCS+=	huf_decompress.c \
 	zstd_ddict.c \
 	zstd_decompress_block.c \
 	zstd_decompress.c
 
 .include <bsd.kmod.mk>
 
 CFLAGS+= -include ${SRCTOP}/sys/cddl/compat/opensolaris/sys/debug_compat.h
 CFLAGS+= -include ${ZINCDIR}/sys/simd_config.h
 CFLAGS+= -include ${ZINCDIR}/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/static_ccompile.h
 
 CFLAGS.sysctl_os.c= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
 CFLAGS.xxhash.c+= -include ${SRCTOP}/sys/sys/_null.h
 
 CFLAGS.gcc+= -Wno-pointer-to-int-cast
 
 CFLAGS.abd.c= -Wno-cast-qual
 CFLAGS.ddt.c= -Wno-cast-qual
 CFLAGS.ddt_log.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.ddt_zap.c= -Wno-cast-qual
 CFLAGS.dmu.c= -Wno-cast-qual
 CFLAGS.dmu_traverse.c= -Wno-cast-qual
 CFLAGS.dnode.c= ${NO_WUNUSED_BUT_SET_VARIABLE}
 CFLAGS.dsl_deadlist.c= -Wno-cast-qual
 CFLAGS.dsl_dir.c= -Wno-cast-qual
 CFLAGS.dsl_prop.c= -Wno-cast-qual
 CFLAGS.edonr.c= -Wno-cast-qual
 CFLAGS.fm.c= -Wno-cast-qual
 CFLAGS.hist.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.lapi.c= -Wno-cast-qual
 CFLAGS.lcompat.c= -Wno-cast-qual
 CFLAGS.ldo.c= ${NO_WINFINITE_RECURSION}
 CFLAGS.lobject.c= -Wno-cast-qual
 CFLAGS.ltable.c= -Wno-cast-qual
 CFLAGS.lvm.c= -Wno-cast-qual
 CFLAGS.lz4.c= -Wno-cast-qual
 CFLAGS.lz4_zfs.c= -Wno-cast-qual
 CFLAGS.nvpair.c= -Wno-cast-qual -DHAVE_RPC_TYPES ${NO_WSTRINGOP_OVERREAD}
 CFLAGS.pool.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.pool.c= -U__BMI__ -fno-tree-vectorize
 CFLAGS.spa.c= -Wno-cast-qual
 CFLAGS.spa_misc.c= -Wno-cast-qual
 CFLAGS.spl_string.c= -Wno-cast-qual
 CFLAGS.spl_vm.c= -Wno-cast-qual
 CFLAGS.spl_zlib.c= -Wno-cast-qual
 CFLAGS.u8_textprep.c= -Wno-cast-qual
 CFLAGS.vdev_draid.c= -Wno-cast-qual
 CFLAGS.vdev_raidz.c= -Wno-cast-qual
 CFLAGS.vdev_raidz_math.c= -Wno-cast-qual
 CFLAGS.vdev_raidz_math_avx2.c= -Wno-cast-qual -Wno-duplicate-decl-specifier
 CFLAGS.vdev_raidz_math_avx512f.c= -Wno-cast-qual -Wno-duplicate-decl-specifier
 CFLAGS.vdev_raidz_math_scalar.c= -Wno-cast-qual
 CFLAGS.vdev_raidz_math_sse2.c= -Wno-cast-qual -Wno-duplicate-decl-specifier
 CFLAGS.zap_leaf.c= -Wno-cast-qual
 CFLAGS.zap_micro.c= -Wno-cast-qual
 CFLAGS.zap_impl.c= -Wno-cast-qual
 CFLAGS.zcp.c= -Wno-cast-qual
 CFLAGS.zfs_fletcher.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.zfs_fletcher_avx512.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.zfs_fletcher_intel.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.zfs_fletcher_sse.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.zfs_fm.c= -Wno-cast-qual ${NO_WUNUSED_BUT_SET_VARIABLE}
 CFLAGS.zfs_ioctl.c= -Wno-cast-qual
 CFLAGS.zfs_log.c= -Wno-cast-qual
 CFLAGS.zfs_vnops_os.c= -Wno-pointer-arith
 CFLAGS.zfs_zstd.c= -Wno-cast-qual -Wno-pointer-arith
 CFLAGS.zil.c= -Wno-cast-qual
 CFLAGS.zio.c= -Wno-cast-qual
 CFLAGS.zprop_common.c= -Wno-cast-qual
 CFLAGS.zrlock.c= -Wno-cast-qual
 
 #zstd
 CFLAGS.entropy_common.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.error_private.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.fse_compress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE}
 CFLAGS.fse_decompress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.huf_compress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.huf_decompress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.xxhash.c+= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize
 CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_common.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_compress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_compress_literals.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_compress_sequences.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_compress_superblock.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE}
 CFLAGS.zstd_ddict.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_decompress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_decompress_block.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_double_fast.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_fast.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_lazy.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_ldm.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_opt.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 CFLAGS.zstd_preSplit.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
 
 .if ${MACHINE_ARCH} == "aarch64"
 CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.error_private.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.fse_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.fse_decompress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.hist.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.huf_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.huf_decompress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.pool.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.xxhash.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_compress_literals.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_compress_sequences.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_compress_superblock.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_ddict.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_decompress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_decompress_block.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_double_fast.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_fast.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_lazy.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_ldm.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 CFLAGS.zstd_opt.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}
 
 b3_aarch64_sse2.o: b3_aarch64_sse2.S
 	${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \
 	     -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
 b3_aarch64_sse41.o: b3_aarch64_sse41.S
 	${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC} \
 	     -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
 zfs-sha256-armv8.o: sha256-armv8.S
 	${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} \
 	    ${SRCDIR}/icp/asm-aarch64/sha2/sha256-armv8.S \
 	    -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
 zfs-sha512-armv8.o: sha512-armv8.S
 	${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} \
 	    ${SRCDIR}/icp/asm-aarch64/sha2/sha512-armv8.S \
 	    -o ${.TARGET}
 	${CTFCONVERT_CMD}
 .endif
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 zfs-sha256-x86_64.o: sha256-x86_64.S
 	${CC} -c ${CFLAGS} ${WERROR} \
 	    ${SRCDIR}/icp/asm-x86_64/sha2/sha256-x86_64.S \
 	    -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
 zfs-sha512-x86_64.o: sha512-x86_64.S
 	${CC} -c ${CFLAGS} ${WERROR} \
 	    ${SRCDIR}/icp/asm-x86_64/sha2/sha512-x86_64.S \
 	    -o ${.TARGET}
 	${CTFCONVERT_CMD}
 .endif