* Check valid bit of VM_EXIT_INTR_INFO
@ 2009-04-02 2:37 Dong, Eddie
2009-04-02 8:59 ` Avi Kivity
0 siblings, 1 reply; 3+ messages in thread
From: Dong, Eddie @ 2009-04-02 2:37 UTC (permalink / raw)
To: Avi Kivity; +Cc: kvm, Nakajima, Jun, Mallick, Asit K, Dong, Eddie
[-- Attachment #1: Type: text/plain, Size: 1362 bytes --]
Thx, eddie
commit ad4a9829c8d5b30995f008e32774bd5f555b7e9f
Author: root <root@eddie-wb.localdomain>
Date: Thu Apr 2 11:16:03 2009 +0800
Check valid bit of VM_EXIT_INTR_INFO before unblock nmi.
Signed-off-by: Eddie Dong <Eddie.Dong@intel.com>
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index aba41ae..689523a 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3268,16 +3268,18 @@ static void vmx_complete_interrupts(struct vcpu_vmx *vmx)
exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
if (cpu_has_virtual_nmis()) {
- unblock_nmi = (exit_intr_info & INTR_INFO_UNBLOCK_NMI) != 0;
- vector = exit_intr_info & INTR_INFO_VECTOR_MASK;
/*
* SDM 3: 25.7.1.2
* Re-set bit "block by NMI" before VM entry if vmexit caused by
* a guest IRET fault.
*/
- if (unblock_nmi && vector != DF_VECTOR)
- vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
+ if (exit_intr_info & INTR_INFO_VALID_MASK) {
+ unblock_nmi = !!(exit_intr_info & INTR_INFO_UNBLOCK_NMI);
+ vector = exit_intr_info & INTR_INFO_VECTOR_MASK;
+ if (unblock_nmi && vector != DF_VECTOR)
+ vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
GUEST_INTR_STATE_NMI);
+ }
} else if (unlikely(vmx->soft_vnmi_blocked))
vmx->vnmi_blocked_time +=
ktime_to_ns(ktime_sub(ktime_get(), vmx->entry_time));
[-- Attachment #2: nmi_valid.patch --]
[-- Type: application/octet-stream, Size: 1311 bytes --]
commit ad4a9829c8d5b30995f008e32774bd5f555b7e9f
Author: root <root@eddie-wb.localdomain>
Date: Thu Apr 2 11:16:03 2009 +0800
Check valid bit of VM_EXIT_INTR_INFO before unblock nmi.
Signed-off-by: Eddie Dong <Eddie.Dong@intel.com>
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index aba41ae..689523a 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3268,16 +3268,18 @@ static void vmx_complete_interrupts(struct vcpu_vmx *vmx)
exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
if (cpu_has_virtual_nmis()) {
- unblock_nmi = (exit_intr_info & INTR_INFO_UNBLOCK_NMI) != 0;
- vector = exit_intr_info & INTR_INFO_VECTOR_MASK;
/*
* SDM 3: 25.7.1.2
* Re-set bit "block by NMI" before VM entry if vmexit caused by
* a guest IRET fault.
*/
- if (unblock_nmi && vector != DF_VECTOR)
- vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
+ if (exit_intr_info & INTR_INFO_VALID_MASK) {
+ unblock_nmi = !!(exit_intr_info & INTR_INFO_UNBLOCK_NMI);
+ vector = exit_intr_info & INTR_INFO_VECTOR_MASK;
+ if (unblock_nmi && vector != DF_VECTOR)
+ vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
GUEST_INTR_STATE_NMI);
+ }
} else if (unlikely(vmx->soft_vnmi_blocked))
vmx->vnmi_blocked_time +=
ktime_to_ns(ktime_sub(ktime_get(), vmx->entry_time));
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: Check valid bit of VM_EXIT_INTR_INFO
2009-04-02 2:37 Check valid bit of VM_EXIT_INTR_INFO Dong, Eddie
@ 2009-04-02 8:59 ` Avi Kivity
2009-04-02 9:04 ` Gleb Natapov
0 siblings, 1 reply; 3+ messages in thread
From: Avi Kivity @ 2009-04-02 8:59 UTC (permalink / raw)
To: Dong, Eddie; +Cc: kvm, Nakajima, Jun, Mallick, Asit K
Dong, Eddie wrote:
> Thx, eddie
>
>
This code just got rewritten by Gleb. Please check again after I push.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Check valid bit of VM_EXIT_INTR_INFO
2009-04-02 8:59 ` Avi Kivity
@ 2009-04-02 9:04 ` Gleb Natapov
0 siblings, 0 replies; 3+ messages in thread
From: Gleb Natapov @ 2009-04-02 9:04 UTC (permalink / raw)
To: Avi Kivity; +Cc: Dong, Eddie, kvm, Nakajima, Jun, Mallick, Asit K
On Thu, Apr 02, 2009 at 11:59:35AM +0300, Avi Kivity wrote:
> Dong, Eddie wrote:
>> Thx, eddie
>>
>>
>
> This code just got rewritten by Gleb. Please check again after I push.
>
My patch adds the check.
--
Gleb.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-04-02 9:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-02 2:37 Check valid bit of VM_EXIT_INTR_INFO Dong, Eddie
2009-04-02 8:59 ` Avi Kivity
2009-04-02 9:04 ` Gleb Natapov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).