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

Commit 32cad84f authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: do not release the error page 



After commit a2766325, the error page is replaced by the
error code, it need not be released anymore

[ The patch has been compiling tested for powerpc ]

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

arch/powerpc/kvm/44x_tlb.c

+0 −1
Original line number Diff line number Diff line
@@ -319,7 +319,6 @@ void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 gvaddr, gpa_t gpaddr, 
	if (is_error_page(new_page)) {

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

			(unsigned long long)gfn);

		kvm_release_page_clean(new_page);

		return;

	}

	hpaddr = page_to_phys(new_page);

arch/powerpc/kvm/book3s_pr.c

+1 −3
Original line number Diff line number Diff line
@@ -242,10 +242,8 @@ 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)) {

		kvm_release_page_clean(hpage);

	if (is_error_page(hpage))

		return;

	}



	hpage_offset = pte->raddr & ~PAGE_MASK;

	hpage_offset &= ~0xFFFULL;

arch/x86/kvm/svm.c

+0 −1
Original line number Diff line number Diff line
@@ -2105,7 +2105,6 @@ static void *nested_svm_map(struct vcpu_svm *svm, u64 gpa, struct page **_page) 
	return kmap(page);



error:

	kvm_release_page_clean(page);

	kvm_inject_gp(&svm->vcpu, 0);



	return NULL;

arch/x86/kvm/vmx.c

+2 −3
Original line number Diff line number Diff line
@@ -596,10 +596,9 @@ static inline struct vmcs12 *get_vmcs12(struct kvm_vcpu *vcpu) 
static struct page *nested_get_page(struct kvm_vcpu *vcpu, gpa_t addr)

{

	struct page *page = gfn_to_page(vcpu->kvm, addr >> PAGE_SHIFT);

	if (is_error_page(page)) {

		kvm_release_page_clean(page);

	if (is_error_page(page))

		return NULL;

	}



	return page;

}

arch/x86/kvm/x86.c

+3 −6
Original line number Diff line number Diff line
@@ -1639,10 +1639,9 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data) 
		vcpu->arch.time_page =

				gfn_to_page(vcpu->kvm, data >> PAGE_SHIFT);



		if (is_error_page(vcpu->arch.time_page)) {

			kvm_release_page_clean(vcpu->arch.time_page);

		if (is_error_page(vcpu->arch.time_page))

			vcpu->arch.time_page = NULL;

		}



		break;

	}

	case MSR_KVM_ASYNC_PF_EN:
@@ -3945,10 +3944,8 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt, 
		goto emul_write;



	page = gfn_to_page(vcpu->kvm, gpa >> PAGE_SHIFT);

	if (is_error_page(page)) {

		kvm_release_page_clean(page);

	if (is_error_page(page))

		goto emul_write;

	}



	kaddr = kmap_atomic(page);

	kaddr += offset_in_page(gpa);