Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/mm, sched/core: Turn off IRQs in switch_mm()

Potential races between switch_mm() and TLB-flush or LDT-flush IPIs
could be very messy. AFAICT the code is currently okay, whether by
accident or by careful design, but enabling PCID will make it
considerably more complicated and will no longer be obviously safe.

Fix it with a big hammer: run switch_mm() with IRQs off.

To avoid a performance hit in the scheduler, we take advantage of
our knowledge that the scheduler already has IRQs disabled when it
calls switch_mm().

Signed-off-by: Andy Lutomirski <luto@kernel.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/f19baf759693c9dcae64bbff76189db77cb13398.1461688545.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Andy Lutomirski and committed by
Ingo Molnar
078194f8 69c0319a

+13
+3
arch/x86/include/asm/mmu_context.h
··· 118 118 extern void switch_mm(struct mm_struct *prev, struct mm_struct *next, 119 119 struct task_struct *tsk); 120 120 121 + extern void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next, 122 + struct task_struct *tsk); 123 + #define switch_mm_irqs_off switch_mm_irqs_off 121 124 122 125 #define activate_mm(prev, next) \ 123 126 do { \
+10
arch/x86/mm/tlb.c
··· 64 64 void switch_mm(struct mm_struct *prev, struct mm_struct *next, 65 65 struct task_struct *tsk) 66 66 { 67 + unsigned long flags; 68 + 69 + local_irq_save(flags); 70 + switch_mm_irqs_off(prev, next, tsk); 71 + local_irq_restore(flags); 72 + } 73 + 74 + void switch_mm_irqs_off(struct mm_struct *prev, struct mm_struct *next, 75 + struct task_struct *tsk) 76 + { 67 77 unsigned cpu = smp_processor_id(); 68 78 69 79 if (likely(prev != next)) {