x86/entry: Fixes and cleanups
Subsystems (8)
Andy Lutomirski
maintainerv2 cover x86/entry: Fixes and cleanups
These are in priority order. Patch 1 could be folded into the patch it fixes. The selftests improve my confidence in the correctness of the whole pile. The next two patches fix IDTENTRY miswiring. The last two are optional and could easily wait until the next merge window.
Andy Lutomirski (6):
x86/entry/compat: Clear RAX high bits on Xen PV SYSENTER x86/entry, selftests: Further improve user entry sanity checks x86/entry/xen: Route #DB correctly on Xen PV x86/entry/32: Fix #MC and #DB wiring on x86_32 x86/ldt: Disable 16-bit segments on Xen PV x86/entry: Rename idtentry_enter/exit_cond_rcu() to
idtentry_enter/exit()
arch/x86/entry/common.c | 69 +++++++++++++++------- arch/x86/entry/entry_64_compat.S | 19 +++--- arch/x86/include/asm/idtentry.h | 75 +++++++++++------------- arch/x86/kernel/cpu/mce/core.c | 4 +- arch/x86/kernel/kvm.c | 6 +- arch/x86/kernel/ldt.c | 35 ++++++++++- arch/x86/kernel/traps.c | 20 +++++-- arch/x86/mm/fault.c | 6 +- arch/x86/xen/enlighten_pv.c | 28 +++++++-- arch/x86/xen/xen-asm_64.S | 5 +- kernel/time/tick-sched.c | 1 + tools/testing/selftests/x86/syscall_nt.c | 11 ++++ 12 files changed, 189 insertions(+), 90 deletions(-)
Signature · 1 line
2.25.4
Andy Lutomirski
maintainerPATCH v2 1/6 x86/entry/compat: Clear RAX high bits on Xen PV SYSENTER
Move the cleari the high bits of RAX after Xen PV joins the SYSENTER path so that Xen PV doesn't skip it.
Arguably we should delete this code instead, but that would belong in the merge window.
--- arch/x86/entry/entry_64_compat.S | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
arch/x86/entry/entry_64_compat.S +10 -9
@@ -57,15 +57,6 @@ SYM_CODE_START(entry_SYSENTER_compat) movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp - /* - * User tracing code (ptrace or signal handlers) might assume that - * the saved RAX contains a 32-bit number when we're invoking a 32-bit - * syscall. Just in case the high bits are nonzero, zero-extend - * the syscall number. (This could almost certainly be deleted - * with no ill effects.) - */ - movl %eax, %eax - /* Construct struct pt_regs on stack */ pushq $__USER32_DS /* pt_regs->ss */ pushq $0 /* pt_regs->sp = 0 (placeholder) */
@@ -80,6 +71,16 @@ SYM_CODE_START(entry_SYSENTER_compat) pushq $__USER32_CS /* pt_regs->cs */ pushq $0 /* pt_regs->ip = 0 (placeholder) */ SYM_INNER_LABEL(entry_SYSENTER_compat_after_hwframe, SYM_L_GLOBAL) + + /* + * User tracing code (ptrace or signal handlers) might assume that + * the saved RAX contains a 32-bit number when we're invoking a 32-bit + * syscall. Just in case the high bits are nonzero, zero-extend + * the syscall number. (This could almost certainly be deleted + * with no ill effects.) + */ + movl %eax, %eax + pushq %rax /* pt_regs->orig_ax */ pushq %rdi /* pt_regs->di */ pushq %rsi /* pt_regs->si */
Signature · 1 line
2.25.4
Andy Lutomirski
maintainerPATCH v2 5/6 x86/ldt: Disable 16-bit segments on Xen PV
In reply to Andy LutomirskiXen PV doesn't implement ESPFIX64, so they don't work right. Disable them. Also print a warning the first time anyone tries to use a 16-bit segment on a Xen PV guest that would otherwise allow it to help people diagnose this change in behavior.
This gets us closer to having all x86 selftests pass on Xen PV.
--- arch/x86/kernel/ldt.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
arch/x86/kernel/ldt.c +34 -1
@@ -29,6 +29,8 @@#include <asm/mmu_context.h> #include <asm/pgtable_areas.h> +#include <xen/xen.h> +/* This is a multiple of PAGE_SIZE. */ #define LDT_SLOT_STRIDE (LDT_ENTRIES * LDT_ENTRY_SIZE)
@@ -543,6 +545,37 @@ static int read_default_ldt(void __user *ptr, unsigned long bytecount)return bytecount; } +static bool allow_16bit_segments (void ) +{ +if (!IS_ENABLED (CONFIG_X86_16BIT )) +return false; + +#ifdef CONFIG_XEN_PV +/* +* Xen PV does not implement ESPFIX64, which means that 16-bit +* segments will not work correctly. Until either Xen PV implements +* ESPFIX64 and can signal this fact to the guest or unless someone +* provides compelling evidence that allowing broken 16-bit segments +* is worthwhile, disallow 16-bit segments under Xen PV. +*/ +if (xen_pv_domain ()) { +static DEFINE_MUTEX (xen_warning); +static bool warned; + +mutex_lock (&xen_warning); +if (!warned) { +pr_info ("Warning: 16-bit segments do not work correctly in a Xen PV guest\n" ); + warned = true; + } +mutex_unlock (&xen_warning); + +return false; + } +#endif + +return true; +} +static int write_ldt (void __user *ptr,unsigned long bytecount,int oldmode) {struct mm_struct *mm = current->mm;
@@ -574,7 +607,7 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)/* The user wants to clear the entry. */ memset (&ldt,0 ,sizeof (ldt)); }else { -if (!IS_ENABLED (CONFIG_X86_16BIT ) && !ldt_info.seg_32bit) { +if (!ldt_info.seg_32bit && !allow_16bit_segments ()) { error = -EINVAL ; goto out; }
Signature · 1 line
2.25.4
Andy Lutomirski
maintainerPATCH v2 4/6 x86/entry/32: Fix #MC and #DB wiring on x86_32
In reply to Andy LutomirskiDEFINE_IDTENTRY_MCE and DEFINE_IDTENTRY_DEBUG were wired up as non-RAW on x86_32, but the code expected them to be RAW.
Get rid of all the macro indirection for them on 32-bit and just use DECLARE_IDTENTRY_RAW and DEFINE_IDTENTRY_RAW directly.
Also add a warning to make sure that we only hit the _kernel paths in kernel mode.
--- arch/x86/include/asm/idtentry.h | 23 +++++++++++++---------- arch/x86/kernel/cpu/mce/core.c | 4 +++- arch/x86/kernel/traps.c | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-)
arch/x86/include/asm/idtentry.h +13 -10
@@ -353,10 +353,6 @@ static __always_inline void __##func(struct pt_regs *regs)#else /* CONFIG_X86_64 */ -/* Maps to a regular IDTENTRY on 32bit for now */ -# define DECLARE_IDTENTRY_IST DECLARE_IDTENTRY -# define DEFINE_IDTENTRY_IST DEFINE_IDTENTRY -/** * DECLARE_IDTENTRY_DF - Declare functions for double fault 32bit variant * @vector: Vector number (ignored for C)
@@ -387,16 +383,18 @@ __visible noinstr void func(struct pt_regs *regs, \#endif /* !CONFIG_X86_64 */ /* C-Code mapping */ +#define DECLARE_IDTENTRY_NMI DECLARE_IDTENTRY_RAW +#define DEFINE_IDTENTRY_NMI DEFINE_IDTENTRY_RAW + +#ifdef CONFIG_X86_64 #define DECLARE_IDTENTRY_MCE DECLARE_IDTENTRY_IST#define DEFINE_IDTENTRY_MCE DEFINE_IDTENTRY_IST#define DEFINE_IDTENTRY_MCE_USER DEFINE_IDTENTRY_NOIST -#define DECLARE_IDTENTRY_NMI DECLARE_IDTENTRY_RAW -#define DEFINE_IDTENTRY_NMI DEFINE_IDTENTRY_RAW -#define DECLARE_IDTENTRY_DEBUG DECLARE_IDTENTRY_IST#define DEFINE_IDTENTRY_DEBUG DEFINE_IDTENTRY_IST#define DEFINE_IDTENTRY_DEBUG_USER DEFINE_IDTENTRY_NOIST +#endif #else /* !__ASSEMBLY__ */
@@ -443,9 +441,6 @@ __visible noinstr void func(struct pt_regs *regs, \# define DECLARE_IDTENTRY_MCE (vector, func) \ DECLARE_IDTENTRY(vector, func) -# define DECLARE_IDTENTRY_DEBUG (vector, func) \ - DECLARE_IDTENTRY(vector, func) -/* No ASM emitted for DF as this goes through a C shim */ # define DECLARE_IDTENTRY_DF (vector, func)
@@ -549,7 +544,11 @@ DECLARE_IDTENTRY_RAW(X86_TRAP_BP, exc_int3);DECLARE_IDTENTRY_RAW_ERRORCODE (X86_TRAP_PF , exc_page_fault);#ifdef CONFIG_X86_MCE +#ifdef CONFIG_X86_64 DECLARE_IDTENTRY_MCE (X86_TRAP_MC , exc_machine_check); +#else +DECLARE_IDTENTRY_RAW (X86_TRAP_MC , exc_machine_check); +#endif #endif /* NMI */
@@ -559,7 +558,11 @@ DECLARE_IDTENTRY_RAW(X86_TRAP_NMI, xenpv_exc_nmi);#endif /* #DB */ +#ifdef CONFIG_X86_64 DECLARE_IDTENTRY_DEBUG (X86_TRAP_DB , exc_debug); +#else +DECLARE_IDTENTRY_RAW (X86_TRAP_DB , exc_debug); +#endif #ifdef CONFIG_XEN_PV DECLARE_IDTENTRY_RAW (X86_TRAP_DB , xenpv_exc_debug);#endif
arch/x86/kernel/cpu/mce/core.c +3 -1
@@ -1901,6 +1901,8 @@ void (*machine_check_vector)(struct pt_regs *) = unexpected_machine_check; static __always_inline void exc_machine_check_kernel(struct pt_regs *regs) { +WARN_ON_ONCE (user_mode (regs)); +/* * Only required when from kernel mode. See * mce_check_crashing_cpu() for details.
@@ -1954,7 +1956,7 @@ DEFINE_IDTENTRY_MCE_USER(exc_machine_check) }#else /* 32bit unified entry point */ -DEFINE_IDTENTRY_MCE (exc_machine_check) +DEFINE_IDTENTRY_RAW (exc_machine_check) {unsigned long dr7;
arch/x86/kernel/traps.c +1 -1
@@ -925,7 +925,7 @@ DEFINE_IDTENTRY_DEBUG_USER(exc_debug) }#else /* 32 bit does not have separate entry points. */ -DEFINE_IDTENTRY_DEBUG (exc_debug) +DEFINE_IDTENTRY_RAW (exc_debug) {unsigned long dr6, dr7;
Signature · 1 line
2.25.4
Andy Lutomirski
maintainerPATCH v2 6/6 x86/entry: Rename idtentry_enter/exit_cond_rcu() to idtentry_enter/exit()
In reply to Andy LutomirskiThey were originally called _cond_rcu because they were special versions with conditional RCU handling. Now they're the standard entry and exit path, so the _cond_rcu part is just confusing. Drop it.
Also change the signature to make them more extensible and more foolproof.
This patch makes no functional change -- it's pure refactoring.
--- arch/x86/entry/common.c | 50 ++++++++++++++++++--------------- arch/x86/include/asm/idtentry.h | 28 ++++++++++-------- arch/x86/kernel/kvm.c | 6 ++-- arch/x86/kernel/traps.c | 6 ++-- arch/x86/mm/fault.c | 6 ++-- kernel/time/tick-sched.c | 1 + 6 files changed, 54 insertions(+), 43 deletions(-)
arch/x86/entry/common.c +28 -22
@@ -559,8 +559,7 @@ SYSCALL_DEFINE0(ni_syscall) }/** -* idtentry_enter_cond_rcu - Handle state tracking on idtentry with conditional -* RCU handling +* idtentry_enter - Handle state tracking on ordinary idtentries * @regs: Pointer to pt_regs of interrupted context * * Invokes:
@@ -572,6 +571,9 @@ SYSCALL_DEFINE0(ni_syscall)* - The hardirq tracer to keep the state consistent as low level ASM * entry disabled interrupts. * +* As a precondition, this requires that the entry came from user mode, +* idle, or a kernel context in which RCU is watching. +* * For kernel mode entries RCU handling is done conditional. If RCU is * watching then the only RCU requirement is to check whether the tick has * to be restarted. If RCU is not watching then rcu_irq_enter() has to be
@@ -585,18 +587,21 @@ SYSCALL_DEFINE0(ni_syscall)* establish the proper context for NOHZ_FULL. Otherwise scheduling on exit * would not be possible. * -* Returns: True if RCU has been adjusted on a kernel entry -* False otherwise +* Returns: An opaque object that must be passed to idtentry_exit() * -* The return value must be fed into the rcu_exit argument of -* idtentry_exit_cond_rcu(). +* The return value must be fed into the state argument of +* idtentry_exit(). */ -bool noinstr idtentry_enter_cond_rcu(struct pt_regs *regs) +idtentry_state_t noinstr idtentry_enter(struct pt_regs *regs) { +idtentry_state_t ret = { + .exit_rcu = false, + }; +if (user_mode (regs)) {check_user_regs (regs);enter_from_user_mode (); -return false; +return ret; }/*
@@ -634,7 +639,8 @@ bool noinstr idtentry_enter_cond_rcu(struct pt_regs *regs)trace_hardirqs_off_finish ();instrumentation_end (); -return true; + ret.exit_rcu = true; +return ret; }/*
@@ -649,7 +655,7 @@ bool noinstr idtentry_enter_cond_rcu(struct pt_regs *regs)trace_hardirqs_off ();instrumentation_end (); -return false; +return ret; }static void idtentry_exit_cond_resched (struct pt_regs *regs,bool may_sched)
@@ -667,10 +673,9 @@ static void idtentry_exit_cond_resched(struct pt_regs *regs, bool may_sched) }/** -* idtentry_exit_cond_rcu - Handle return from exception with conditional RCU -* handling +* idtentry_exit - Handle return from exception that used idtentry_enter() * @regs: Pointer to pt_regs (exception entry regs) -* @rcu_exit: Invoke rcu_irq_exit() if true +* @state: Return value from matching call to idtentry_enter() * * Depending on the return target (kernel/user) this runs the necessary * preemption and work checks if possible and reguired and returns to
@@ -679,10 +684,10 @@ static void idtentry_exit_cond_resched(struct pt_regs *regs, bool may_sched)* This is the last action before returning to the low level ASM code which * just needs to return to the appropriate context. * -* Counterpart to idtentry_enter_cond_rcu(). The return value of the entry -* function must be fed into the @rcu_exit argument. +* Counterpart to idtentry_enter(). The return value of the entry +* function must be fed into the @state argument. */ -void noinstr idtentry_exit_cond_rcu(struct pt_regs *regs, bool rcu_exit) +void noinstr idtentry_exit(struct pt_regs *regs, idtentry_state_t state) {lockdep_assert_irqs_disabled ();
@@ -695,7 +700,7 @@ void noinstr idtentry_exit_cond_rcu(struct pt_regs *regs, bool rcu_exit)* carefully and needs the same ordering of lockdep/tracing * and RCU as the return to user mode path. */ -if (rcu_exit) { +if (state.exit_rcu) {instrumentation_begin ();/* Tell the tracer that IRET will enable interrupts */ trace_hardirqs_on_prepare ();
@@ -714,7 +719,7 @@ void noinstr idtentry_exit_cond_rcu(struct pt_regs *regs, bool rcu_exit)* IRQ flags state is correct already. Just tell RCU if it * was not watching on entry. */ -if (rcu_exit) +if (state.exit_rcu)rcu_irq_exit (); } }
@@ -800,9 +805,10 @@ static void __xen_pv_evtchn_do_upcall(void) __visible noinstr void xen_pv_evtchn_do_upcall(struct pt_regs *regs) {struct pt_regs *old_regs; -bool inhcall, rcu_exit; +bool inhcall; +idtentry_state_t state; - rcu_exit =idtentry_enter_cond_rcu (regs); + state =idtentry_enter (regs); old_regs =set_irq_regs (regs);instrumentation_begin ();
@@ -812,13 +818,13 @@ __visible noinstr void xen_pv_evtchn_do_upcall(struct pt_regs *regs)set_irq_regs (old_regs); inhcall =get_and_clear_inhcall (); -if (inhcall && !WARN_ON_ONCE (rcu_exit)) { +if (inhcall && !WARN_ON_ONCE (state.exit_rcu)) {instrumentation_begin ();idtentry_exit_cond_resched (regs, true);instrumentation_end ();restore_inhcall (inhcall); }else { -idtentry_exit_cond_rcu (regs, rcu_exit); +idtentry_exit (regs, state); } }#endif /* CONFIG_XEN_PV */
arch/x86/include/asm/idtentry.h +16 -12
@@ -13,8 +13,12 @@void idtentry_enter_user (struct pt_regs *regs);void idtentry_exit_user (struct pt_regs *regs); -bool idtentry_enter_cond_rcu (struct pt_regs *regs); -void idtentry_exit_cond_rcu (struct pt_regs *regs,bool rcu_exit); +typedef struct idtentry_state { +bool exit_rcu; +}idtentry_state_t ; + +idtentry_state_t idtentry_enter (struct pt_regs *regs); +void idtentry_exit (struct pt_regs *regs,idtentry_state_t state);/** * DECLARE_IDTENTRY - Declare functions for simple IDT entry points
@@ -54,12 +58,12 @@ static __always_inline void __##func(struct pt_regs *regs); \ \ __visible noinstr void func(struct pt_regs *regs) \ { \ -bool rcu_exit =idtentry_enter_cond_rcu (regs); \ +idtentry_state_t state =idtentry_enter (regs); \ \instrumentation_begin (); \ __##func (regs); \ instrumentation_end(); \ - idtentry_exit_cond_rcu(regs, rcu_exit); \ + idtentry_exit(regs, state); \ } \ \ static __always_inline void __##func(struct pt_regs *regs)
@@ -101,12 +105,12 @@ static __always_inline void __##func(struct pt_regs *regs, \ __visible noinstr void func(struct pt_regs *regs, \unsigned long error_code) \ { \ -bool rcu_exit =idtentry_enter_cond_rcu (regs); \ +idtentry_state_t state =idtentry_enter (regs); \ \instrumentation_begin (); \ __##func (regs, error_code); \ instrumentation_end(); \ - idtentry_exit_cond_rcu(regs, rcu_exit); \ + idtentry_exit(regs, state); \ } \ \ static __always_inline void __##func(struct pt_regs *regs, \
@@ -199,7 +203,7 @@ static __always_inline void __##func(struct pt_regs *regs, u8 vector); \ __visible noinstr void func(struct pt_regs *regs, \unsigned long error_code) \ { \ -bool rcu_exit =idtentry_enter_cond_rcu (regs); \ +idtentry_state_t state =idtentry_enter (regs); \ \instrumentation_begin (); \irq_enter_rcu (); \
@@ -207,7 +211,7 @@ __visible noinstr void func(struct pt_regs *regs, \ __##func (regs, (u8)error_code); \ irq_exit_rcu(); \ instrumentation_end(); \ - idtentry_exit_cond_rcu(regs, rcu_exit); \ + idtentry_exit(regs, state); \ } \ \ static __always_inline void __##func(struct pt_regs *regs, u8 vector)
@@ -241,7 +245,7 @@ static void __##func(struct pt_regs *regs); \ \ __visible noinstr void func(struct pt_regs *regs) \ { \ -bool rcu_exit =idtentry_enter_cond_rcu (regs); \ +idtentry_state_t state =idtentry_enter (regs); \ \instrumentation_begin (); \irq_enter_rcu (); \
@@ -249,7 +253,7 @@ __visible noinstr void func(struct pt_regs *regs) \ run_on_irqstack_cond(__##func, regs, regs); \ irq_exit_rcu(); \ instrumentation_end(); \ - idtentry_exit_cond_rcu(regs, rcu_exit); \ + idtentry_exit(regs, state); \ } \ \ static noinline void __##func(struct pt_regs *regs)
@@ -270,7 +274,7 @@ static __always_inline void __##func(struct pt_regs *regs); \ \ __visible noinstr void func(struct pt_regs *regs) \ { \ -bool rcu_exit =idtentry_enter_cond_rcu (regs); \ +idtentry_state_t state =idtentry_enter (regs); \ \instrumentation_begin (); \__irq_enter_raw (); \
@@ -278,7 +282,7 @@ __visible noinstr void func(struct pt_regs *regs) \ __##func (regs); \ __irq_exit_raw(); \ instrumentation_end(); \ - idtentry_exit_cond_rcu(regs, rcu_exit); \ + idtentry_exit(regs, state); \ } \ \ static __always_inline void __##func(struct pt_regs *regs)
arch/x86/kernel/kvm.c +3 -3
@@ -233,7 +233,7 @@ EXPORT_SYMBOL_GPL(kvm_read_and_reset_apf_flags); noinstr bool __kvm_handle_async_pf(struct pt_regs *regs, u32 token) {u32 reason =kvm_read_and_reset_apf_flags (); -bool rcu_exit; +idtentry_state_t state;switch (reason) {case KVM_PV_REASON_PAGE_NOT_PRESENT :
@@ -243,7 +243,7 @@ noinstr bool __kvm_handle_async_pf(struct pt_regs *regs, u32 token)return false; } - rcu_exit =idtentry_enter_cond_rcu (regs); + state =idtentry_enter (regs);instrumentation_begin ();/*
@@ -264,7 +264,7 @@ noinstr bool __kvm_handle_async_pf(struct pt_regs *regs, u32 token) }instrumentation_end (); -idtentry_exit_cond_rcu (regs, rcu_exit); +idtentry_exit (regs, state);return true; }
arch/x86/kernel/traps.c +3 -3
@@ -218,7 +218,7 @@ static inline void handle_invalid_op(struct pt_regs *regs)DEFINE_IDTENTRY_RAW (exc_invalid_op) { -bool rcu_exit; +idtentry_state_t state;/* * Handle BUG/WARN like NMIs instead of like normal idtentries:
@@ -251,11 +251,11 @@ DEFINE_IDTENTRY_RAW(exc_invalid_op)*/ } - rcu_exit =idtentry_enter_cond_rcu (regs); + state =idtentry_enter (regs);instrumentation_begin ();handle_invalid_op (regs);instrumentation_end (); -idtentry_exit_cond_rcu (regs, rcu_exit); +idtentry_exit (regs, state); }DEFINE_IDTENTRY (exc_coproc_segment_overrun)
arch/x86/mm/fault.c +3 -3
@@ -1377,7 +1377,7 @@ handle_page_fault(struct pt_regs *regs, unsigned long error_code,DEFINE_IDTENTRY_RAW_ERRORCODE (exc_page_fault) {unsigned long address =read_cr2 (); -bool rcu_exit; +idtentry_state_t state;prefetchw (¤t->mm->mmap_lock);
@@ -1412,11 +1412,11 @@ DEFINE_IDTENTRY_RAW_ERRORCODE(exc_page_fault)* code reenabled RCU to avoid subsequent wreckage which helps * debugability. */ - rcu_exit =idtentry_enter_cond_rcu (regs); + state =idtentry_enter (regs);instrumentation_begin ();handle_page_fault (regs, error_code, address);instrumentation_end (); -idtentry_exit_cond_rcu (regs, rcu_exit); +idtentry_exit (regs, state); }
kernel/time/tick-sched.c +1 -0
@@ -921,6 +921,7 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts) (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {pr_warn ("NOHZ: local_softirq_pending %02x\n" , (unsigned int )local_softirq_pending ()); +WARN_ON_ONCE (1 ); ratelimit++; }return false;
Signature · 1 line
2.25.4
Andy Lutomirski
maintainerPATCH v2 3/6 x86/entry/xen: Route #DB correctly on Xen PV
In reply to Andy LutomirskiOn Xen PV, #DB doesn't use IST. We still need to correctly route it depending on whether it came from user or kernel mode.
This patch gets rid of DECLARE/DEFINE_IDTENTRY_XEN -- it was too hard to follow the logic. Instead, route #DB and NMI through DECLARE/DEFINE_IDTENTRY_RAW on Xen, and do the right thing for #DB. Also add more warnings to the exc_debug* handlers to make this type of failure more obvious.
This fixes various forms of corruption that happen when usermode triggers #DB on Xen PV.
--- arch/x86/include/asm/idtentry.h | 24 ++++++------------------ arch/x86/kernel/traps.c | 12 ++++++++++++ arch/x86/xen/enlighten_pv.c | 28 ++++++++++++++++++++++++---- arch/x86/xen/xen-asm_64.S | 5 ++--- 4 files changed, 44 insertions(+), 25 deletions(-)
arch/x86/include/asm/idtentry.h +6 -18
@@ -398,18 +398,6 @@ __visible noinstr void func(struct pt_regs *regs, \#define DEFINE_IDTENTRY_DEBUG DEFINE_IDTENTRY_IST#define DEFINE_IDTENTRY_DEBUG_USER DEFINE_IDTENTRY_NOIST -/** -* DECLARE_IDTENTRY_XEN - Declare functions for XEN redirect IDT entry points -* @vector: Vector number (ignored for C) -* @func: Function name of the entry point -* -* Used for xennmi and xendebug redirections. No DEFINE as this is all ASM -* indirection magic. -*/ -#define DECLARE_IDTENTRY_XEN (vector, func) \ - asmlinkage void xen_asm_exc_xen##func(void); \ - asmlinkage void asm_exc_xen##func(void) -#else /* !__ASSEMBLY__ */ /*
@@ -469,10 +457,6 @@ __visible noinstr void func(struct pt_regs *regs, \/* No ASM code emitted for NMI */ #define DECLARE_IDTENTRY_NMI (vector, func) -/* XEN NMI and DB wrapper */ -#define DECLARE_IDTENTRY_XEN (vector, func) \ - idtentry vector asm_exc_xen##func exc_##func has_error_code=0 -/* * ASM code to emit the common vector entry stubs where each stub is * packed into 8 bytes.
@@ -570,11 +554,15 @@ DECLARE_IDTENTRY_MCE(X86_TRAP_MC, exc_machine_check);/* NMI */ DECLARE_IDTENTRY_NMI (X86_TRAP_NMI , exc_nmi); -DECLARE_IDTENTRY_XEN (X86_TRAP_NMI , nmi); +#ifdef CONFIG_XEN_PV +DECLARE_IDTENTRY_RAW (X86_TRAP_NMI , xenpv_exc_nmi); +#endif /* #DB */ DECLARE_IDTENTRY_DEBUG (X86_TRAP_DB , exc_debug); -DECLARE_IDTENTRY_XEN (X86_TRAP_DB , debug); +#ifdef CONFIG_XEN_PV +DECLARE_IDTENTRY_RAW (X86_TRAP_DB , xenpv_exc_debug); +#endif /* #DF */ DECLARE_IDTENTRY_DF (X86_TRAP_DF , exc_double_fault);
arch/x86/kernel/traps.c +12 -0
@@ -865,6 +865,12 @@ static __always_inline void exc_debug_kernel(struct pt_regs *regs,instrumentation_begin ();trace_hardirqs_off_finish (); +/* +* If something gets miswired and we end up here for a user mode +* #DB, we will malfunction. +*/ +WARN_ON_ONCE (user_mode (regs)); +/* * Catch SYSENTER with TF set and clear DR_STEP. If this hit a * watchpoint at the same time then that will still be handled.
@@ -883,6 +889,12 @@ static __always_inline void exc_debug_kernel(struct pt_regs *regs, static __always_inline void exc_debug_user(struct pt_regs *regs,unsigned long dr6) { +/* +* If something gets miswired and we end up here for a kernel mode +* #DB, we will malfunction. +*/ +WARN_ON_ONCE (!user_mode (regs)); +idtentry_enter_user (regs);instrumentation_begin ();
arch/x86/xen/enlighten_pv.c +24 -4
@@ -598,6 +598,26 @@ static void xen_write_ldt_entry(struct desc_struct *dt, int entrynum, } #ifdef CONFIG_X86_64 +void noist_exc_debug(struct pt_regs *regs); + +DEFINE_IDTENTRY_RAW(xenpv_exc_nmi) +{ + /* On Xen PV, NMI doesn't use IST. The C part is the sane as native. */ + exc_nmi(regs); +} + +DEFINE_IDTENTRY_RAW(xenpv_exc_debug) +{ + /* + * There's no IST on Xen PV, but we still need to dispatch + * to the correct handler. + */ + if (user_mode(regs)) + noist_exc_debug(regs); + else + exc_debug(regs); +} + struct trap_array_entry { void (*orig)(void); void (*xen)(void);
@@ -609,18 +629,18 @@ struct trap_array_entry { .xen = xen_asm_##func, \ .ist_okay = ist_ok } -#define TRAP_ENTRY_REDIR (func, xenfunc, ist_ok) { \ +#define TRAP_ENTRY_REDIR (func, ist_ok) { \ .orig = asm_##func, \ - .xen = xen_asm_##xenfunc, \ + .xen = xen_asm_xenpv_##func, \ .ist_okay = ist_ok }static struct trap_array_entry trap_array[] = { -TRAP_ENTRY_REDIR (exc_debug, exc_xendebug, true ), +TRAP_ENTRY_REDIR (exc_debug, true ),TRAP_ENTRY (exc_double_fault, true ), #ifdef CONFIG_X86_MCETRAP_ENTRY (exc_machine_check, true ), #endif -TRAP_ENTRY_REDIR (exc_nmi, exc_xennmi, true ), +TRAP_ENTRY_REDIR (exc_nmi, true ),TRAP_ENTRY (exc_int3, false ),TRAP_ENTRY (exc_overflow, false ), #ifdef CONFIG_IA32_EMULATION
arch/x86/xen/xen-asm_64.S +2 -3
@@ -29,10 +29,9 @@ _ASM_NOKPROBE(xen_\name) .endm xen_pv_trap asm_exc_divide_error -xen_pv_trap asm_exc_debug -xen_pv_trap asm_exc_xendebug +xen_pv_trap asm_xenpv_exc_debug xen_pv_trap asm_exc_int3 -xen_pv_trap asm_exc_xennmi +xen_pv_trap asm_xenpv_exc_nmi xen_pv_trap asm_exc_overflow xen_pv_trap asm_exc_bounds xen_pv_trap asm_exc_invalid_op
Signature · 1 line
2.25.4
Andy Lutomirski
maintainerPATCH v2 2/6 x86/entry, selftests: Further improve user entry sanity checks
In reply to Andy LutomirskiChasing down a Xen bug caused me to realize that the new entry sanity checks are still fairly weak. Add some more checks.
--- arch/x86/entry/common.c | 19 +++++++++++++++++++ tools/testing/selftests/x86/syscall_nt.c | 11 +++++++++++ 2 files changed, 30 insertions(+)
arch/x86/entry/common.c +19 -0
@@ -49,6 +49,23 @@static void check_user_regs (struct pt_regs *regs) {if (IS_ENABLED (CONFIG_DEBUG_ENTRY )) { +/* +* Make sure that the entry code gave us a sensible EFLAGS +* register. Native because we want to check the actual CPU +* state, not the interrupt state as imagined by Xen. +*/ +unsigned long flags =native_save_fl (); +WARN_ON_ONCE (flags & (X86_EFLAGS_AC |X86_EFLAGS_DF | +X86_EFLAGS_NT )); + +/* We think we came from user mode. Make sure pt_regs agrees. */ +WARN_ON_ONCE (!user_mode (regs)); + +/* +* All entries from user mode (except #DF) should be on the +* normal thread stack and should have user pt_regs in the +* correct location. +*/ WARN_ON_ONCE (!on_thread_stack ());WARN_ON_ONCE (regs !=task_pt_regs (current)); }
@@ -577,6 +594,7 @@ SYSCALL_DEFINE0(ni_syscall) bool noinstr idtentry_enter_cond_rcu(struct pt_regs *regs) {if (user_mode (regs)) { +check_user_regs (regs);enter_from_user_mode ();return false; }
@@ -710,6 +728,7 @@ void noinstr idtentry_exit_cond_rcu(struct pt_regs *regs, bool rcu_exit)*/ void noinstr idtentry_enter_user(struct pt_regs *regs) { +check_user_regs (regs);enter_from_user_mode (); }
tools/testing/selftests/x86/syscall_nt.c +11 -0
@@ -81,5 +81,16 @@ int main(void)printf ("[RUN]\tSet NT|AC|TF and issue a syscall\n" );do_it (X86_EFLAGS_NT |X86_EFLAGS_AC |X86_EFLAGS_TF ); +/* +* Now try DF. This is evil and it's plausible that we will crash +* glibc, but glibc would have to do something rather surprising +* for this to happen. +*/ +printf ("[RUN]\tSet DF and issue a syscall\n" ); +do_it (X86_EFLAGS_DF ); + +printf ("[RUN]\tSet TF|DF and issue a syscall\n" ); +do_it (X86_EFLAGS_TF |X86_EFLAGS_DF ); +return nerrs ==0 ?0 :1 ; }
Signature · 1 line
2.25.4
Quoted 6 lines · Andy Lutomirski
These are in priority order. Patch 1 could be folded into the patch it fixes. The selftests improve my confidence in the correctness of the whole pile. The next two patches fix IDTENTRY miswiring. The last two are optional and could easily wait until the next merge window.
Quoted 8 lines
Andy Lutomirski (6):
x86/entry/compat: Clear RAX high bits on Xen PV SYSENTER x86/entry, selftests: Further improve user entry sanity checks x86/entry/xen: Route #DB correctly on Xen PV x86/entry/32: Fix #MC and #DB wiring onx86_32x86/ldt: Disable 16-bit segments on Xen PV x86/entry: Rename idtentry_enter/exit_cond_rcu() to
idtentry_enter/exit()
Re: [PATCH entry v2 5/6] x86/ldt: Disable 16-bit segments on Xen PV
In reply to Andy LutomirskiQuoted 6 lines · Andy Lutomirski
Xen PV doesn't implement ESPFIX64, so they don't work right. Disable them. Also print a warning the first time anyone tries to use a 16-bit segment on a Xen PV guest that would otherwise allow it to help people diagnose this change in behavior.
This gets us closer to having all x86 selftests pass on Xen PV.
Do we know exactly how much virtual address space ESPFIX64 takes up?
Are people going to scream in horror if Linux needs to donate some virtual address space back to Xen to get this working? Linux's current hypervisor range (8TB, 16 pagetable slots) really isn't enough for some systems these days.
~Andrew
[tip: x86/urgent] x86/entry/32: Fix #MC and #DB wiring on x86_32
In reply to Andy LutomirskiThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 13cbc0cd4a30c815984ad88e3a2e5976493516a3 Gitweb: https://git.kernel.org/tip/13cbc0cd4a30c815984ad88e3a2e5976493516a3 Author: Andy Lutomirski <[email protected]> AuthorDate: Fri, 03 Jul 2020 10:02:56 -07:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 04 Jul 2020 19:47:26 +02:00
x86/entry/32: Fix #MC and #DB wiring on x86_32
DEFINE_IDTENTRY_MCE and DEFINE_IDTENTRY_DEBUG were wired up as non-RAW on x86_32, but the code expected them to be RAW.
Get rid of all the macro indirection for them on 32-bit and just use DECLARE_IDTENTRY_RAW and DEFINE_IDTENTRY_RAW directly.
Also add a warning to make sure that we only hit the _kernel paths in kernel mode.
--- arch/x86/include/asm/idtentry.h | 23 +++++++++++++---------- arch/x86/kernel/cpu/mce/core.c | 4 +++- arch/x86/kernel/traps.c | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-)
arch/x86/include/asm/idtentry.h +13 -10
@@ -353,10 +353,6 @@ static __always_inline void __##func(struct pt_regs *regs)#else /* CONFIG_X86_64 */ -/* Maps to a regular IDTENTRY on 32bit for now */ -# define DECLARE_IDTENTRY_IST DECLARE_IDTENTRY -# define DEFINE_IDTENTRY_IST DEFINE_IDTENTRY -/** * DECLARE_IDTENTRY_DF - Declare functions for double fault 32bit variant * @vector: Vector number (ignored for C)
@@ -387,16 +383,18 @@ __visible noinstr void func(struct pt_regs *regs, \#endif /* !CONFIG_X86_64 */ /* C-Code mapping */ +#define DECLARE_IDTENTRY_NMI DECLARE_IDTENTRY_RAW +#define DEFINE_IDTENTRY_NMI DEFINE_IDTENTRY_RAW + +#ifdef CONFIG_X86_64 #define DECLARE_IDTENTRY_MCE DECLARE_IDTENTRY_IST#define DEFINE_IDTENTRY_MCE DEFINE_IDTENTRY_IST#define DEFINE_IDTENTRY_MCE_USER DEFINE_IDTENTRY_NOIST -#define DECLARE_IDTENTRY_NMI DECLARE_IDTENTRY_RAW -#define DEFINE_IDTENTRY_NMI DEFINE_IDTENTRY_RAW -#define DECLARE_IDTENTRY_DEBUG DECLARE_IDTENTRY_IST#define DEFINE_IDTENTRY_DEBUG DEFINE_IDTENTRY_IST#define DEFINE_IDTENTRY_DEBUG_USER DEFINE_IDTENTRY_NOIST +#endif #else /* !__ASSEMBLY__ */
@@ -443,9 +441,6 @@ __visible noinstr void func(struct pt_regs *regs, \# define DECLARE_IDTENTRY_MCE (vector, func) \ DECLARE_IDTENTRY(vector, func) -# define DECLARE_IDTENTRY_DEBUG (vector, func) \ - DECLARE_IDTENTRY(vector, func) -/* No ASM emitted for DF as this goes through a C shim */ # define DECLARE_IDTENTRY_DF (vector, func)
@@ -549,7 +544,11 @@ DECLARE_IDTENTRY_RAW(X86_TRAP_BP, exc_int3);DECLARE_IDTENTRY_RAW_ERRORCODE (X86_TRAP_PF , exc_page_fault);#ifdef CONFIG_X86_MCE +#ifdef CONFIG_X86_64 DECLARE_IDTENTRY_MCE (X86_TRAP_MC , exc_machine_check); +#else +DECLARE_IDTENTRY_RAW (X86_TRAP_MC , exc_machine_check); +#endif #endif /* NMI */
@@ -559,7 +558,11 @@ DECLARE_IDTENTRY_RAW(X86_TRAP_NMI, xenpv_exc_nmi);#endif /* #DB */ +#ifdef CONFIG_X86_64 DECLARE_IDTENTRY_DEBUG (X86_TRAP_DB , exc_debug); +#else +DECLARE_IDTENTRY_RAW (X86_TRAP_DB , exc_debug); +#endif #ifdef CONFIG_XEN_PV DECLARE_IDTENTRY_RAW (X86_TRAP_DB , xenpv_exc_debug);#endif
arch/x86/kernel/cpu/mce/core.c +3 -1
@@ -1901,6 +1901,8 @@ void (*machine_check_vector)(struct pt_regs *) = unexpected_machine_check; static __always_inline void exc_machine_check_kernel(struct pt_regs *regs) { +WARN_ON_ONCE (user_mode (regs)); +/* * Only required when from kernel mode. See * mce_check_crashing_cpu() for details.
@@ -1954,7 +1956,7 @@ DEFINE_IDTENTRY_MCE_USER(exc_machine_check) }#else /* 32bit unified entry point */ -DEFINE_IDTENTRY_MCE (exc_machine_check) +DEFINE_IDTENTRY_RAW (exc_machine_check) {unsigned long dr7;
arch/x86/kernel/traps.c +1 -1
@@ -925,7 +925,7 @@ DEFINE_IDTENTRY_DEBUG_USER(exc_debug) }#else /* 32 bit does not have separate entry points. */ -DEFINE_IDTENTRY_DEBUG (exc_debug) +DEFINE_IDTENTRY_RAW (exc_debug) {unsigned long dr6, dr7;
[tip: x86/urgent] x86/entry, selftests: Further improve user entry sanity checks
In reply to Andy LutomirskiThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 3c73b81a9164d0c1b6379d6672d2772a9e95168e Gitweb: https://git.kernel.org/tip/3c73b81a9164d0c1b6379d6672d2772a9e95168e Author: Andy Lutomirski <[email protected]> AuthorDate: Fri, 03 Jul 2020 10:02:54 -07:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 04 Jul 2020 19:47:25 +02:00
x86/entry, selftests: Further improve user entry sanity checks
Chasing down a Xen bug caused me to realize that the new entry sanity checks are still fairly weak. Add some more checks.
--- arch/x86/entry/common.c | 19 +++++++++++++++++++ tools/testing/selftests/x86/syscall_nt.c | 11 +++++++++++ 2 files changed, 30 insertions(+)
arch/x86/entry/common.c +19 -0
@@ -49,6 +49,23 @@static void check_user_regs (struct pt_regs *regs) {if (IS_ENABLED (CONFIG_DEBUG_ENTRY )) { +/* +* Make sure that the entry code gave us a sensible EFLAGS +* register. Native because we want to check the actual CPU +* state, not the interrupt state as imagined by Xen. +*/ +unsigned long flags =native_save_fl (); +WARN_ON_ONCE (flags & (X86_EFLAGS_AC |X86_EFLAGS_DF | +X86_EFLAGS_NT )); + +/* We think we came from user mode. Make sure pt_regs agrees. */ +WARN_ON_ONCE (!user_mode (regs)); + +/* +* All entries from user mode (except #DF) should be on the +* normal thread stack and should have user pt_regs in the +* correct location. +*/ WARN_ON_ONCE (!on_thread_stack ());WARN_ON_ONCE (regs !=task_pt_regs (current)); }
@@ -577,6 +594,7 @@ SYSCALL_DEFINE0(ni_syscall) bool noinstr idtentry_enter_cond_rcu(struct pt_regs *regs) {if (user_mode (regs)) { +check_user_regs (regs);enter_from_user_mode ();return false; }
@@ -710,6 +728,7 @@ void noinstr idtentry_exit_cond_rcu(struct pt_regs *regs, bool rcu_exit)*/ void noinstr idtentry_enter_user(struct pt_regs *regs) { +check_user_regs (regs);enter_from_user_mode (); }
tools/testing/selftests/x86/syscall_nt.c +11 -0
@@ -81,5 +81,16 @@ int main(void)printf ("[RUN]\tSet NT|AC|TF and issue a syscall\n" );do_it (X86_EFLAGS_NT |X86_EFLAGS_AC |X86_EFLAGS_TF ); +/* +* Now try DF. This is evil and it's plausible that we will crash +* glibc, but glibc would have to do something rather surprising +* for this to happen. +*/ +printf ("[RUN]\tSet DF and issue a syscall\n" ); +do_it (X86_EFLAGS_DF ); + +printf ("[RUN]\tSet TF|DF and issue a syscall\n" ); +do_it (X86_EFLAGS_TF |X86_EFLAGS_DF ); +return nerrs ==0 ?0 :1 ; }
[tip: x86/urgent] x86/entry/xen: Route #DB correctly on Xen PV
In reply to Andy LutomirskiThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: f41f0824224eb12ad84de8972962dd54be5abe3b Gitweb: https://git.kernel.org/tip/f41f0824224eb12ad84de8972962dd54be5abe3b Author: Andy Lutomirski <[email protected]> AuthorDate: Fri, 03 Jul 2020 10:02:55 -07:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 04 Jul 2020 19:47:25 +02:00
x86/entry/xen: Route #DB correctly on Xen PV
On Xen PV, #DB doesn't use IST. It still needs to be correctly routed depending on whether it came from user or kernel mode.
Get rid of DECLARE/DEFINE_IDTENTRY_XEN -- it was too hard to follow the logic. Instead, route #DB and NMI through DECLARE/DEFINE_IDTENTRY_RAW on Xen, and do the right thing for #DB. Also add more warnings to the exc_debug* handlers to make this type of failure more obvious.
This fixes various forms of corruption that happen when usermode triggers #DB on Xen PV.
--- arch/x86/include/asm/idtentry.h | 24 ++++++------------------ arch/x86/kernel/traps.c | 12 ++++++++++++ arch/x86/xen/enlighten_pv.c | 28 ++++++++++++++++++++++++---- arch/x86/xen/xen-asm_64.S | 5 ++--- 4 files changed, 44 insertions(+), 25 deletions(-)
arch/x86/include/asm/idtentry.h +6 -18
@@ -398,18 +398,6 @@ __visible noinstr void func(struct pt_regs *regs, \#define DEFINE_IDTENTRY_DEBUG DEFINE_IDTENTRY_IST#define DEFINE_IDTENTRY_DEBUG_USER DEFINE_IDTENTRY_NOIST -/** -* DECLARE_IDTENTRY_XEN - Declare functions for XEN redirect IDT entry points -* @vector: Vector number (ignored for C) -* @func: Function name of the entry point -* -* Used for xennmi and xendebug redirections. No DEFINE as this is all ASM -* indirection magic. -*/ -#define DECLARE_IDTENTRY_XEN (vector, func) \ - asmlinkage void xen_asm_exc_xen##func(void); \ - asmlinkage void asm_exc_xen##func(void) -#else /* !__ASSEMBLY__ */ /*
@@ -469,10 +457,6 @@ __visible noinstr void func(struct pt_regs *regs, \/* No ASM code emitted for NMI */ #define DECLARE_IDTENTRY_NMI (vector, func) -/* XEN NMI and DB wrapper */ -#define DECLARE_IDTENTRY_XEN (vector, func) \ - idtentry vector asm_exc_xen##func exc_##func has_error_code=0 -/* * ASM code to emit the common vector entry stubs where each stub is * packed into 8 bytes.
@@ -570,11 +554,15 @@ DECLARE_IDTENTRY_MCE(X86_TRAP_MC, exc_machine_check);/* NMI */ DECLARE_IDTENTRY_NMI (X86_TRAP_NMI , exc_nmi); -DECLARE_IDTENTRY_XEN (X86_TRAP_NMI , nmi); +#ifdef CONFIG_XEN_PV +DECLARE_IDTENTRY_RAW (X86_TRAP_NMI , xenpv_exc_nmi); +#endif /* #DB */ DECLARE_IDTENTRY_DEBUG (X86_TRAP_DB , exc_debug); -DECLARE_IDTENTRY_XEN (X86_TRAP_DB , debug); +#ifdef CONFIG_XEN_PV +DECLARE_IDTENTRY_RAW (X86_TRAP_DB , xenpv_exc_debug); +#endif /* #DF */ DECLARE_IDTENTRY_DF (X86_TRAP_DF , exc_double_fault);
arch/x86/kernel/traps.c +12 -0
@@ -866,6 +866,12 @@ static __always_inline void exc_debug_kernel(struct pt_regs *regs,trace_hardirqs_off_finish ();/* +* If something gets miswired and we end up here for a user mode +* #DB, we will malfunction. +*/ +WARN_ON_ONCE (user_mode (regs)); + +/* * Catch SYSENTER with TF set and clear DR_STEP. If this hit a * watchpoint at the same time then that will still be handled. */
@@ -883,6 +889,12 @@ static __always_inline void exc_debug_kernel(struct pt_regs *regs, static __always_inline void exc_debug_user(struct pt_regs *regs,unsigned long dr6) { +/* +* If something gets miswired and we end up here for a kernel mode +* #DB, we will malfunction. +*/ +WARN_ON_ONCE (!user_mode (regs)); +idtentry_enter_user (regs);instrumentation_begin ();
arch/x86/xen/enlighten_pv.c +24 -4
@@ -598,6 +598,26 @@ static void xen_write_ldt_entry(struct desc_struct *dt, int entrynum, } #ifdef CONFIG_X86_64 +void noist_exc_debug(struct pt_regs *regs); + +DEFINE_IDTENTRY_RAW(xenpv_exc_nmi) +{ + /* On Xen PV, NMI doesn't use IST. The C part is the sane as native. */ + exc_nmi(regs); +} + +DEFINE_IDTENTRY_RAW(xenpv_exc_debug) +{ + /* + * There's no IST on Xen PV, but we still need to dispatch + * to the correct handler. + */ + if (user_mode(regs)) + noist_exc_debug(regs); + else + exc_debug(regs); +} + struct trap_array_entry { void (*orig)(void); void (*xen)(void);
@@ -609,18 +629,18 @@ struct trap_array_entry { .xen = xen_asm_##func, \ .ist_okay = ist_ok } -#define TRAP_ENTRY_REDIR (func, xenfunc, ist_ok) { \ +#define TRAP_ENTRY_REDIR (func, ist_ok) { \ .orig = asm_##func, \ - .xen = xen_asm_##xenfunc, \ + .xen = xen_asm_xenpv_##func, \ .ist_okay = ist_ok }static struct trap_array_entry trap_array[] = { -TRAP_ENTRY_REDIR (exc_debug, exc_xendebug, true ), +TRAP_ENTRY_REDIR (exc_debug, true ),TRAP_ENTRY (exc_double_fault, true ), #ifdef CONFIG_X86_MCETRAP_ENTRY (exc_machine_check, true ), #endif -TRAP_ENTRY_REDIR (exc_nmi, exc_xennmi, true ), +TRAP_ENTRY_REDIR (exc_nmi, true ),TRAP_ENTRY (exc_int3, false ),TRAP_ENTRY (exc_overflow, false ), #ifdef CONFIG_IA32_EMULATION
arch/x86/xen/xen-asm_64.S +2 -3
@@ -29,10 +29,9 @@ _ASM_NOKPROBE(xen_\name) .endm xen_pv_trap asm_exc_divide_error -xen_pv_trap asm_exc_debug -xen_pv_trap asm_exc_xendebug +xen_pv_trap asm_xenpv_exc_debug xen_pv_trap asm_exc_int3 -xen_pv_trap asm_exc_xennmi +xen_pv_trap asm_xenpv_exc_nmi xen_pv_trap asm_exc_overflow xen_pv_trap asm_exc_bounds xen_pv_trap asm_exc_invalid_op
[tip: x86/urgent] x86/entry/compat: Clear RAX high bits on Xen PV SYSENTER
In reply to Andy LutomirskiThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: db5b2c5a90a111618f071d231a8b945cf522313e Gitweb: https://git.kernel.org/tip/db5b2c5a90a111618f071d231a8b945cf522313e Author: Andy Lutomirski <[email protected]> AuthorDate: Fri, 03 Jul 2020 10:02:53 -07:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 04 Jul 2020 19:47:25 +02:00
x86/entry/compat: Clear RAX high bits on Xen PV SYSENTER
Move the clearing of the high bits of RAX after Xen PV joins the SYSENTER path so that Xen PV doesn't skip it.
Arguably this code should be deleted instead, but that would belong in the merge window.
--- arch/x86/entry/entry_64_compat.S | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
arch/x86/entry/entry_64_compat.S +10 -9
@@ -57,15 +57,6 @@ SYM_CODE_START(entry_SYSENTER_compat) movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp - /* - * User tracing code (ptrace or signal handlers) might assume that - * the saved RAX contains a 32-bit number when we're invoking a 32-bit - * syscall. Just in case the high bits are nonzero, zero-extend - * the syscall number. (This could almost certainly be deleted - * with no ill effects.) - */ - movl %eax, %eax - /* Construct struct pt_regs on stack */ pushq $__USER32_DS /* pt_regs->ss */ pushq $0 /* pt_regs->sp = 0 (placeholder) */
@@ -80,6 +71,16 @@ SYM_CODE_START(entry_SYSENTER_compat) pushq $__USER32_CS /* pt_regs->cs */ pushq $0 /* pt_regs->ip = 0 (placeholder) */ SYM_INNER_LABEL(entry_SYSENTER_compat_after_hwframe, SYM_L_GLOBAL) + + /* + * User tracing code (ptrace or signal handlers) might assume that + * the saved RAX contains a 32-bit number when we're invoking a 32-bit + * syscall. Just in case the high bits are nonzero, zero-extend + * the syscall number. (This could almost certainly be deleted + * with no ill effects.) + */ + movl %eax, %eax + pushq %rax /* pt_regs->orig_ax */ pushq %rdi /* pt_regs->di */ pushq %rsi /* pt_regs->si */
[tip: x86/urgent] x86/ldt: Disable 16-bit segments on Xen PV
In reply to Andy LutomirskiThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: cc801833a171163edb6385425349ba8903bd1b20 Gitweb: https://git.kernel.org/tip/cc801833a171163edb6385425349ba8903bd1b20 Author: Andy Lutomirski <[email protected]> AuthorDate: Fri, 03 Jul 2020 10:02:57 -07:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Sat, 04 Jul 2020 19:47:26 +02:00
x86/ldt: Disable 16-bit segments on Xen PV
Xen PV doesn't implement ESPFIX64, so they don't work right. Disable them. Also print a warning the first time anyone tries to use a 16-bit segment on a Xen PV guest that would otherwise allow it to help people diagnose this change in behavior.
This gets us closer to having all x86 selftests pass on Xen PV.
--- arch/x86/kernel/ldt.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
arch/x86/kernel/ldt.c +34 -1
@@ -29,6 +29,8 @@#include <asm/mmu_context.h> #include <asm/pgtable_areas.h> +#include <xen/xen.h> +/* This is a multiple of PAGE_SIZE. */ #define LDT_SLOT_STRIDE (LDT_ENTRIES * LDT_ENTRY_SIZE)
@@ -543,6 +545,37 @@ static int read_default_ldt(void __user *ptr, unsigned long bytecount)return bytecount; } +static bool allow_16bit_segments (void ) +{ +if (!IS_ENABLED (CONFIG_X86_16BIT )) +return false; + +#ifdef CONFIG_XEN_PV +/* +* Xen PV does not implement ESPFIX64, which means that 16-bit +* segments will not work correctly. Until either Xen PV implements +* ESPFIX64 and can signal this fact to the guest or unless someone +* provides compelling evidence that allowing broken 16-bit segments +* is worthwhile, disallow 16-bit segments under Xen PV. +*/ +if (xen_pv_domain ()) { +static DEFINE_MUTEX (xen_warning); +static bool warned; + +mutex_lock (&xen_warning); +if (!warned) { +pr_info ("Warning: 16-bit segments do not work correctly in a Xen PV guest\n" ); + warned = true; + } +mutex_unlock (&xen_warning); + +return false; + } +#endif + +return true; +} +static int write_ldt (void __user *ptr,unsigned long bytecount,int oldmode) {struct mm_struct *mm = current->mm;
@@ -574,7 +607,7 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)/* The user wants to clear the entry. */ memset (&ldt,0 ,sizeof (ldt)); }else { -if (!IS_ENABLED (CONFIG_X86_16BIT ) && !ldt_info.seg_32bit) { +if (!ldt_info.seg_32bit && !allow_16bit_segments ()) { error = -EINVAL ; goto out; }
Re: [PATCH entry v2 3/6] x86/entry/xen: Route #DB correctly on Xen PV
In reply to Andy LutomirskiQuoted 25 lines · Andy Lutomirski
On Xen PV, #DB doesn't use IST. We still need to correctly route it depending on whether it came from user or kernel mode.
This patch gets rid of DECLARE/DEFINE_IDTENTRY_XEN -- it was too hard to follow the logic. Instead, route #DB and NMI through DECLARE/DEFINE_IDTENTRY_RAW on Xen, and do the right thing for #DB. Also add more warnings to the exc_debug* handlers to make this type of failure more obvious.
This fixes various forms of corruption that happen when usermode triggers #DB on Xen PV.
Fixes 4c0dcd8350a0 ("x86/entry: Implement user mode C entry points for #DB and #MCE")Signed-off-by Andy Lutomirski <[email protected]>--- arch/x86/include/asm/idtentry.h | 24 ++++++------------------ arch/x86/kernel/traps.c | 12 ++++++++++++ arch/x86/xen/enlighten_pv.c | 28 ++++++++++++++++++++++++---- arch/x86/xen/xen-asm_64.S | 5 ++--- 4 files changed, 44 insertions(+), 25 deletions(-)arch/x86/include/asm/idtentry.h +0
-0
[...]
Quoted 8 lines
arch/x86/include/asm/idtentry.h +3
-1@@ -570,11 +554,15 @@ DECLARE_IDTENTRY_MCE(X86_TRAP_MC, exc_machine_check);/* NMI */ DECLARE_IDTENTRY_NMI (X86_TRAP_NMI , exc_nmi); -DECLARE_IDTENTRY_XEN (X86_TRAP_NMI , nmi); +#ifdef CONFIG_XEN_PV +DECLARE_IDTENTRY_RAW (X86_TRAP_NMI , xenpv_exc_nmi); +#endif
arch/x86/include/asm/idtentry.h DECLARE_IDTENTRY_MCE(X86_TRAP_MC, exc_machine_check); · line 568
Quoted 10 lines
arch/x86/include/asm/idtentry.h +3
-1/* #DB */ DECLARE_IDTENTRY_DEBUG (X86_TRAP_DB , exc_debug); -DECLARE_IDTENTRY_XEN (X86_TRAP_DB , debug); +#ifdef CONFIG_XEN_PV +DECLARE_IDTENTRY_RAW (X86_TRAP_DB , xenpv_exc_debug); +#endif /* #DF */ DECLARE_IDTENTRY_DF (X86_TRAP_DF , exc_double_fault);
Hello,
this patch - now in mainline as commit 13cbc0cd4a30 ("x86/entry/32: Fix #MC and #DB wiring on x86_32") - seems to break i586 builds with CONFIG_XEN_PV=y as xenpv_exc_nmi and xenpv_exc_debug are only defined with CONFIG_X86_64:
[ 1279s] ld: arch/x86/entry/entry_32.o: in function `asm_xenpv_exc_nmi':
[ 1279s] /home/abuild/rpmbuild/BUILD/kernel-pae-5.8.rc4/linux-5.8-rc4/linux-obj/../arch/x86/include/asm/idtentry.h:557: undefined reference to xenpv_exc_nmi' [ 1279s] ld: arch/x86/entry/entry_32.o: in function asm_xenpv_exc_debug':
[ 1279s] /home/abuild/rpmbuild/BUILD/kernel-pae-5.8.rc4/linux-5.8-rc4/linux-obj/../arch/x86/include/asm/idtentry.h:567: undefined reference to `xenpv_exc_debug'
Michal Kubecek
Jürgen Groß
maintainerRe: [PATCH entry v2 3/6] x86/entry/xen: Route #DB correctly on Xen PV
Quoted 53 lines · Michal Kubecek
Quoted 25 lines · Andy Lutomirski
On Xen PV, #DB doesn't use IST. We still need to correctly route it depending on whether it came from user or kernel mode.
This patch gets rid of DECLARE/DEFINE_IDTENTRY_XEN -- it was too hard to follow the logic. Instead, route #DB and NMI through DECLARE/DEFINE_IDTENTRY_RAW on Xen, and do the right thing for #DB. Also add more warnings to the exc_debug* handlers to make this type of failure more obvious.
This fixes various forms of corruption that happen when usermode triggers #DB on Xen PV.
Fixes 4c0dcd8350a0 ("x86/entry: Implement user mode C entry points for #DB and #MCE")Signed-off-by Andy Lutomirski <[email protected]>--- arch/x86/include/asm/idtentry.h | 24 ++++++------------------ arch/x86/kernel/traps.c | 12 ++++++++++++ arch/x86/xen/enlighten_pv.c | 28 ++++++++++++++++++++++++---- arch/x86/xen/xen-asm_64.S | 5 ++--- 4 files changed, 44 insertions(+), 25 deletions(-)arch/x86/include/asm/idtentry.h +0
-0[...]
Quoted 8 lines
arch/x86/include/asm/idtentry.h +3
-1@@ -570,11 +554,15 @@ DECLARE_IDTENTRY_MCE(X86_TRAP_MC, exc_machine_check);/* NMI */ DECLARE_IDTENTRY_NMI (X86_TRAP_NMI , exc_nmi); -DECLARE_IDTENTRY_XEN (X86_TRAP_NMI , nmi); +#ifdef CONFIG_XEN_PV +DECLARE_IDTENTRY_RAW (X86_TRAP_NMI , xenpv_exc_nmi); +#endif arch/x86/include/asm/idtentry.h DECLARE_IDTENTRY_MCE(X86_TRAP_MC, exc_machine_check); · line 568
Quoted 10 lines
arch/x86/include/asm/idtentry.h +3
-1/* #DB */ DECLARE_IDTENTRY_DEBUG (X86_TRAP_DB , exc_debug); -DECLARE_IDTENTRY_XEN (X86_TRAP_DB , debug); +#ifdef CONFIG_XEN_PV +DECLARE_IDTENTRY_RAW (X86_TRAP_DB , xenpv_exc_debug); +#endif /* #DF */ DECLARE_IDTENTRY_DF (X86_TRAP_DF , exc_double_fault);Hello,
this patch - now in mainline as commit
13cbc0cd4a30("x86/entry/32: Fix #MC and #DB wiring onx86_32") - seems to break i586 builds withCONFIG_XEN_PV=yasxenpv_exc_nmiandxenpv_exc_debugare only defined withCONFIG_X86_64:
Quoted 4 lines
[ 1279s] ld:
arch/x86/entry/entry_32.o: in function `asm_xenpv_exc_nmi':
[ 1279s]/home/abuild/rpmbuild/BUILD/kernel-pae-5.8.rc4/linux-5.8-rc4/linux-obj/../arch/x86/include/asm/idtentry.h:557: undefined reference toxenpv_exc_nmi' [ 1279s] ld: arch/x86/entry/entry_32.o: in functionasm_xenpv_exc_debug':
[ 1279s]/home/abuild/rpmbuild/BUILD/kernel-pae-5.8.rc4/linux-5.8-rc4/linux-obj/../arch/x86/include/asm/idtentry.h:567: undefined reference to `xenpv_exc_debug'
Fix is already queued in tip/tip.git x86/urgent
Juergen
Re: [PATCH entry v2 3/6] x86/entry/xen: Route #DB correctly on Xen PV
Quoted 6 lines · Jürgen Groß
Quoted 5 lines · Michal Kubecek
this patch - now in mainline as commit
13cbc0cd4a30("x86/entry/32: Fix #MC and #DB wiring onx86_32") - seems to break i586 builds withCONFIG_XEN_PV=yasxenpv_exc_nmiandxenpv_exc_debugare only defined withCONFIG_X86_64:
Quoted 6 lines
Quoted 4 lines
[ 1279s] ld:
arch/x86/entry/entry_32.o: in function `asm_xenpv_exc_nmi':
[ 1279s]/home/abuild/rpmbuild/BUILD/kernel-pae-5.8.rc4/linux-5.8-rc4/linux-obj/../arch/x86/include/asm/idtentry.h:557: undefined reference toxenpv_exc_nmi' [ 1279s] ld: arch/x86/entry/entry_32.o: in functionasm_xenpv_exc_debug':
[ 1279s]/home/abuild/rpmbuild/BUILD/kernel-pae-5.8.rc4/linux-5.8-rc4/linux-obj/../arch/x86/include/asm/idtentry.h:567: undefined reference to `xenpv_exc_debug'Fix is already queued in tip/tip.git x86/urgent
Thank you,
Michal
[tip: x86/entry] x86/entry: Rename idtentry_enter/exit_cond_rcu() to idtentry_enter/exit()
In reply to Andy LutomirskiThe following commit has been merged into the x86/entry branch of tip:
The following commit has been merged into the x86/entry branch of tip:
Commit-ID: b037b09b9058d84882fa2c4db3806433e2b0f912 Gitweb: https://git.kernel.org/tip/b037b09b9058d84882fa2c4db3806433e2b0f912 Author: Andy Lutomirski <[email protected]> AuthorDate: Fri, 03 Jul 2020 10:02:58 -07:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Mon, 06 Jul 2020 21:15:52 +02:00
x86/entry: Rename idtentry_enter/exit_cond_rcu() to idtentry_enter/exit()
They were originally called _cond_rcu because they were special versions with conditional RCU handling. Now they're the standard entry and exit path, so the _cond_rcu part is just confusing. Drop it.
Also change the signature to make them more extensible and more foolproof.
No functional change -- it's pure refactoring.
--- arch/x86/entry/common.c | 50 +++++++++++++++++--------------- arch/x86/include/asm/idtentry.h | 28 ++++++++++-------- arch/x86/kernel/kvm.c | 6 ++-- arch/x86/kernel/traps.c | 6 ++-- arch/x86/mm/fault.c | 6 ++-- 5 files changed, 53 insertions(+), 43 deletions(-)
arch/x86/entry/common.c +28 -22
@@ -559,8 +559,7 @@ SYSCALL_DEFINE0(ni_syscall) }/** -* idtentry_enter_cond_rcu - Handle state tracking on idtentry with conditional -* RCU handling +* idtentry_enter - Handle state tracking on ordinary idtentries * @regs: Pointer to pt_regs of interrupted context * * Invokes:
@@ -572,6 +571,9 @@ SYSCALL_DEFINE0(ni_syscall)* - The hardirq tracer to keep the state consistent as low level ASM * entry disabled interrupts. * +* As a precondition, this requires that the entry came from user mode, +* idle, or a kernel context in which RCU is watching. +* * For kernel mode entries RCU handling is done conditional. If RCU is * watching then the only RCU requirement is to check whether the tick has * to be restarted. If RCU is not watching then rcu_irq_enter() has to be
@@ -585,18 +587,21 @@ SYSCALL_DEFINE0(ni_syscall)* establish the proper context for NOHZ_FULL. Otherwise scheduling on exit * would not be possible. * -* Returns: True if RCU has been adjusted on a kernel entry -* False otherwise +* Returns: An opaque object that must be passed to idtentry_exit() * -* The return value must be fed into the rcu_exit argument of -* idtentry_exit_cond_rcu(). +* The return value must be fed into the state argument of +* idtentry_exit(). */ -bool noinstr idtentry_enter_cond_rcu(struct pt_regs *regs) +idtentry_state_t noinstr idtentry_enter(struct pt_regs *regs) { +idtentry_state_t ret = { + .exit_rcu = false, + }; +if (user_mode (regs)) {check_user_regs (regs);enter_from_user_mode (); -return false; +return ret; }/*
@@ -634,7 +639,8 @@ bool noinstr idtentry_enter_cond_rcu(struct pt_regs *regs)trace_hardirqs_off_finish ();instrumentation_end (); -return true; + ret.exit_rcu = true; +return ret; }/*
@@ -649,7 +655,7 @@ bool noinstr idtentry_enter_cond_rcu(struct pt_regs *regs)trace_hardirqs_off ();instrumentation_end (); -return false; +return ret; }static void idtentry_exit_cond_resched (struct pt_regs *regs,bool may_sched)
@@ -667,10 +673,9 @@ static void idtentry_exit_cond_resched(struct pt_regs *regs, bool may_sched) }/** -* idtentry_exit_cond_rcu - Handle return from exception with conditional RCU -* handling +* idtentry_exit - Handle return from exception that used idtentry_enter() * @regs: Pointer to pt_regs (exception entry regs) -* @rcu_exit: Invoke rcu_irq_exit() if true +* @state: Return value from matching call to idtentry_enter() * * Depending on the return target (kernel/user) this runs the necessary * preemption and work checks if possible and reguired and returns to
@@ -679,10 +684,10 @@ static void idtentry_exit_cond_resched(struct pt_regs *regs, bool may_sched)* This is the last action before returning to the low level ASM code which * just needs to return to the appropriate context. * -* Counterpart to idtentry_enter_cond_rcu(). The return value of the entry -* function must be fed into the @rcu_exit argument. +* Counterpart to idtentry_enter(). The return value of the entry +* function must be fed into the @state argument. */ -void noinstr idtentry_exit_cond_rcu(struct pt_regs *regs, bool rcu_exit) +void noinstr idtentry_exit(struct pt_regs *regs, idtentry_state_t state) {lockdep_assert_irqs_disabled ();
@@ -695,7 +700,7 @@ void noinstr idtentry_exit_cond_rcu(struct pt_regs *regs, bool rcu_exit)* carefully and needs the same ordering of lockdep/tracing * and RCU as the return to user mode path. */ -if (rcu_exit) { +if (state.exit_rcu) {instrumentation_begin ();/* Tell the tracer that IRET will enable interrupts */ trace_hardirqs_on_prepare ();
@@ -714,7 +719,7 @@ void noinstr idtentry_exit_cond_rcu(struct pt_regs *regs, bool rcu_exit)* IRQ flags state is correct already. Just tell RCU if it * was not watching on entry. */ -if (rcu_exit) +if (state.exit_rcu)rcu_irq_exit (); } }
@@ -800,9 +805,10 @@ static void __xen_pv_evtchn_do_upcall(void) __visible noinstr void xen_pv_evtchn_do_upcall(struct pt_regs *regs) {struct pt_regs *old_regs; -bool inhcall, rcu_exit; +bool inhcall; +idtentry_state_t state; - rcu_exit =idtentry_enter_cond_rcu (regs); + state =idtentry_enter (regs); old_regs =set_irq_regs (regs);instrumentation_begin ();
@@ -812,13 +818,13 @@ __visible noinstr void xen_pv_evtchn_do_upcall(struct pt_regs *regs)set_irq_regs (old_regs); inhcall =get_and_clear_inhcall (); -if (inhcall && !WARN_ON_ONCE (rcu_exit)) { +if (inhcall && !WARN_ON_ONCE (state.exit_rcu)) {instrumentation_begin ();idtentry_exit_cond_resched (regs, true);instrumentation_end ();restore_inhcall (inhcall); }else { -idtentry_exit_cond_rcu (regs, rcu_exit); +idtentry_exit (regs, state); } }#endif /* CONFIG_XEN_PV */
arch/x86/include/asm/idtentry.h +16 -12
@@ -13,8 +13,12 @@void idtentry_enter_user (struct pt_regs *regs);void idtentry_exit_user (struct pt_regs *regs); -bool idtentry_enter_cond_rcu (struct pt_regs *regs); -void idtentry_exit_cond_rcu (struct pt_regs *regs,bool rcu_exit); +typedef struct idtentry_state { +bool exit_rcu; +}idtentry_state_t ; + +idtentry_state_t idtentry_enter (struct pt_regs *regs); +void idtentry_exit (struct pt_regs *regs,idtentry_state_t state);/** * DECLARE_IDTENTRY - Declare functions for simple IDT entry points
@@ -54,12 +58,12 @@ static __always_inline void __##func(struct pt_regs *regs); \ \ __visible noinstr void func(struct pt_regs *regs) \ { \ -bool rcu_exit =idtentry_enter_cond_rcu (regs); \ +idtentry_state_t state =idtentry_enter (regs); \ \instrumentation_begin (); \ __##func (regs); \ instrumentation_end(); \ - idtentry_exit_cond_rcu(regs, rcu_exit); \ + idtentry_exit(regs, state); \ } \ \ static __always_inline void __##func(struct pt_regs *regs)
@@ -101,12 +105,12 @@ static __always_inline void __##func(struct pt_regs *regs, \ __visible noinstr void func(struct pt_regs *regs, \unsigned long error_code) \ { \ -bool rcu_exit =idtentry_enter_cond_rcu (regs); \ +idtentry_state_t state =idtentry_enter (regs); \ \instrumentation_begin (); \ __##func (regs, error_code); \ instrumentation_end(); \ - idtentry_exit_cond_rcu(regs, rcu_exit); \ + idtentry_exit(regs, state); \ } \ \ static __always_inline void __##func(struct pt_regs *regs, \
@@ -199,7 +203,7 @@ static __always_inline void __##func(struct pt_regs *regs, u8 vector); \ __visible noinstr void func(struct pt_regs *regs, \unsigned long error_code) \ { \ -bool rcu_exit =idtentry_enter_cond_rcu (regs); \ +idtentry_state_t state =idtentry_enter (regs); \ \instrumentation_begin (); \irq_enter_rcu (); \
@@ -207,7 +211,7 @@ __visible noinstr void func(struct pt_regs *regs, \ __##func (regs, (u8)error_code); \ irq_exit_rcu(); \ instrumentation_end(); \ - idtentry_exit_cond_rcu(regs, rcu_exit); \ + idtentry_exit(regs, state); \ } \ \ static __always_inline void __##func(struct pt_regs *regs, u8 vector)
@@ -241,7 +245,7 @@ static void __##func(struct pt_regs *regs); \ \ __visible noinstr void func(struct pt_regs *regs) \ { \ -bool rcu_exit =idtentry_enter_cond_rcu (regs); \ +idtentry_state_t state =idtentry_enter (regs); \ \instrumentation_begin (); \irq_enter_rcu (); \
@@ -249,7 +253,7 @@ __visible noinstr void func(struct pt_regs *regs) \ run_on_irqstack_cond(__##func, regs, regs); \ irq_exit_rcu(); \ instrumentation_end(); \ - idtentry_exit_cond_rcu(regs, rcu_exit); \ + idtentry_exit(regs, state); \ } \ \ static noinline void __##func(struct pt_regs *regs)
@@ -270,7 +274,7 @@ static __always_inline void __##func(struct pt_regs *regs); \ \ __visible noinstr void func(struct pt_regs *regs) \ { \ -bool rcu_exit =idtentry_enter_cond_rcu (regs); \ +idtentry_state_t state =idtentry_enter (regs); \ \instrumentation_begin (); \__irq_enter_raw (); \
@@ -278,7 +282,7 @@ __visible noinstr void func(struct pt_regs *regs) \ __##func (regs); \ __irq_exit_raw(); \ instrumentation_end(); \ - idtentry_exit_cond_rcu(regs, rcu_exit); \ + idtentry_exit(regs, state); \ } \ \ static __always_inline void __##func(struct pt_regs *regs)
arch/x86/kernel/kvm.c +3 -3
@@ -233,7 +233,7 @@ EXPORT_SYMBOL_GPL(kvm_read_and_reset_apf_flags); noinstr bool __kvm_handle_async_pf(struct pt_regs *regs, u32 token) {u32 reason =kvm_read_and_reset_apf_flags (); -bool rcu_exit; +idtentry_state_t state;switch (reason) {case KVM_PV_REASON_PAGE_NOT_PRESENT :
@@ -243,7 +243,7 @@ noinstr bool __kvm_handle_async_pf(struct pt_regs *regs, u32 token)return false; } - rcu_exit =idtentry_enter_cond_rcu (regs); + state =idtentry_enter (regs);instrumentation_begin ();/*
@@ -264,7 +264,7 @@ noinstr bool __kvm_handle_async_pf(struct pt_regs *regs, u32 token) }instrumentation_end (); -idtentry_exit_cond_rcu (regs, rcu_exit); +idtentry_exit (regs, state);return true; }
arch/x86/kernel/traps.c +3 -3
@@ -245,7 +245,7 @@ static noinstr bool handle_bug(struct pt_regs *regs)DEFINE_IDTENTRY_RAW (exc_invalid_op) { -bool rcu_exit; +idtentry_state_t state;/* * We use UD2 as a short encoding for 'CALL __WARN', as such
@@ -255,11 +255,11 @@ DEFINE_IDTENTRY_RAW(exc_invalid_op)if (!user_mode (regs) &&handle_bug (regs))return ; - rcu_exit =idtentry_enter_cond_rcu (regs); + state =idtentry_enter (regs);instrumentation_begin ();handle_invalid_op (regs);instrumentation_end (); -idtentry_exit_cond_rcu (regs, rcu_exit); +idtentry_exit (regs, state); }DEFINE_IDTENTRY (exc_coproc_segment_overrun)
arch/x86/mm/fault.c +3 -3
@@ -1377,7 +1377,7 @@ handle_page_fault(struct pt_regs *regs, unsigned long error_code,DEFINE_IDTENTRY_RAW_ERRORCODE (exc_page_fault) {unsigned long address =read_cr2 (); -bool rcu_exit; +idtentry_state_t state;prefetchw (¤t->mm->mmap_lock);
@@ -1412,11 +1412,11 @@ DEFINE_IDTENTRY_RAW_ERRORCODE(exc_page_fault)* code reenabled RCU to avoid subsequent wreckage which helps * debugability. */ - rcu_exit =idtentry_enter_cond_rcu (regs); + state =idtentry_enter (regs);instrumentation_begin ();handle_page_fault (regs, error_code, address);instrumentation_end (); -idtentry_exit_cond_rcu (regs, rcu_exit); +idtentry_exit (regs, state); }
[email protected]
maintainerRe: [tip: x86/urgent] x86/entry, selftests: Further improve user entry sanity checks
In reply to tip-bot2 for Andy LutomirskiQuoted 6 lines · On Sat, Jul 04, 2020 at 05:49:10PM -0000, tip-bot2 for Andy Lutomirski wrote:
arch/x86/entry/common.c +0
-0@@ -49,6 +49,23 @@static void check_user_regs (struct pt_regs *regs)
arch/x86/entry/common.c line 59
Quoted 10 lines
arch/x86/entry/common.c +8
-0{if (IS_ENABLED (CONFIG_DEBUG_ENTRY )) { +/* +* Make sure that the entry code gave us a sensible EFLAGS +* register. Native because we want to check the actual CPU +* state, not the interrupt state as imagined by Xen. +*/ +unsigned long flags =native_save_fl (); +WARN_ON_ONCE (flags & (X86_EFLAGS_AC |X86_EFLAGS_DF | +X86_EFLAGS_NT ));
This triggers with AC|TF on my !SMAP enabled machine.
something like so then?
arch/x86/include/asm/entry-common.h +9 -2
@@ -18,8 +18,15 @@ static __always_inline void arch_check_user_regs(struct pt_regs *regs)* state, not the interrupt state as imagined by Xen. */ unsigned long flags =native_save_fl (); -WARN_ON_ONCE (flags & (X86_EFLAGS_AC |X86_EFLAGS_DF | -X86_EFLAGS_NT )); +unsigned long mask =X86_EFLAGS_DF |X86_EFLAGS_NT ; + +/* +* For !SMAP hardware we patch out CLAC on entry. +*/ +if (boot_cpu_has (X86_FEATURE_SMAP )) + mask |=X86_EFLAGS_AC ; + +WARN_ON_ONCE (flags & mask);/* We think we came from user mode. Make sure pt_regs agrees. */ WARN_ON_ONCE (!user_mode (regs));
Re: [tip: x86/urgent] x86/entry, selftests: Further improve user entry sanity checks
Quoted 36 lines · On Thu, Aug 20, 2020 at 3:24 AM <[email protected]> wrote:
Quoted 6 lines · On Sat, Jul 04, 2020 at 05:49:10PM -0000, tip-bot2 for Andy Lutomirski wrote:
arch/x86/entry/common.c +0
-0@@ -49,6 +49,23 @@static void check_user_regs (struct pt_regs *regs)arch/x86/entry/common.c line 59
Quoted 10 lines
arch/x86/entry/common.c +8
-0{if (IS_ENABLED (CONFIG_DEBUG_ENTRY )) { +/* +* Make sure that the entry code gave us a sensible EFLAGS +* register. Native because we want to check the actual CPU +* state, not the interrupt state as imagined by Xen. +*/ +unsigned long flags =native_save_fl (); +WARN_ON_ONCE (flags & (X86_EFLAGS_AC |X86_EFLAGS_DF | +X86_EFLAGS_NT ));This triggers with AC|TF on my !SMAP enabled machine.
something like so then?
arch/x86/include/asm/entry-common.h +2
-2@@ -18,8 +18,15 @@ static __always_inline void arch_check_user_regs(struct pt_regs *regs)* state, not the interrupt state as imagined by Xen. */ unsigned long flags =native_save_fl (); -WARN_ON_ONCE (flags & (X86_EFLAGS_AC |X86_EFLAGS_DF | -X86_EFLAGS_NT )); +unsigned long mask =X86_EFLAGS_DF |X86_EFLAGS_NT ; +
arch/x86/include/asm/entry-common.h static __always_inline void arch_check_user_regs(struct pt_regs *regs) · line 32
Quoted 10 lines
arch/x86/include/asm/entry-common.h +7
-0+/* +* For !SMAP hardware we patch out CLAC on entry. +*/ +if (boot_cpu_has (X86_FEATURE_SMAP )) + mask |=X86_EFLAGS_AC ; + +WARN_ON_ONCE (flags & mask);/* We think we came from user mode. Make sure pt_regs agrees. */ WARN_ON_ONCE (!user_mode (regs));
LGTM.