Commit 037d92dc authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: introduce gfn_to_pfn_memslot_atomic 



It can instead of hva_to_pfn_atomic

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 67b29204

arch/x86/kvm/mmu.c

+1 −4
Original line number Diff line number Diff line
@@ -2510,15 +2510,12 @@ static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, 
				     bool no_dirty_log)

{

	struct kvm_memory_slot *slot;

	unsigned long hva;



	slot = gfn_to_memslot_dirty_bitmap(vcpu, gfn, no_dirty_log);

	if (!slot)

		return KVM_PFN_ERR_FAULT;



	hva = gfn_to_hva_memslot(slot, gfn);



	return hva_to_pfn_atomic(hva);

	return gfn_to_pfn_memslot_atomic(slot, gfn);

}



static int direct_pte_prefetch_many(struct kvm_vcpu *vcpu,

include/linux/kvm_host.h

+2 −1
Original line number Diff line number Diff line
@@ -462,7 +462,6 @@ void kvm_release_page_dirty(struct page *page); 
void kvm_set_page_dirty(struct page *page);

void kvm_set_page_accessed(struct page *page);



pfn_t hva_to_pfn_atomic(unsigned long addr);

pfn_t gfn_to_pfn_atomic(struct kvm *kvm, gfn_t gfn);

pfn_t gfn_to_pfn_async(struct kvm *kvm, gfn_t gfn, bool *async,

		       bool write_fault, bool *writable);
@@ -470,6 +469,8 @@ pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn); 
pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault,

		      bool *writable);

pfn_t gfn_to_pfn_memslot(struct kvm_memory_slot *slot, gfn_t gfn);

pfn_t gfn_to_pfn_memslot_atomic(struct kvm_memory_slot *slot, gfn_t gfn);



void kvm_release_pfn_dirty(pfn_t pfn);

void kvm_release_pfn_clean(pfn_t pfn);

void kvm_set_pfn_dirty(pfn_t pfn);

virt/kvm/kvm_main.c

+8 −6
Original line number Diff line number Diff line
@@ -1102,12 +1102,6 @@ static pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool *async, 
	return pfn;

}



pfn_t hva_to_pfn_atomic(unsigned long addr)

{

	return hva_to_pfn(addr, true, NULL, true, NULL);

}

EXPORT_SYMBOL_GPL(hva_to_pfn_atomic);



static pfn_t __gfn_to_pfn(struct kvm *kvm, gfn_t gfn, bool atomic, bool *async,

			  bool write_fault, bool *writable)

{
@@ -1155,6 +1149,14 @@ pfn_t gfn_to_pfn_memslot(struct kvm_memory_slot *slot, gfn_t gfn) 
	return hva_to_pfn(addr, false, NULL, true, NULL);

}



pfn_t gfn_to_pfn_memslot_atomic(struct kvm_memory_slot *slot, gfn_t gfn)

{

	unsigned long addr = gfn_to_hva_memslot(slot, gfn);



	return hva_to_pfn(addr, true, NULL, true, NULL);

}

EXPORT_SYMBOL_GPL(gfn_to_pfn_memslot_atomic);



int gfn_to_page_many_atomic(struct kvm *kvm, gfn_t gfn, struct page **pages,

								  int nr_pages)

{