From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gleb Natapov <gleb@redhat.com>
Subject: Re: KVM: MMU: make kvm_mmu_available_pages robust against
 n_used_mmu_pages > n_max_mmu_pages
Date: Wed, 13 Mar 2013 11:46:20 +0200
Message-ID: <20130313094619.GH11223@redhat.com>
References: <20130313013642.GA20722@amt.cnet>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm <kvm@vger.kernel.org>, Paolo Bonzini <pbonzini@redhat.com>,
	Ulrich Obergfell <uobergfe@redhat.com>
To: Marcelo Tosatti <mtosatti@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:64534 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754855Ab3CMJqV (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 13 Mar 2013 05:46:21 -0400
Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2D9kL2g032567
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <kvm@vger.kernel.org>; Wed, 13 Mar 2013 05:46:21 -0400
Content-Disposition: inline
In-Reply-To: <20130313013642.GA20722@amt.cnet>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Tue, Mar 12, 2013 at 10:36:43PM -0300, Marcelo Tosatti wrote:
> 
> As noticed by Ulrich Obergfell <uobergfe@redhat.com>, the mmu
> counters are for beancounting purposes only - so n_used_mmu_pages and
> n_max_mmu_pages could be relaxed (example: before f0f5933a1626c8df7b),
> resulting in n_used_mmu_pages > n_max_mmu_pages.
> 
> Make code robust against n_used_mmu_pages > n_max_mmu_pages.
> 
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
> 
Applied, thanks.

> diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
> index 6987108..3b1ad00 100644
> --- a/arch/x86/kvm/mmu.h
> +++ b/arch/x86/kvm/mmu.h
> @@ -57,8 +57,11 @@ int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context);
>  
>  static inline unsigned int kvm_mmu_available_pages(struct kvm *kvm)
>  {
> -	return kvm->arch.n_max_mmu_pages -
> -		kvm->arch.n_used_mmu_pages;
> +	if (kvm->arch.n_max_mmu_pages > kvm->arch.n_used_mmu_pages)
> +		return kvm->arch.n_max_mmu_pages -
> +			kvm->arch.n_used_mmu_pages;
> +
> +	return 0;
>  }
>  
>  static inline void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)

--
			Gleb.