aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/kernel-fpu.m49
-rw-r--r--include/linux/simd_aarch64.h6
-rw-r--r--include/linux/simd_x86.h48
-rw-r--r--module/icp/algs/aes/aes_impl.c11
-rw-r--r--module/icp/algs/modes/gcm.c10
-rw-r--r--module/icp/include/aes/aes_impl.h2
-rw-r--r--module/icp/include/modes/gcm_impl.h4
-rw-r--r--module/spl/spl-thread.c3
-rw-r--r--module/zcommon/zfs_fletcher.c6
9 files changed, 57 insertions, 42 deletions
diff --git a/config/kernel-fpu.m4 b/config/kernel-fpu.m4
index 31bf35f83..0e622e859 100644
--- a/config/kernel-fpu.m4
+++ b/config/kernel-fpu.m4
@@ -25,7 +25,8 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
#include <asm/fpu/api.h>
],[
],[
- AC_DEFINE(HAVE_KERNEL_FPU_API_HEADER, 1, [kernel has asm/fpu/api.h])
+ AC_DEFINE(HAVE_KERNEL_FPU_API_HEADER, 1,
+ [kernel has asm/fpu/api.h])
AC_MSG_RESULT(asm/fpu/api.h)
],[
AC_MSG_RESULT(i387.h & xcr.h)
@@ -46,8 +47,10 @@ AC_DEFUN([ZFS_AC_KERNEL_FPU], [
kernel_fpu_end();
], [kernel_fpu_begin], [arch/x86/kernel/fpu/core.c], [
AC_MSG_RESULT(kernel_fpu_*)
- AC_DEFINE(HAVE_KERNEL_FPU, 1, [kernel has kernel_fpu_* functions])
- AC_DEFINE(KERNEL_EXPORTS_X86_FPU, 1, [kernel exports FPU functions])
+ AC_DEFINE(HAVE_KERNEL_FPU, 1,
+ [kernel has kernel_fpu_* functions])
+ AC_DEFINE(KERNEL_EXPORTS_X86_FPU, 1,
+ [kernel exports FPU functions])
],[
ZFS_LINUX_TRY_COMPILE_SYMBOL([
#include <linux/module.h>
diff --git a/include/linux/simd_aarch64.h b/include/linux/simd_aarch64.h
index 1cfcd01e4..b45d31c48 100644
--- a/include/linux/simd_aarch64.h
+++ b/include/linux/simd_aarch64.h
@@ -26,8 +26,10 @@
* USER API:
*
* Kernel fpu methods:
- * kfpu_begin()
- * kfpu_end()
+ * kfpu_allowed()
+ * kfpu_initialize()
+ * kfpu_begin()
+ * kfpu_end()
*/
#ifndef _SIMD_AARCH64_H
diff --git a/include/linux/simd_x86.h b/include/linux/simd_x86.h
index 2d7a1c3a5..641f43955 100644
--- a/include/linux/simd_x86.h
+++ b/include/linux/simd_x86.h
@@ -26,8 +26,10 @@
* USER API:
*
* Kernel fpu methods:
- * kfpu_begin()
- * kfpu_end()
+ * kfpu_allowed()
+ * kfpu_initialize()
+ * kfpu_begin()
+ * kfpu_end()
*
* SIMD support:
*
@@ -37,31 +39,31 @@
* all relevant feature test functions should be called.
*
* Supported features:
- * zfs_sse_available()
- * zfs_sse2_available()
- * zfs_sse3_available()
- * zfs_ssse3_available()
- * zfs_sse4_1_available()
- * zfs_sse4_2_available()
+ * zfs_sse_available()
+ * zfs_sse2_available()
+ * zfs_sse3_available()
+ * zfs_ssse3_available()
+ * zfs_sse4_1_available()
+ * zfs_sse4_2_available()
*
- * zfs_avx_available()
- * zfs_avx2_available()
+ * zfs_avx_available()
+ * zfs_avx2_available()
*
- * zfs_bmi1_available()
- * zfs_bmi2_available()
+ * zfs_bmi1_available()
+ * zfs_bmi2_available()
*
- * zfs_avx512f_available()
- * zfs_avx512cd_available()
- * zfs_avx512er_available()
- * zfs_avx512pf_available()
- * zfs_avx512bw_available()
- * zfs_avx512dq_available()
- * zfs_avx512vl_available()
- * zfs_avx512ifma_available()
- * zfs_avx512vbmi_available()
+ * zfs_avx512f_available()
+ * zfs_avx512cd_available()
+ * zfs_avx512er_available()
+ * zfs_avx512pf_available()
+ * zfs_avx512bw_available()
+ * zfs_avx512dq_available()
+ * zfs_avx512vl_available()
+ * zfs_avx512ifma_available()
+ * zfs_avx512vbmi_available()
*
* NOTE(AVX-512VL): If using AVX-512 instructions with 128Bit registers
- * also add zfs_avx512vl_available() to feature check.
+ * also add zfs_avx512vl_available() to feature check.
*/
#ifndef _SIMD_X86_H
@@ -292,7 +294,7 @@ typedef struct cpuid_feature_desc {
* Descriptions of supported instruction sets
*/
static const cpuid_feature_desc_t cpuid_features[] = {
- [SSE] = {1U, 0U, 1U << 25, EDX },
+ [SSE] = {1U, 0U, 1U << 25, EDX },
[SSE2] = {1U, 0U, 1U << 26, EDX },
[SSE3] = {1U, 0U, 1U << 0, ECX },
[SSSE3] = {1U, 0U, 1U << 9, ECX },
diff --git a/module/icp/algs/aes/aes_impl.c b/module/icp/algs/aes/aes_impl.c
index 457b9e45c..0f11f9999 100644
--- a/module/icp/algs/aes/aes_impl.c
+++ b/module/icp/algs/aes/aes_impl.c
@@ -311,16 +311,21 @@ aes_impl_init(void *arg)
}
aes_supp_impl_cnt = c;
- /* set fastest implementation. assume hardware accelerated is fastest */
+ /*
+ * Set the fastest implementation given the assumption that the
+ * hardware accelerated version is the fastest.
+ */
#if defined(__x86_64)
#if defined(HAVE_AES)
- if (aes_aesni_impl.is_supported())
+ if (aes_aesni_impl.is_supported()) {
memcpy(&aes_fastest_impl, &aes_aesni_impl,
sizeof (aes_fastest_impl));
- else
+ } else
#endif
+ {
memcpy(&aes_fastest_impl, &aes_x86_64_impl,
sizeof (aes_fastest_impl));
+ }
#else
memcpy(&aes_fastest_impl, &aes_generic_impl,
sizeof (aes_fastest_impl));
diff --git a/module/icp/algs/modes/gcm.c b/module/icp/algs/modes/gcm.c
index f6f8434de..423b70e2c 100644
--- a/module/icp/algs/modes/gcm.c
+++ b/module/icp/algs/modes/gcm.c
@@ -647,7 +647,7 @@ const gcm_impl_ops_t *gcm_all_impl[] = {
/* Indicate that benchmark has been completed */
static boolean_t gcm_impl_initialized = B_FALSE;
-/* Select aes implementation */
+/* Select GCM implementation */
#define IMPL_FASTEST (UINT32_MAX)
#define IMPL_CYCLE (UINT32_MAX-1)
@@ -724,13 +724,15 @@ gcm_impl_init(void *arg)
* hardware accelerated version is the fastest.
*/
#if defined(__x86_64) && defined(HAVE_PCLMULQDQ)
- if (gcm_pclmulqdq_impl.is_supported())
+ if (gcm_pclmulqdq_impl.is_supported()) {
memcpy(&gcm_fastest_impl, &gcm_pclmulqdq_impl,
sizeof (gcm_fastest_impl));
- else
+ } else
#endif
+ {
memcpy(&gcm_fastest_impl, &gcm_generic_impl,
sizeof (gcm_fastest_impl));
+ }
strcpy(gcm_fastest_impl.name, "fastest");
@@ -753,7 +755,7 @@ static const struct {
* If we are called before init(), user preference will be saved in
* user_sel_impl, and applied in later init() call. This occurs when module
* parameter is specified on module load. Otherwise, directly update
- * icp_aes_impl.
+ * icp_gcm_impl.
*
* @val Name of gcm implementation to use
* @param Unused.
diff --git a/module/icp/include/aes/aes_impl.h b/module/icp/include/aes/aes_impl.h
index 9fd9c1bd1..329e32a8e 100644
--- a/module/icp/include/aes/aes_impl.h
+++ b/module/icp/include/aes/aes_impl.h
@@ -162,7 +162,7 @@ typedef enum aes_mech_type {
#endif /* _AES_IMPL */
/*
- * Methods used to define aes implementation
+ * Methods used to define AES implementation
*
* @aes_gen_f Key generation
* @aes_enc_f Function encrypts one block
diff --git a/module/icp/include/modes/gcm_impl.h b/module/icp/include/modes/gcm_impl.h
index 138090487..dff372ef8 100644
--- a/module/icp/include/modes/gcm_impl.h
+++ b/module/icp/include/modes/gcm_impl.h
@@ -37,12 +37,12 @@ extern "C" {
#include <sys/crypto/common.h>
/*
- * Methods used to define gcm implementation
+ * Methods used to define GCM implementation
*
* @gcm_mul_f Perform carry-less multiplication
* @gcm_will_work_f Function tests whether implementation will function
*/
-typedef void (*gcm_mul_f)(uint64_t *, uint64_t *, uint64_t *);
+typedef void (*gcm_mul_f)(uint64_t *, uint64_t *, uint64_t *);
typedef boolean_t (*gcm_will_work_f)(void);
#define GCM_IMPL_NAME_MAX (16)
diff --git a/module/spl/spl-thread.c b/module/spl/spl-thread.c
index c4977bcf2..07e3a1bff 100644
--- a/module/spl/spl-thread.c
+++ b/module/spl/spl-thread.c
@@ -155,8 +155,9 @@ spl_kthread_create(int (*func)(void *), void *data, const char namefmt[], ...)
if (PTR_ERR(tsk) == -ENOMEM)
continue;
return (NULL);
- } else
+ } else {
return (tsk);
+ }
} while (1);
}
EXPORT_SYMBOL(spl_kthread_create);
diff --git a/module/zcommon/zfs_fletcher.c b/module/zcommon/zfs_fletcher.c
index b75d8ab00..9187a7c1e 100644
--- a/module/zcommon/zfs_fletcher.c
+++ b/module/zcommon/zfs_fletcher.c
@@ -595,8 +595,9 @@ fletcher_4_incremental_byteswap(void *buf, size_t size, void *data)
}
#if defined(_KERNEL)
-/* Fletcher 4 kstats */
-
+/*
+ * Fletcher 4 kstats
+ */
static int
fletcher_4_kstat_headers(char *buf, size_t size)
{
@@ -673,7 +674,6 @@ fletcher_4_benchmark_impl(boolean_t native, char *data, uint64_t data_size)
zio_cksum_t zc;
uint32_t i, l, sel_save = IMPL_READ(fletcher_4_impl_chosen);
-
fletcher_checksum_func_t *fletcher_4_test = native ?
fletcher_4_native : fletcher_4_byteswap;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 03:31:07 +0000