Re: [PATCH] KVM: x86: Fix CR3 reserved bits check in long mode

[Paolo Bonzini <pbonzini@redhat.com>]

Il 10/05/2014 09:24, Jan Kiszka ha scritto:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Regression of 346874c9: PAE is set in long mode, but that does not mean
> we have valid PDPTRs.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  arch/x86/kvm/x86.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index c5582c3..198aac8 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -701,10 +701,11 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
>  		return 0;
>  	}
>
> -	if (is_long_mode(vcpu) && (cr3 & CR3_L_MODE_RESERVED_BITS))
> -		return 1;
> -	if (is_pae(vcpu) && is_paging(vcpu) &&
> -	    !load_pdptrs(vcpu, vcpu->arch.walk_mmu, cr3))
> +	if (is_long_mode(vcpu)) {
> +		if (cr3 & CR3_L_MODE_RESERVED_BITS)
> +			return 1;
> +	} else if (is_pae(vcpu) && is_paging(vcpu) &&
> +		   !load_pdptrs(vcpu, vcpu->arch.walk_mmu, cr3))
>  		return 1;
>
>  	vcpu->arch.cr3 = cr3;
>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

will apply tomorrow, thanks.

Paolo