From mboxrd@z Thu Jan  1 00:00:00 1970
From: Liran Alon <liran.alon@oracle.com>
Subject: Re: [PATCH v3] KVM: VMX: Don't halt vcpu when L1 is injecting events
 to L2
Date: Sun, 11 Feb 2018 00:51:14 -0800 (PST)
Message-ID: <3bf7f0af-cfdf-4daa-8230-240e7e63f099@default>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Cc: <mingo@redhat.com>, <x86@kernel.org>, <tglx@linutronix.de>,
        <rkrcmar@redhat.com>, <pbonzini@redhat.com>,
        <linux-kernel@vger.kernel.org>, <hpa@zytor.com>,
        <kvm@vger.kernel.org>
To: <chao.gao@intel.com>
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org


----- chao.gao@intel.com 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.
>=20
> 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.
>=20
> Changes in v2:
>  - Remove VID stuff. Only handle event injection in this patch.
>=20
> Signed-off-by: Chao Gao <chao.gao@intel.com>
> ---
>  arch/x86/kvm/vmx.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>=20
> 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)
>  =09if (ret)
>  =09=09return ret;
> =20
> -=09if (vmcs12->guest_activity_state =3D=3D GUEST_ACTIVITY_HLT)
> +=09/*
> +=09 * If we're entering a halted L2 vcpu and the L2 vcpu won't be
> woken
> +=09 * by event injection, halt vcpu.
> +=09 */
> +=09if ((vmcs12->guest_activity_state =3D=3D GUEST_ACTIVITY_HLT) &&
> +=09    !(vmcs12->vm_entry_intr_info_field & INTR_INFO_VALID_MASK))
>  =09=09return kvm_vcpu_halt(vcpu);
> =20
>  =09vmx->nested.nested_run_pending =3D 1;
> --=20
> 1.9.1

Reviewed-by: Liran Alon <liran.alon@oracle.com>

(Paolo: I would recommend changing commit title from "KVM: VMX: ..." to "KV=
M: nVMX: ..."
when applying for convention. Easier to grep nVMX changes.)