Commit 06cdaff8 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Drop gfn_to_pfn() APIs now that all users are gone 



Drop gfn_to_pfn() and all its variants now that all users are gone.

No functional change intended.

Tested-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Tested-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-ID: <20241010182427.1434605-80-seanjc@google.com>
parent 040537ce

include/linux/kvm_host.h

+0 −8
Original line number Diff line number Diff line
@@ -1274,14 +1274,6 @@ static inline kvm_pfn_t kvm_faultin_pfn(struct kvm_vcpu *vcpu, gfn_t gfn, 
				 write ? FOLL_WRITE : 0, writable, refcounted_page);

}



kvm_pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn);

kvm_pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault,

		      bool *writable);

kvm_pfn_t gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn);

kvm_pfn_t __gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn,

			       bool interruptible, bool no_wait,

			       bool write_fault, bool *writable);



void kvm_release_pfn_clean(kvm_pfn_t pfn);

void kvm_release_pfn_dirty(kvm_pfn_t pfn);

void kvm_set_pfn_dirty(kvm_pfn_t pfn);

virt/kvm/kvm_main.c

+0 −53
Original line number Diff line number Diff line
@@ -3039,59 +3039,6 @@ static kvm_pfn_t kvm_follow_pfn(struct kvm_follow_pfn *kfp) 
	return hva_to_pfn(kfp);

}



kvm_pfn_t __gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn,

			       bool interruptible, bool no_wait,

			       bool write_fault, bool *writable)

{

	struct kvm_follow_pfn kfp = {

		.slot = slot,

		.gfn = gfn,

		.map_writable = writable,

	};



	if (write_fault)

		kfp.flags |= FOLL_WRITE;

	if (no_wait)

		kfp.flags |= FOLL_NOWAIT;

	if (interruptible)

		kfp.flags |= FOLL_INTERRUPTIBLE;



	return kvm_follow_pfn(&kfp);

}

EXPORT_SYMBOL_GPL(__gfn_to_pfn_memslot);



kvm_pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault,

		      bool *writable)

{

	struct kvm_follow_pfn kfp = {

		.slot = gfn_to_memslot(kvm, gfn),

		.gfn = gfn,

		.flags = write_fault ? FOLL_WRITE : 0,

		.map_writable = writable,

	};



	return kvm_follow_pfn(&kfp);

}

EXPORT_SYMBOL_GPL(gfn_to_pfn_prot);



kvm_pfn_t gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn)

{

	struct kvm_follow_pfn kfp = {

		.slot = slot,

		.gfn = gfn,

		.flags = FOLL_WRITE,

	};



	return kvm_follow_pfn(&kfp);

}

EXPORT_SYMBOL_GPL(gfn_to_pfn_memslot);



kvm_pfn_t gfn_to_pfn(struct kvm *kvm, gfn_t gfn)

{

	return gfn_to_pfn_memslot(gfn_to_memslot(kvm, gfn), gfn);

}

EXPORT_SYMBOL_GPL(gfn_to_pfn);



kvm_pfn_t __kvm_faultin_pfn(const struct kvm_memory_slot *slot, gfn_t gfn,

			    unsigned int foll, bool *writable,

			    struct page **refcounted_page)