Commit 037bc38b authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Drop KVM_ERR_PTR_BAD_PAGE and instead return NULL to indicate an error 



Remove KVM_ERR_PTR_BAD_PAGE and instead return NULL, as "bad page" is just
a leftover bit of weirdness from days of old when KVM stuffed a "bad" page
into the guest instead of actually handling missing pages.  See commit
cea7bb21 ("KVM: MMU: Make gfn_to_page() always safe").

Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
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-2-seanjc@google.com>
parent e9001a38

arch/powerpc/kvm/book3s_pr.c

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static void kvmppc_patch_dcbz(struct kvm_vcpu *vcpu, struct kvmppc_pte *pte) 
	int i;



	hpage = gfn_to_page(vcpu->kvm, pte->raddr >> PAGE_SHIFT);

	if (is_error_page(hpage))

	if (!hpage)

		return;



	hpage_offset = pte->raddr & ~PAGE_MASK;

arch/powerpc/kvm/book3s_xive_native.c

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static int kvmppc_xive_native_set_queue_config(struct kvmppc_xive *xive, 
	}



	page = gfn_to_page(kvm, gfn);

	if (is_error_page(page)) {

	if (!page) {

		srcu_read_unlock(&kvm->srcu, srcu_idx);

		pr_err("Couldn't get queue page %llx!\n", kvm_eq.qaddr);

		return -EINVAL;

arch/s390/kvm/vsie.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static int pin_guest_page(struct kvm *kvm, gpa_t gpa, hpa_t *hpa) 
	struct page *page;



	page = gfn_to_page(kvm, gpa_to_gfn(gpa));

	if (is_error_page(page))

	if (!page)

		return -EINVAL;

	*hpa = (hpa_t)page_to_phys(page) + (gpa & ~PAGE_MASK);

	return 0;

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -2664,7 +2664,7 @@ int kvm_alloc_apic_access_page(struct kvm *kvm) 
	}



	page = gfn_to_page(kvm, APIC_DEFAULT_PHYS_BASE >> PAGE_SHIFT);

	if (is_error_page(page)) {

	if (!page) {

		ret = -EFAULT;

		goto out;

	}

include/linux/kvm_host.h

+0 −7
Original line number Diff line number Diff line
@@ -153,13 +153,6 @@ static inline bool kvm_is_error_gpa(gpa_t gpa) 
	return gpa == INVALID_GPA;

}



#define KVM_ERR_PTR_BAD_PAGE	(ERR_PTR(-ENOENT))



static inline bool is_error_page(struct page *page)

{

	return IS_ERR(page);

}



#define KVM_REQUEST_MASK           GENMASK(7,0)

#define KVM_REQUEST_NO_WAKEUP      BIT(8)

#define KVM_REQUEST_WAIT           BIT(9)