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 047/208] x86/fpu: Move 'PER_CPU(fpu_owner_task)' to fpu/core.c
    Date
    Move it closer to other per-cpu FPU data structures.

    This also unifies the 32-bit and 64-bit code.

    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/cpu/common.c | 3 ---
    arch/x86/kernel/fpu/core.c | 5 +++++
    2 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
    index 220ad95e0e28..88bb7a75f5c6 100644
    --- a/arch/x86/kernel/cpu/common.c
    +++ b/arch/x86/kernel/cpu/common.c
    @@ -1182,8 +1182,6 @@ DEFINE_PER_CPU(unsigned int, irq_count) __visible = -1;
    DEFINE_PER_CPU(int, __preempt_count) = INIT_PREEMPT_COUNT;
    EXPORT_PER_CPU_SYMBOL(__preempt_count);

    -DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);
    -
    /*
    * Special IST stacks which the CPU switches to when it calls
    * an IST-marked descriptor entry. Up to 7 stacks (hardware
    @@ -1274,7 +1272,6 @@ DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task;
    EXPORT_PER_CPU_SYMBOL(current_task);
    DEFINE_PER_CPU(int, __preempt_count) = INIT_PREEMPT_COUNT;
    EXPORT_PER_CPU_SYMBOL(__preempt_count);
    -DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);

    /*
    * On x86_32, vm86 modifies tss.sp0, so sp0 isn't a reliable way to find
    diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
    index c0633ca8fece..7942105a2d20 100644
    --- a/arch/x86/kernel/fpu/core.c
    +++ b/arch/x86/kernel/fpu/core.c
    @@ -20,6 +20,11 @@
    */
    static DEFINE_PER_CPU(bool, in_kernel_fpu);

    +/*
    + * Track which task is using the FPU on the CPU:
    + */
    +DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);
    +
    static void kernel_fpu_disable(void)
    {
    WARN_ON(this_cpu_read(in_kernel_fpu));
    --
    2.1.0


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