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

x86/iopl/64: Properly context-switch IOPL on Xen PV

On Xen PV, regs->flags doesn't reliably reflect IOPL and the
exit-to-userspace code doesn't change IOPL. We need to context
switch it manually.

I'm doing this without going through paravirt because this is
specific to Xen PV. After the dust settles, we can merge this with
the 32-bit code, tidy up the iopl syscall implementation, and remove
the set_iopl pvop entirely.

Fixes XSA-171.

Reviewewd-by: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jan Beulich <JBeulich@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/693c3bd7aeb4d3c27c92c622b7d0f554a458173c.1458162709.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Andy Lutomirski and committed by
Ingo Molnar
b7a58459 b0898301

+15 -1
+2
arch/x86/include/asm/xen/hypervisor.h
··· 62 62 void xen_arch_unregister_cpu(int num); 63 63 #endif 64 64 65 + extern void xen_set_iopl_mask(unsigned mask); 66 + 65 67 #endif /* _ASM_X86_XEN_HYPERVISOR_H */
+12
arch/x86/kernel/process_64.c
··· 48 48 #include <asm/syscalls.h> 49 49 #include <asm/debugreg.h> 50 50 #include <asm/switch_to.h> 51 + #include <asm/xen/hypervisor.h> 51 52 52 53 asmlinkage extern void ret_from_fork(void); 53 54 ··· 411 410 if (unlikely(task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT || 412 411 task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV)) 413 412 __switch_to_xtra(prev_p, next_p, tss); 413 + 414 + #ifdef CONFIG_XEN 415 + /* 416 + * On Xen PV, IOPL bits in pt_regs->flags have no effect, and 417 + * current_pt_regs()->flags may not match the current task's 418 + * intended IOPL. We need to switch it manually. 419 + */ 420 + if (unlikely(static_cpu_has(X86_FEATURE_XENPV) && 421 + prev->iopl != next->iopl)) 422 + xen_set_iopl_mask(next->iopl); 423 + #endif 414 424 415 425 if (static_cpu_has_bug(X86_BUG_SYSRET_SS_ATTRS)) { 416 426 /*
+1 -1
arch/x86/xen/enlighten.c
··· 961 961 tss->x86_tss.sp0 = thread->sp0; 962 962 } 963 963 964 - static void xen_set_iopl_mask(unsigned mask) 964 + void xen_set_iopl_mask(unsigned mask) 965 965 { 966 966 struct physdev_set_iopl set_iopl; 967 967