lkml.org 
[lkml]   [2021]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/fpu] x86/fpu: Get rid of fpu__get_supported_xfeatures_mask()
    The following commit has been merged into the x86/fpu branch of tip:

    Commit-ID: ce38f038ede735fd425ebda10d1758420a669a87
    Gitweb: https://git.kernel.org/tip/ce38f038ede735fd425ebda10d1758420a669a87
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Wed, 23 Jun 2021 14:01:32 +02:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Wed, 23 Jun 2021 17:49:46 +02:00

    x86/fpu: Get rid of fpu__get_supported_xfeatures_mask()

    This function is really not doing what the comment advertises:

    "Find supported xfeatures based on cpu features and command-line input.
    This must be called after fpu__init_parse_early_param() is called and
    xfeatures_mask is enumerated."

    fpu__init_parse_early_param() does not exist anymore and the function just
    returns a constant.

    Remove it and fix the caller and get rid of further references to
    fpu__init_parse_early_param().

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/20210623121451.816404717@linutronix.de
    ---
    arch/x86/include/asm/fpu/internal.h | 1 -
    arch/x86/kernel/cpu/common.c | 5 ++---
    arch/x86/kernel/fpu/init.c | 11 -----------
    arch/x86/kernel/fpu/xstate.c | 4 +++-
    4 files changed, 5 insertions(+), 16 deletions(-)

    diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h
    index 16bf4d4..58f2082 100644
    --- a/arch/x86/include/asm/fpu/internal.h
    +++ b/arch/x86/include/asm/fpu/internal.h
    @@ -45,7 +45,6 @@ extern void fpu__init_cpu_xstate(void);
    extern void fpu__init_system(struct cpuinfo_x86 *c);
    extern void fpu__init_check_bugs(void);
    extern void fpu__resume_cpu(void);
    -extern u64 fpu__get_supported_xfeatures_mask(void);

    /*
    * Debugging facility:
    diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
    index dcbb11f..f875dea 100644
    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -1715,9 +1715,8 @@ void print_cpu_info(struct cpuinfo_x86 *c)
    }

    /*
    - * clearcpuid= was already parsed in fpu__init_parse_early_param.
    - * But we need to keep a dummy __setup around otherwise it would
    - * show up as an environment variable for init.
    + * clearcpuid= was already parsed in cpu_parse_early_param(). This dummy
    + * function prevents it from becoming an environment variable for init.
    */
    static __init int setup_clearcpuid(char *arg)
    {
    diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c
    index 95aa109..64e2992 100644
    --- a/arch/x86/kernel/fpu/init.c
    +++ b/arch/x86/kernel/fpu/init.c
    @@ -216,17 +216,6 @@ static void __init fpu__init_system_xstate_size_legacy(void)
    fpu_user_xstate_size = fpu_kernel_xstate_size;
    }

    -/*
    - * Find supported xfeatures based on cpu features and command-line input.
    - * This must be called after fpu__init_parse_early_param() is called and
    - * xfeatures_mask is enumerated.
    - */
    -u64 __init fpu__get_supported_xfeatures_mask(void)
    -{
    - return XFEATURE_MASK_USER_SUPPORTED |
    - XFEATURE_MASK_SUPERVISOR_SUPPORTED;
    -}
    -
    /* Legacy code to initialize eager fpu mode. */
    static void __init fpu__init_system_ctx_switch(void)
    {
    diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
    index a64f61a..5e825ff 100644
    --- a/arch/x86/kernel/fpu/xstate.c
    +++ b/arch/x86/kernel/fpu/xstate.c
    @@ -868,7 +868,9 @@ void __init fpu__init_system_xstate(void)
    xfeatures_mask_all &= ~BIT_ULL(i);
    }

    - xfeatures_mask_all &= fpu__get_supported_xfeatures_mask();
    + xfeatures_mask_all &= XFEATURE_MASK_USER_SUPPORTED |
    + XFEATURE_MASK_SUPERVISOR_SUPPORTED;
    +
    /* Store it for paranoia check at the end */
    xfeatures = xfeatures_mask_all;

    \
     
     \ /
      Last update: 2021-06-24 00:11    [W:4.059 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site