Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81c52c56 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Marcelo Tosatti
Browse files

KVM: do not treat noslot pfn as a error pfn 



This patch filters noslot pfn out from error pfns based on Marcelo comment:
noslot pfn is not a error pfn

After this patch,
- is_noslot_pfn indicates that the gfn is not in slot
- is_error_pfn indicates that the gfn is in slot but the error is occurred
  when translate the gfn to pfn
- is_error_noslot_pfn indicates that the pfn either it is error pfns or it
  is noslot pfn
And is_invalid_pfn can be removed, it makes the code more clean

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 19bf7f8a

arch/powerpc/kvm/book3s_32_mmu_host.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte) 


	/* Get host physical address for gpa */

	hpaddr = kvmppc_gfn_to_pfn(vcpu, orig_pte->raddr >> PAGE_SHIFT);

	if (is_error_pfn(hpaddr)) {

	if (is_error_noslot_pfn(hpaddr)) {

		printk(KERN_INFO "Couldn't get guest page for gfn %lx!\n",

				 orig_pte->eaddr);

		r = -EINVAL;

arch/powerpc/kvm/book3s_64_mmu_host.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte) 


	/* Get host physical address for gpa */

	hpaddr = kvmppc_gfn_to_pfn(vcpu, orig_pte->raddr >> PAGE_SHIFT);

	if (is_error_pfn(hpaddr)) {

	if (is_error_noslot_pfn(hpaddr)) {

		printk(KERN_INFO "Couldn't get guest page for gfn %lx!\n", orig_pte->eaddr);

		r = -EINVAL;

		goto out;

arch/powerpc/kvm/e500_tlb.c

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ static inline void kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500, 
	if (likely(!pfnmap)) {

		unsigned long tsize_pages = 1 << (tsize + 10 - PAGE_SHIFT);

		pfn = gfn_to_pfn_memslot(slot, gfn);

		if (is_error_pfn(pfn)) {

		if (is_error_noslot_pfn(pfn)) {

			printk(KERN_ERR "Couldn't get real page for gfn %lx!\n",

					(long)gfn);

			return;

arch/x86/kvm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -2699,7 +2699,7 @@ static void transparent_hugepage_adjust(struct kvm_vcpu *vcpu, 
	 * PT_PAGE_TABLE_LEVEL and there would be no adjustment done

	 * here.

	 */

	if (!is_error_pfn(pfn) && !kvm_is_mmio_pfn(pfn) &&

	if (!is_error_noslot_pfn(pfn) && !kvm_is_mmio_pfn(pfn) &&

	    level == PT_PAGE_TABLE_LEVEL &&

	    PageTransCompound(pfn_to_page(pfn)) &&

	    !has_wrprotected_page(vcpu->kvm, gfn, PT_DIRECTORY_LEVEL)) {
@@ -2733,7 +2733,7 @@ static bool handle_abnormal_pfn(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn, 
	bool ret = true;



	/* The pfn is invalid, report the error! */

	if (unlikely(is_invalid_pfn(pfn))) {

	if (unlikely(is_error_pfn(pfn))) {

		*ret_val = kvm_handle_bad_page(vcpu, gfn, pfn);

		goto exit;

	}

arch/x86/kvm/paging_tmpl.h

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp, 
	protect_clean_gpte(&pte_access, gpte);

	pfn = pte_prefetch_gfn_to_pfn(vcpu, gfn,

			no_dirty_log && (pte_access & ACC_WRITE_MASK));

	if (is_invalid_pfn(pfn))

	if (is_error_pfn(pfn))

		return false;



	/*