On Fri, Feb 27, 2015 at 06:19:18PM -0600, Joel Schopp wrote:
> From: David Kaplan <david.kap...@amd.com>
> No need to re-decode WBINVD since we know what it is from the intercept.
> 
> Signed-off-by: David Kaplan <david.kap...@amd.com>
> [extracted from larger unlrelated patch, forward ported, tested]
> Signed-off-by: Joel Schopp <joel.sch...@amd.com>

Can't you disable the intercept if need_emulate_wbinvd(vcpu) == false? 

> ---
>  arch/x86/kvm/svm.c |   10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index d319e0c..86ecd21 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -2776,6 +2776,14 @@ static int skinit_interception(struct vcpu_svm *svm)
>       return 1;
>  }
>  
> +static int wbinvd_interception(struct vcpu_svm *svm)
> +{
> +     kvm_emulate_wbinvd(&svm->vcpu);
> +     skip_emulated_instruction(&svm->vcpu);
> +     return 1;
> +}
> +
> +
>  static int xsetbv_interception(struct vcpu_svm *svm)
>  {
>       u64 new_bv = kvm_read_edx_eax(&svm->vcpu);
> @@ -3376,7 +3384,7 @@ static int (*const svm_exit_handlers[])(struct vcpu_svm 
> *svm) = {
>       [SVM_EXIT_STGI]                         = stgi_interception,
>       [SVM_EXIT_CLGI]                         = clgi_interception,
>       [SVM_EXIT_SKINIT]                       = skinit_interception,
> -     [SVM_EXIT_WBINVD]                       = emulate_on_interception,
> +     [SVM_EXIT_WBINVD]                       = wbinvd_interception,
>       [SVM_EXIT_MONITOR]                      = monitor_interception,
>       [SVM_EXIT_MWAIT]                        = mwait_interception,
>       [SVM_EXIT_XSETBV]                       = xsetbv_interception,
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to