Commit 5d163b1c authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Marcelo Tosatti
Browse files

KVM: MMU: introduce a common function to get no-dirty-logged slot 



Cleanup the code of pte_prefetch_gfn_to_memslot and mapping_level_dirty_bitmap

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 40dcaa9f

arch/x86/kvm/mmu.c

+17 −20
Original line number Original line Diff line number Diff line
@@ -549,13 +549,23 @@ static int host_mapping_level(struct kvm *kvm, gfn_t gfn) 
	return ret;

	return ret;

}

}





static bool mapping_level_dirty_bitmap(struct kvm_vcpu *vcpu, gfn_t large_gfn)

static struct kvm_memory_slot *

gfn_to_memslot_dirty_bitmap(struct kvm_vcpu *vcpu, gfn_t gfn,

			    bool no_dirty_log)

{

{

	struct kvm_memory_slot *slot;

	struct kvm_memory_slot *slot;

	slot = gfn_to_memslot(vcpu->kvm, large_gfn);



	if (slot && slot->dirty_bitmap)

	slot = gfn_to_memslot(vcpu->kvm, gfn);

		return true;

	if (!slot || slot->flags & KVM_MEMSLOT_INVALID ||

	return false;

	      (no_dirty_log && slot->dirty_bitmap))

		slot = NULL;



	return slot;

}



static bool mapping_level_dirty_bitmap(struct kvm_vcpu *vcpu, gfn_t large_gfn)

{

	return gfn_to_memslot_dirty_bitmap(vcpu, large_gfn, true);

}

}





static int mapping_level(struct kvm_vcpu *vcpu, gfn_t large_gfn)

static int mapping_level(struct kvm_vcpu *vcpu, gfn_t large_gfn)
@@ -2145,26 +2155,13 @@ static void nonpaging_new_cr3(struct kvm_vcpu *vcpu) 
{

{

}

}





static struct kvm_memory_slot *

pte_prefetch_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn, bool no_dirty_log)

{

	struct kvm_memory_slot *slot;



	slot = gfn_to_memslot(vcpu->kvm, gfn);

	if (!slot || slot->flags & KVM_MEMSLOT_INVALID ||

	      (no_dirty_log && slot->dirty_bitmap))

		slot = NULL;



	return slot;

}



static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,

static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,

				     bool no_dirty_log)

				     bool no_dirty_log)

{

{

	struct kvm_memory_slot *slot;

	struct kvm_memory_slot *slot;

	unsigned long hva;

	unsigned long hva;





	slot = pte_prefetch_gfn_to_memslot(vcpu, gfn, no_dirty_log);

	slot = gfn_to_memslot_dirty_bitmap(vcpu, gfn, no_dirty_log);

	if (!slot) {

	if (!slot) {

		get_page(bad_page);

		get_page(bad_page);

		return page_to_pfn(bad_page);

		return page_to_pfn(bad_page);
@@ -2185,7 +2182,7 @@ static int direct_pte_prefetch_many(struct kvm_vcpu *vcpu, 
	gfn_t gfn;

	gfn_t gfn;





	gfn = kvm_mmu_page_get_gfn(sp, start - sp->spt);

	gfn = kvm_mmu_page_get_gfn(sp, start - sp->spt);

	if (!pte_prefetch_gfn_to_memslot(vcpu, gfn, access & ACC_WRITE_MASK))

	if (!gfn_to_memslot_dirty_bitmap(vcpu, gfn, access & ACC_WRITE_MASK))

		return -1;

		return -1;





	ret = gfn_to_page_many_atomic(vcpu->kvm, gfn, pages, end - start);

	ret = gfn_to_page_many_atomic(vcpu->kvm, gfn, pages, end - start);