lkml.org 
[lkml]   [2018]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v3] KVM: VMX: Don't halt vcpu when L1 is injecting events to L2
From
Date
On 11/02/2018 03:06, Chao Gao wrote:
> Although L2 is in halt state, it will be in the active state after
> VM entry if the VM entry is vectoring according to SDM 26.6.2 Activity
> State. Halting the vcpu here means the event won't be injected to L2
> and this decision isn't reported to L1. Thus L0 drops an event that
> should be injected to L2.
>
> Cc: Liran Alon <liran.alon@oracle.com>
> Signed-off-by: Chao Gao <chao.gao@intel.com>
> ---
> changes in v3:
> - s/VECTORING_INFO_VALID_MASK/INTR_INFO_VALID_MASK
> - Changes of subject, comments.
>
> Changes in v2:
> - Remove VID stuff. Only handle event injection in this patch.
>
> Signed-off-by: Chao Gao <chao.gao@intel.com>
> ---
> arch/x86/kvm/vmx.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index bb5b488..cf7c2fc 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -10985,7 +10985,12 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)
> if (ret)
> return ret;
>
> - if (vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT)
> + /*
> + * If we're entering a halted L2 vcpu and the L2 vcpu won't be woken
> + * by event injection, halt vcpu.
> + */
> + if ((vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT) &&
> + !(vmcs12->vm_entry_intr_info_field & INTR_INFO_VALID_MASK))
> return kvm_vcpu_halt(vcpu);
>
> vmx->nested.nested_run_pending = 1;
>

Queued, thanks (haven't yet tried the new test).

Paolo

\
 
 \ /
  Last update: 2018-02-13 15:39    [W:0.024 / U:2.716 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site