lkml.org 
[lkml]   [2022]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 10/19] crypto: x86/sha1, sha256 - load based on CPU features
    Date
    Like commit aa031b8f702e ("crypto: x86/sha512 - load based on CPU
    features"), add module aliases for x86-optimized crypto modules:
    sha1, sha256
    based on CPU feature bits so udev gets a chance to load them later in
    the boot process when the filesystems are all running.

    This commit covers modules that created rcu stall issues
    due to kernel_fpu_begin/kernel_fpu_end calls.

    Signed-off-by: Robert Elliott <elliott@hpe.com>
    ---
    arch/x86/crypto/sha1_ssse3_glue.c | 13 +++++++++++++
    arch/x86/crypto/sha256_ssse3_glue.c | 13 +++++++++++++
    2 files changed, 26 insertions(+)

    diff --git a/arch/x86/crypto/sha1_ssse3_glue.c b/arch/x86/crypto/sha1_ssse3_glue.c
    index a9f5779b41ca..edffc33bd12e 100644
    --- a/arch/x86/crypto/sha1_ssse3_glue.c
    +++ b/arch/x86/crypto/sha1_ssse3_glue.c
    @@ -24,6 +24,7 @@
    #include <linux/types.h>
    #include <crypto/sha1.h>
    #include <crypto/sha1_base.h>
    +#include <asm/cpu_device_id.h>
    #include <asm/simd.h>

    #define FPU_BYTES 4096U /* avoid kernel_fpu_begin/end scheduler/rcu stalls */
    @@ -310,6 +311,15 @@ static int register_sha1_ni(void)
    return 0;
    }

    +static const struct x86_cpu_id module_cpu_ids[] = {
    + X86_MATCH_FEATURE(X86_FEATURE_SHA_NI, NULL),
    + X86_MATCH_FEATURE(X86_FEATURE_AVX2, NULL),
    + X86_MATCH_FEATURE(X86_FEATURE_AVX, NULL),
    + X86_MATCH_FEATURE(X86_FEATURE_SSSE3, NULL),
    + {}
    +};
    +MODULE_DEVICE_TABLE(x86cpu, module_cpu_ids);
    +
    static void unregister_sha1_ni(void)
    {
    if (boot_cpu_has(X86_FEATURE_SHA_NI))
    @@ -326,6 +336,9 @@ static int __init sha1_ssse3_mod_init(void)
    if (register_sha1_ssse3())
    goto fail;

    + if (!x86_match_cpu(module_cpu_ids))
    + return -ENODEV;
    +
    if (register_sha1_avx()) {
    unregister_sha1_ssse3();
    goto fail;
    diff --git a/arch/x86/crypto/sha256_ssse3_glue.c b/arch/x86/crypto/sha256_ssse3_glue.c
    index 322c8aa907af..42e8cb1a6708 100644
    --- a/arch/x86/crypto/sha256_ssse3_glue.c
    +++ b/arch/x86/crypto/sha256_ssse3_glue.c
    @@ -38,6 +38,7 @@
    #include <crypto/sha2.h>
    #include <crypto/sha256_base.h>
    #include <linux/string.h>
    +#include <asm/cpu_device_id.h>
    #include <asm/simd.h>

    #define FPU_BYTES 4096U /* avoid kernel_fpu_begin/end scheduler/rcu stalls */
    @@ -366,6 +367,15 @@ static struct shash_alg sha256_ni_algs[] = { {
    }
    } };

    +static const struct x86_cpu_id module_cpu_ids[] = {
    + X86_MATCH_FEATURE(X86_FEATURE_SHA_NI, NULL),
    + X86_MATCH_FEATURE(X86_FEATURE_AVX2, NULL),
    + X86_MATCH_FEATURE(X86_FEATURE_AVX, NULL),
    + X86_MATCH_FEATURE(X86_FEATURE_SSSE3, NULL),
    + {}
    +};
    +MODULE_DEVICE_TABLE(x86cpu, module_cpu_ids);
    +
    static int register_sha256_ni(void)
    {
    if (boot_cpu_has(X86_FEATURE_SHA_NI))
    @@ -388,6 +398,9 @@ static inline void unregister_sha256_ni(void) { }

    static int __init sha256_ssse3_mod_init(void)
    {
    + if (!x86_match_cpu(module_cpu_ids))
    + return -ENODEV;
    +
    if (register_sha256_ssse3())
    goto fail;

    --
    2.37.3
    \
     
     \ /
      Last update: 2022-10-13 00:03    [W:4.124 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site