lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 107/208] x86/fpu: Move all eager-fpu setup code to eager_fpu_init()
    Date
    The FPU context switch type (lazy or eager) setup code is split into
    two places currently - move it all to eager_fpu_init().

    Note that the code we move will now be executed on non-xstate CPUs
    as well, but this should be safe: both xfeatures_mask and
    cpu_has_xsaveopt is 0 there.

    Reviewed-by: Borislav Petkov <bp@alien8.de>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Dave Hansen <dave.hansen@linux.intel.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/kernel/fpu/xsave.c | 28 ++++++++++++++--------------
    1 file changed, 14 insertions(+), 14 deletions(-)

    diff --git a/arch/x86/kernel/fpu/xsave.c b/arch/x86/kernel/fpu/xsave.c
    index 097f03e209a6..1b920a170576 100644
    --- a/arch/x86/kernel/fpu/xsave.c
    +++ b/arch/x86/kernel/fpu/xsave.c
    @@ -686,20 +686,6 @@ void fpu__init_system_xstate(void)
    prepare_fx_sw_frame();
    setup_init_fpu_buf();

    - /* Auto enable eagerfpu for xsaveopt */
    - if (cpu_has_xsaveopt && eagerfpu != DISABLE)
    - eagerfpu = ENABLE;
    -
    - if (xfeatures_mask & XSTATE_EAGER) {
    - if (eagerfpu == DISABLE) {
    - pr_err("x86/fpu: eagerfpu switching disabled, disabling the following xstate features: 0x%llx.\n",
    - xfeatures_mask & XSTATE_EAGER);
    - xfeatures_mask &= ~XSTATE_EAGER;
    - } else {
    - eagerfpu = ENABLE;
    - }
    - }
    -
    pr_info("x86/fpu: Enabled xstate features 0x%llx, context size is 0x%x bytes, using '%s' format.\n",
    xfeatures_mask,
    xstate_size,
    @@ -715,6 +701,20 @@ void __init_refok eager_fpu_init(void)
    WARN_ON(current->thread.fpu.fpstate_active);
    current_thread_info()->status = 0;

    + /* Auto enable eagerfpu for xsaveopt */
    + if (cpu_has_xsaveopt && eagerfpu != DISABLE)
    + eagerfpu = ENABLE;
    +
    + if (xfeatures_mask & XSTATE_EAGER) {
    + if (eagerfpu == DISABLE) {
    + pr_err("x86/fpu: eagerfpu switching disabled, disabling the following xstate features: 0x%llx.\n",
    + xfeatures_mask & XSTATE_EAGER);
    + xfeatures_mask &= ~XSTATE_EAGER;
    + } else {
    + eagerfpu = ENABLE;
    + }
    + }
    +
    if (eagerfpu == ENABLE)
    setup_force_cpu_cap(X86_FEATURE_EAGER_FPU);

    --
    2.1.0


    \
     
     \ /
      Last update: 2015-05-05 21:01    [W:4.141 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site