mirror of
https://github.com/xen-project/xen.git
synced 2026-10-30 03:00:05 +01:00
[HVM][VMX] Interrupts must be kept disabled when entering Xen for
external interrupt processing. Remove code that immediately reenabled interrupt delivery on VMEXIT. Signed-off-by: Seteven Smith <sos22@cam.ac.uk> Signed-off-by: Keir Fraser <keir@xensource.com>
This commit is contained in:
kaf24@firebug.cl.cam.ac.uk committed
1 parent
42d838e49b
commit
ff476d8ed1
3 files changed
+62
-66
No files matched your search
+12
-10
@@ -1970,7 +1970,6 @@ static inline void vmx_vmexit_do_extint(struct cpu_user_regs *regs)
|
||||
__hvm_bug(regs);
|
||||
|
||||
vector &= INTR_INFO_VECTOR_MASK;
|
||||
local_irq_disable();
|
||||
TRACE_VMEXIT(1,vector);
|
||||
|
||||
switch(vector) {
|
||||
@@ -2065,30 +2064,33 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs regs)
|
||||
struct vcpu *v = current;
|
||||
int error;
|
||||
|
||||
if ((error = __vmread(VM_EXIT_REASON, &exit_reason)))
|
||||
__hvm_bug(®s);
|
||||
error = __vmread(VM_EXIT_REASON, &exit_reason);
|
||||
BUG_ON(error);
|
||||
|
||||
perfc_incra(vmexits, exit_reason);
|
||||
|
||||
/* don't bother H/W interrutps */
|
||||
if (exit_reason != EXIT_REASON_EXTERNAL_INTERRUPT &&
|
||||
exit_reason != EXIT_REASON_VMCALL &&
|
||||
exit_reason != EXIT_REASON_IO_INSTRUCTION)
|
||||
if ( (exit_reason != EXIT_REASON_EXTERNAL_INTERRUPT) &&
|
||||
(exit_reason != EXIT_REASON_VMCALL) &&
|
||||
(exit_reason != EXIT_REASON_IO_INSTRUCTION) )
|
||||
HVM_DBG_LOG(DBG_LEVEL_0, "exit reason = %x", exit_reason);
|
||||
|
||||
if (exit_reason & VMX_EXIT_REASONS_FAILED_VMENTRY) {
|
||||
if ( exit_reason != EXIT_REASON_EXTERNAL_INTERRUPT )
|
||||
local_irq_enable();
|
||||
|
||||
if ( unlikely(exit_reason & VMX_EXIT_REASONS_FAILED_VMENTRY) )
|
||||
{
|
||||
printk("Failed vm entry (reason 0x%x)\n", exit_reason);
|
||||
printk("*********** VMCS Area **************\n");
|
||||
vmcs_dump_vcpu();
|
||||
printk("**************************************\n");
|
||||
domain_crash_synchronous();
|
||||
return;
|
||||
}
|
||||
|
||||
__vmread(GUEST_RIP, &eip);
|
||||
TRACE_VMEXIT(0,exit_reason);
|
||||
|
||||
switch (exit_reason) {
|
||||
switch ( exit_reason )
|
||||
{
|
||||
case EXIT_REASON_EXCEPTION_NMI:
|
||||
{
|
||||
/*
|
||||
|
||||
@@ -55,29 +55,26 @@
|
||||
* domain pointer, DS, ES, FS, GS. Therefore, we effectively skip 6 registers.
|
||||
*/
|
||||
|
||||
#define HVM_MONITOR_EFLAGS 0x202 /* IF on */
|
||||
#define NR_SKIPPED_REGS 6 /* See the above explanation */
|
||||
#define HVM_SAVE_ALL_NOSEGREGS \
|
||||
pushl $HVM_MONITOR_EFLAGS; \
|
||||
popf; \
|
||||
subl $(NR_SKIPPED_REGS*4), %esp; \
|
||||
#define HVM_SAVE_ALL_NOSEGREGS \
|
||||
subl $(NR_SKIPPED_REGS*4), %esp; \
|
||||
movl $0, 0xc(%esp); /* XXX why do we need to force eflags==0 ?? */ \
|
||||
pushl %eax; \
|
||||
pushl %ebp; \
|
||||
pushl %edi; \
|
||||
pushl %esi; \
|
||||
pushl %edx; \
|
||||
pushl %ecx; \
|
||||
pushl %eax; \
|
||||
pushl %ebp; \
|
||||
pushl %edi; \
|
||||
pushl %esi; \
|
||||
pushl %edx; \
|
||||
pushl %ecx; \
|
||||
pushl %ebx;
|
||||
|
||||
#define HVM_RESTORE_ALL_NOSEGREGS \
|
||||
popl %ebx; \
|
||||
popl %ecx; \
|
||||
popl %edx; \
|
||||
popl %esi; \
|
||||
popl %edi; \
|
||||
popl %ebp; \
|
||||
popl %eax; \
|
||||
#define HVM_RESTORE_ALL_NOSEGREGS \
|
||||
popl %ebx; \
|
||||
popl %ecx; \
|
||||
popl %edx; \
|
||||
popl %esi; \
|
||||
popl %edi; \
|
||||
popl %ebp; \
|
||||
popl %eax; \
|
||||
addl $(NR_SKIPPED_REGS*4), %esp
|
||||
|
||||
ALIGN
|
||||
|
||||
@@ -51,45 +51,42 @@
|
||||
* (2/1) u32 entry_vector;
|
||||
* (1/1) u32 error_code;
|
||||
*/
|
||||
#define HVM_MONITOR_RFLAGS 0x202 /* IF on */
|
||||
#define NR_SKIPPED_REGS 6 /* See the above explanation */
|
||||
#define HVM_SAVE_ALL_NOSEGREGS \
|
||||
pushq $HVM_MONITOR_RFLAGS; \
|
||||
popfq; \
|
||||
subq $(NR_SKIPPED_REGS*8), %rsp; \
|
||||
pushq %rdi; \
|
||||
pushq %rsi; \
|
||||
pushq %rdx; \
|
||||
pushq %rcx; \
|
||||
pushq %rax; \
|
||||
pushq %r8; \
|
||||
pushq %r9; \
|
||||
pushq %r10; \
|
||||
pushq %r11; \
|
||||
pushq %rbx; \
|
||||
pushq %rbp; \
|
||||
pushq %r12; \
|
||||
pushq %r13; \
|
||||
pushq %r14; \
|
||||
pushq %r15; \
|
||||
#define HVM_SAVE_ALL_NOSEGREGS \
|
||||
subq $(NR_SKIPPED_REGS*8), %rsp; \
|
||||
pushq %rdi; \
|
||||
pushq %rsi; \
|
||||
pushq %rdx; \
|
||||
pushq %rcx; \
|
||||
pushq %rax; \
|
||||
pushq %r8; \
|
||||
pushq %r9; \
|
||||
pushq %r10; \
|
||||
pushq %r11; \
|
||||
pushq %rbx; \
|
||||
pushq %rbp; \
|
||||
pushq %r12; \
|
||||
pushq %r13; \
|
||||
pushq %r14; \
|
||||
pushq %r15;
|
||||
|
||||
#define HVM_RESTORE_ALL_NOSEGREGS \
|
||||
popq %r15; \
|
||||
popq %r14; \
|
||||
popq %r13; \
|
||||
popq %r12; \
|
||||
popq %rbp; \
|
||||
popq %rbx; \
|
||||
popq %r11; \
|
||||
popq %r10; \
|
||||
popq %r9; \
|
||||
popq %r8; \
|
||||
popq %rax; \
|
||||
popq %rcx; \
|
||||
popq %rdx; \
|
||||
popq %rsi; \
|
||||
popq %rdi; \
|
||||
addq $(NR_SKIPPED_REGS*8), %rsp; \
|
||||
#define HVM_RESTORE_ALL_NOSEGREGS \
|
||||
popq %r15; \
|
||||
popq %r14; \
|
||||
popq %r13; \
|
||||
popq %r12; \
|
||||
popq %rbp; \
|
||||
popq %rbx; \
|
||||
popq %r11; \
|
||||
popq %r10; \
|
||||
popq %r9; \
|
||||
popq %r8; \
|
||||
popq %rax; \
|
||||
popq %rcx; \
|
||||
popq %rdx; \
|
||||
popq %rsi; \
|
||||
popq %rdi; \
|
||||
addq $(NR_SKIPPED_REGS*8), %rsp;
|
||||
|
||||
ENTRY(vmx_asm_vmexit_handler)
|
||||
/* selectors are restored/saved by VMX */
|
||||
|
||||