Commit 4d66623c authored by Wei Yang's avatar Wei Yang Committed by Paolo Bonzini
Browse files

KVM: x86: remove check on nr_mmu_pages in kvm_arch_commit_memory_region() 



* nr_mmu_pages would be non-zero only if kvm->arch.n_requested_mmu_pages is
  non-zero.

* nr_mmu_pages is always non-zero, since kvm_mmu_calculate_mmu_pages()
  never return zero.

Based on these two reasons, we can merge the two *if* clause and use the
return value from kvm_mmu_calculate_mmu_pages() directly. This simplify
the code and also eliminate the possibility for reader to believe
nr_mmu_pages would be zero.

Signed-off-by: default avatarWei Yang <richard.weiyang@gmail.com>
Reviewed-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 711eff3a

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1254,7 +1254,7 @@ void kvm_mmu_clear_dirty_pt_masked(struct kvm *kvm, 
				   gfn_t gfn_offset, unsigned long mask);

				   gfn_t gfn_offset, unsigned long mask);

void kvm_mmu_zap_all(struct kvm *kvm);

void kvm_mmu_zap_all(struct kvm *kvm);

void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen);

void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen);

unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm);

unsigned int kvm_mmu_calculate_default_mmu_pages(struct kvm *kvm);

void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages);

void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages);





int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3);

int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3);

arch/x86/kvm/mmu.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -6028,7 +6028,7 @@ out: 
/*

/*

 * Calculate mmu pages needed for kvm.

 * Calculate mmu pages needed for kvm.

 */

 */

unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm)

unsigned int kvm_mmu_calculate_default_mmu_pages(struct kvm *kvm)

{

{

	unsigned int nr_mmu_pages;

	unsigned int nr_mmu_pages;

	unsigned int  nr_pages = 0;

	unsigned int  nr_pages = 0;

arch/x86/kvm/x86.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -9429,13 +9429,9 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, 
				const struct kvm_memory_slot *new,

				const struct kvm_memory_slot *new,

				enum kvm_mr_change change)

				enum kvm_mr_change change)

{

{

	int nr_mmu_pages = 0;



	if (!kvm->arch.n_requested_mmu_pages)

	if (!kvm->arch.n_requested_mmu_pages)

		nr_mmu_pages = kvm_mmu_calculate_mmu_pages(kvm);

		kvm_mmu_change_mmu_pages(kvm,



				kvm_mmu_calculate_default_mmu_pages(kvm));

	if (nr_mmu_pages)

		kvm_mmu_change_mmu_pages(kvm, nr_mmu_pages);





	/*

	/*

	 * Dirty logging tracks sptes in 4k granularity, meaning that large

	 * Dirty logging tracks sptes in 4k granularity, meaning that large

CRA Git | Maintained and supported by SUSTech CRA and CCSE