Re: [RFC Patch v3 18/18] x86/hvm: Always set pending event injection when loading VMC[BS] state.

[Aravind Gopalakrishnan <aravind.gopalakrishnan@amd.com>]

On 9/5/14 4:11 AM, Wen Congyang wrote:
> In colo mode, secondary vm is running, so VM_ENTRY_INTR_INFO may
> valid before restoring vmcs. If there is no pending event after
> restoring vm, we should clear it.
>
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
>
> Also clear pending software exceptions.
> Copy the fix to SVM as well.
>
> Signed-off-by: Tim Deegan <tim@xen.org>
>
> vmx part:
> Cc: Jun Nakajima <jun.nakajima@intel.com>
> Acked-by: Kevin Tian <kevin.tian@intel.com>
>
> svm part:
> Cc: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
> Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
> ---
>   xen/arch/x86/hvm/svm/svm.c | 15 ++++++++-------
>   xen/arch/x86/hvm/vmx/vmx.c | 25 ++++++++++++-------------
>   2 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
> index b5188e6..053e511 100644
> --- a/xen/arch/x86/hvm/svm/svm.c
> +++ b/xen/arch/x86/hvm/svm/svm.c
> @@ -321,16 +321,17 @@ static int svm_vmcb_restore(struct vcpu *v, struct hvm_hw_cpu *c)
>           vmcb_set_h_cr3(vmcb, pagetable_get_paddr(p2m_get_pagetable(p2m)));
>       }
>   
> -    if ( c->pending_valid )
> +    if ( c->pending_valid &&
> +         hvm_event_needs_reinjection(c->pending_type, c->pending_vector) )
>       {
>           gdprintk(XENLOG_INFO, "Re-injecting %#"PRIx32", %#"PRIx32"\n",
>                    c->pending_event, c->error_code);
> -
> -        if ( hvm_event_needs_reinjection(c->pending_type, c->pending_vector) )
> -        {
> -            vmcb->eventinj.bytes = c->pending_event;
> -            vmcb->eventinj.fields.errorcode = c->error_code;
> -        }
> +        vmcb->eventinj.bytes = c->pending_event;
> +        vmcb->eventinj.fields.errorcode = c->error_code;
> +    }
> +    else
> +    {
> +        vmcb->eventinj.bytes = 0;
>       }
>   
>       vmcb->cleanbits.bytes = 0;
>

Acked-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>