On Tue, Nov 20, 2018 at 04:24:57PM -0800, Jim Mattson wrote:
> According to the SDM, "NMI-window exiting" VM-exits wake a logical
> processor from the same inactive states as would an NMI. Specifically,
> they wake a logical processor from the shutdown state and from the
> states entered using the HLT and MWAIT instructions.
>
> Fixes: 6dfacadd5858 ("KVM: nVMX: Add support for activity state HLT")
> Signed-off-by: Jim Mattson <jmattson@xxxxxxxxxx>
> Reviewed-by: Peter Shier <pshier@xxxxxxxxxx>
> ---
> arch/x86/kvm/vmx.c | 19 ++++++++++++++++---
> 1 file changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index ccc6a01eb4f4..5f5c79e72a49 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -13421,6 +13421,17 @@ static int nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,
> return 1;
> }
>
> +static bool nested_vmx_nmi_window_exit(struct kvm_vcpu *vcpu)
> +{
> + struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
Any reason not to pass vmcs12 directly to the function? vcpu isn't
used othwerwise and the call site already has and is using vmcs12.
> + return (vmcs12->cpu_based_vm_exec_control &
> + CPU_BASED_VIRTUAL_NMI_PENDING) &&
> + vmcs12->guest_activity_state != GUEST_ACTIVITY_WAIT_SIPI &&
> + !(vmcs12->guest_interruptibility_info &
> + (GUEST_INTR_STATE_NMI | GUEST_INTR_STATE_MOV_SS));
> +}
> +
> /*
> * nested_vmx_run() handles a nested entry, i.e., a VMLAUNCH or VMRESUME on L1
> * for running an L2 nested guest.
> @@ -13512,11 +13523,13 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch)
> nested_cache_shadow_vmcs12(vcpu, vmcs12);
>
> /*
> - * If we're entering a halted L2 vcpu and the L2 vcpu won't be woken
> - * by event injection, halt vcpu.
> + * If we're entering a halted L2 vcpu and the L2 vcpu won't be
> + * awakened by event injection or by an NMI-window VM-exit,
> + * halt the vcpu.
> */
> if ((vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT) &&
> - !(vmcs12->vm_entry_intr_info_field & INTR_INFO_VALID_MASK)) {
> + !(vmcs12->vm_entry_intr_info_field & INTR_INFO_VALID_MASK) &&
> + !nested_vmx_nmi_window_exit(vcpu)) {
> vmx->nested.nested_run_pending = 0;
> return kvm_vcpu_halt(vcpu);
> }
> --
> 2.19.1.1215.g8438c0b245-goog
>
