Re: [PATCH] KVM: x86: remove vcpu's CPL check in host invoked vcpu's xcr set process

[Paolo Bonzini <pbonzini@redhat.com>]

Il 18/06/2013 14:39, Zhanghaoyu (A) ha scritto:
>> Applied to master, but check your setup because I had to do so manually.
>> Your patch has 2 tabs + 1 space for each indentation level (??), the file only has one tab.
>>
>> This time the patch was pretty simple and may even be worth having in 3.9, but next time I'd ask you to resubmit.
>>
>> Can you write a testcase for kvm-unit-tests?
>>
>> Paolo
> 
> So sorry for above bad format patch, this time the format is OK, but
> I'm not sure could the format be changed in transmission?

This time it is okay.

Paolo

> 
> Signed-off-by: Zhang Haoyu <haoyu.zhang@huawei.com>
> ---
>  arch/x86/kvm/x86.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 094b5d9..aa7bda1 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -582,8 +582,6 @@ int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)
>  	if (index != XCR_XFEATURE_ENABLED_MASK)
>  		return 1;
>  	xcr0 = xcr;
> -	if (kvm_x86_ops->get_cpl(vcpu) != 0)
> -		return 1;
>  	if (!(xcr0 & XSTATE_FP))
>  		return 1;
>  	if ((xcr0 & XSTATE_YMM) && !(xcr0 & XSTATE_SSE))
> @@ -597,7 +595,8 @@ int __kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)
>  
>  int kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr)
>  {
> -	if (__kvm_set_xcr(vcpu, index, xcr)) {
> +	if ((kvm_x86_ops->get_cpl(vcpu) != 0) ||
> +	    __kvm_set_xcr(vcpu, index, xcr)) {
>  		kvm_inject_gp(vcpu, 0);
>  		return 1;
>  	}
>