>From 34ed6f6f4ea6113874a8733f036aa8f8370ed9e1 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 12 May 2017 16:05:31 +0000 Subject: [PATCH] x86/pv: Drop the use of do_guest_trap() do_guest_trap() was introduced for compatibility at the time that x86_event was being introduced, but all of the callers of do_guest_trap() have better options. Most callsites are switched to pv_inject_hw_exception(), which allows the error code to be passed directly, rather than via a cpu_user_regs parameter. For the int $N emulation code, introduce pv_inject_sw_interrupt() and teach pv_inject_event() to cope with low vector numbers not necesserily having an error code. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Wei Liu --- xen/arch/x86/traps.c | 62 +++++++++++++++++++------------------------- xen/include/asm-x86/domain.h | 11 ++++++++ 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 27fdf12..6ac4821 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -633,6 +633,7 @@ void pv_inject_event(const struct x86_event *event) const struct trap_info *ti; const uint8_t vector = event->vector; const bool use_error_code = + (event->type == X86_EVENTTYPE_HW_EXCEPTION) && ((vector < 32) && (TRAP_HAVE_EC & (1u << vector))); unsigned int error_code = event->error_code; @@ -684,18 +685,6 @@ void pv_inject_event(const struct x86_event *event) } } -static inline void do_guest_trap(unsigned int trapnr, - const struct cpu_user_regs *regs) -{ - const struct x86_event event = { - .vector = trapnr, - .error_code = (((trapnr < 32) && (TRAP_HAVE_EC & (1u << trapnr))) - ? regs->error_code : X86_EVENT_NO_EC), - }; - - pv_inject_event(&event); -} - static void instruction_done(struct cpu_user_regs *regs, unsigned long rip) { regs->rip = rip; @@ -703,7 +692,7 @@ static void instruction_done(struct cpu_user_regs *regs, unsigned long rip) if ( regs->eflags & X86_EFLAGS_TF ) { current->arch.debugreg[6] |= DR_STEP | DR_STATUS_RESERVED_ONE; - do_guest_trap(TRAP_debug, regs); + pv_inject_hw_exception(TRAP_debug, X86_EVENT_NO_EC); } } @@ -751,7 +740,7 @@ int set_guest_machinecheck_trapbounce(void) struct vcpu *v = current; struct trap_bounce *tb = &v->arch.pv_vcpu.trap_bounce; - do_guest_trap(TRAP_machine_check, guest_cpu_user_regs()); + pv_inject_hw_exception(TRAP_machine_check, X86_EVENT_NO_EC); tb->flags &= ~TBF_EXCEPTION; /* not needed for MCE delivery path */ return !null_trap_bounce(v, tb); } @@ -764,7 +753,7 @@ int set_guest_nmi_trapbounce(void) { struct vcpu *v = current; struct trap_bounce *tb = &v->arch.pv_vcpu.trap_bounce; - do_guest_trap(TRAP_nmi, guest_cpu_user_regs()); + pv_inject_hw_exception(TRAP_nmi, X86_EVENT_NO_EC); tb->flags &= ~TBF_EXCEPTION; /* not needed for NMI delivery path */ return !null_trap_bounce(v, tb); } @@ -794,7 +783,10 @@ void do_trap(struct cpu_user_regs *regs) if ( guest_mode(regs) ) { - do_guest_trap(trapnr, regs); + int ec = ((trapnr < 32) && (TRAP_HAVE_EC & (1u << trapnr))) + ? regs->error_code : X86_EVENT_NO_EC; + + pv_inject_hw_exception(trapnr, ec); return; } @@ -1060,7 +1052,7 @@ static int emulate_forced_invalid_op(struct cpu_user_regs *regs) if ( current->arch.cpuid_faulting && !guest_kernel_mode(current, regs) ) { regs->rip = eip; - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return EXCRET_fault_fixed; } @@ -1096,7 +1088,7 @@ void do_invalid_op(struct cpu_user_regs *regs) { if ( !emulate_invalid_rdtscp(regs) && !emulate_forced_invalid_op(regs) ) - do_guest_trap(TRAP_invalid_op, regs); + pv_inject_hw_exception(TRAP_invalid_op, X86_EVENT_NO_EC); return; } @@ -1224,7 +1216,7 @@ void do_int3(struct cpu_user_regs *regs) return; } - do_guest_trap(TRAP_int3, regs); + pv_inject_hw_exception(TRAP_int3, X86_EVENT_NO_EC); } static void reserved_bit_page_fault( @@ -3038,7 +3030,7 @@ static int emulate_privileged_op(struct cpu_user_regs *regs) { curr->arch.debugreg[6] |= ctxt.bpmatch | DR_STATUS_RESERVED_ONE; if ( !(curr->arch.pv_vcpu.trap_bounce.flags & TBF_EXCEPTION) ) - do_guest_trap(TRAP_debug, regs); + pv_inject_hw_exception(TRAP_debug, X86_EVENT_NO_EC); } /* fall through */ case X86EMUL_RETRY: @@ -3153,12 +3145,12 @@ static void emulate_gate_op(struct cpu_user_regs *regs) (((ar >> 13) & 3) < (regs->cs & 3)) || ((ar & _SEGMENT_TYPE) != 0xc00) ) { - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return; } if ( !(ar & _SEGMENT_P) ) { - do_guest_trap(TRAP_no_segment, regs); + pv_inject_hw_exception(TRAP_no_segment, regs->error_code); return; } dpl = (ar >> 13) & 3; @@ -3174,7 +3166,7 @@ static void emulate_gate_op(struct cpu_user_regs *regs) !(ar & _SEGMENT_P) || !(ar & _SEGMENT_CODE) ) { - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return; } @@ -3187,7 +3179,7 @@ static void emulate_gate_op(struct cpu_user_regs *regs) if ( PTR_ERR(state) == -X86EMUL_EXCEPTION ) pv_inject_event(&ctxt.ctxt.event); else - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return; } @@ -3237,7 +3229,7 @@ static void emulate_gate_op(struct cpu_user_regs *regs) (opnd_sel & ~3) != regs->error_code || dpl < (opnd_sel & 3) ) { - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return; } @@ -3285,7 +3277,7 @@ static void emulate_gate_op(struct cpu_user_regs *regs) /* Inner stack known only for kernel ring. */ if ( (sel & 3) != GUEST_KERNEL_RPL(v->domain) ) { - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return; } esp = v->arch.pv_vcpu.kernel_sp; @@ -3309,7 +3301,7 @@ static void emulate_gate_op(struct cpu_user_regs *regs) stkp = (unsigned int *)(unsigned long)((unsigned int)base + esp); if ( !compat_access_ok(stkp - 4 - nparm, (4 + nparm) * 4) ) { - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return; } push(regs->ss); @@ -3324,12 +3316,12 @@ static void emulate_gate_op(struct cpu_user_regs *regs) (ar & _SEGMENT_CODE) || !(ar & _SEGMENT_WR) || !check_stack_limit(ar, limit, esp + nparm * 4, nparm * 4) ) - return do_guest_trap(TRAP_gp_fault, regs); + return pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); ustkp = (unsigned int *)(unsigned long) ((unsigned int)base + regs->esp + nparm * 4); if ( !compat_access_ok(ustkp - nparm, nparm * 4) ) { - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return; } do @@ -3355,7 +3347,7 @@ static void emulate_gate_op(struct cpu_user_regs *regs) if ( !read_descriptor(ss, v, &base, &limit, &ar, 0) || ((ar >> 13) & 3) != (sel & 3) ) { - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return; } if ( !check_stack_limit(ar, limit, esp, 2 * 4) ) @@ -3366,7 +3358,7 @@ static void emulate_gate_op(struct cpu_user_regs *regs) stkp = (unsigned int *)(unsigned long)((unsigned int)base + esp); if ( !compat_access_ok(stkp - 2, 2 * 4) ) { - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return; } } @@ -3427,7 +3419,7 @@ void do_general_protection(struct cpu_user_regs *regs) if ( permit_softint(TI_GET_DPL(ti), v, regs) ) { regs->rip += 2; - do_guest_trap(vector, regs); + pv_inject_sw_interrupt(vector); return; } } @@ -3446,7 +3438,7 @@ void do_general_protection(struct cpu_user_regs *regs) } /* Pass on GPF as is. */ - do_guest_trap(TRAP_gp_fault, regs); + pv_inject_hw_exception(TRAP_gp_fault, regs->error_code); return; gp_in_kernel: @@ -3666,7 +3658,7 @@ void do_device_not_available(struct cpu_user_regs *regs) if ( curr->arch.pv_vcpu.ctrlreg[0] & X86_CR0_TS ) { - do_guest_trap(TRAP_no_device, regs); + pv_inject_hw_exception(TRAP_no_device, X86_EVENT_NO_EC); curr->arch.pv_vcpu.ctrlreg[0] &= ~X86_CR0_TS; } else @@ -3739,7 +3731,7 @@ void do_debug(struct cpu_user_regs *regs) v->arch.debugreg[6] = read_debugreg(6); ler_enable(); - do_guest_trap(TRAP_debug, regs); + pv_inject_hw_exception(TRAP_debug, X86_EVENT_NO_EC); return; out: diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 6ab987f..924caac 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -655,6 +655,17 @@ static inline void pv_inject_page_fault(int errcode, unsigned long cr2) pv_inject_event(&event); } +static inline void pv_inject_sw_interrupt(unsigned int vector) +{ + const struct x86_event event = { + .vector = vector, + .type = X86_EVENTTYPE_SW_INTERRUPT, + .error_code = X86_EVENT_NO_EC, + }; + + pv_inject_event(&event); +} + #endif /* __ASM_DOMAIN_H__ */ /* -- 2.1.4