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

Commit 8e3d9d06 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: x86: fix possible infinite loop caused by reexecute_instruction 



Currently, we reexecute all unhandleable instructions if they do not
access on the mmio, however, it can not work if host map the readonly
memory to guest. If the instruction try to write this kind of memory,
it will fault again when guest retry it, then we will goto a infinite
loop: retry instruction -> write #PF -> emulation fail ->
retry instruction -> ...

Fix it by retrying the instruction only when it faults on the writable
memory

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

arch/x86/kvm/x86.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -4473,6 +4473,7 @@ static int handle_emulation_failure(struct kvm_vcpu *vcpu) 
static bool reexecute_instruction(struct kvm_vcpu *vcpu, gva_t gva)

static bool reexecute_instruction(struct kvm_vcpu *vcpu, gva_t gva)

{

{

	gpa_t gpa;

	gpa_t gpa;

	pfn_t pfn;





	if (tdp_enabled)

	if (tdp_enabled)

		return false;

		return false;
@@ -4490,8 +4491,17 @@ static bool reexecute_instruction(struct kvm_vcpu *vcpu, gva_t gva) 
	if (gpa == UNMAPPED_GVA)

	if (gpa == UNMAPPED_GVA)

		return true; /* let cpu generate fault */

		return true; /* let cpu generate fault */





	if (!kvm_is_error_hva(gfn_to_hva(vcpu->kvm, gpa >> PAGE_SHIFT)))

	/*

	 * Do not retry the unhandleable instruction if it faults on the

	 * readonly host memory, otherwise it will goto a infinite loop:

	 * retry instruction -> write #PF -> emulation fail -> retry

	 * instruction -> ...

	 */

	pfn = gfn_to_pfn(vcpu->kvm, gpa_to_gfn(gpa));

	if (!is_error_pfn(pfn)) {

		kvm_release_pfn_clean(pfn);

		return true;

		return true;

	}





	return false;

	return false;

}

}