Re: [PATCH 3/3] KVM: SVM: Clean up rip handling in vmrun emulation

[Roedel, Joerg]

On Thu, Sep 02, 2010 at 11:29:47AM -0400, Joerg Roedel wrote:
> This patch changes the rip handling in the vmrun emulation
> path from using next_rip to the generic kvm register access
> functions.
> 
> Signed-off-by: Joerg Roedel <joerg.roedel@xxxxxxx>
> ---
>  arch/x86/kvm/svm.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index ecd4e58..1643f30 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -2069,7 +2069,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
>  		return false;
>  	}
>  
> -	trace_kvm_nested_vmrun(svm->vmcb->save.rip - 3, vmcb_gpa,
> +	trace_kvm_nested_vmrun(svm->vmcb->save.rip, vmcb_gpa,
>  			       nested_vmcb->save.rip,
>  			       nested_vmcb->control.int_ctl,
>  			       nested_vmcb->control.event_inj,
> @@ -2270,8 +2270,8 @@ static int vmrun_interception(struct vcpu_svm *svm)
>  	if (nested_svm_check_permissions(svm))
>  		return 1;
>  
> -	svm->next_rip = kvm_rip_read(&svm->vcpu) + 3;
> -	skip_emulated_instruction(&svm->vcpu);
> +	/* Save rip after vmrun instruction */
> +	kvm_rip_write(&svm->vcpu, kvm_rip_read(&svm->vcpu) + 3);
>  
>  	if (!nested_svm_vmrun(svm))
>  		return 1;

Argh, in my interactive commit I forgot one part of this patch. Please
apply the attached one instead.