hv: retain rip if the fault is injected to guest

fyin1 · wenlingz · commit eb328d78eae4 · 2018-10-17T10:05:36.000+08:00
According to SDM 6.5 exception classification, if the fault happens, the CPU will return to the faulting instruction. So we shouldn't change rip to the next instruction if inject fault to guest. Tracked-On: #1473 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
diff --git a/hypervisor/arch/x86/virq.c b/hypervisor/arch/x86/virq.c
@@ -261,6 +261,9 @@ static void vcpu_inject_exception(struct vcpu *vcpu, uint32_t vector)
 			(exception_type[vector] << 8U) | (vector & 0xFFU));
 
 	vcpu->arch_vcpu.exception_info.exception = VECTOR_INVALID;
+
+	/* retain rip for exception injection */
+	vcpu_retain_rip(vcpu);
 }
 
 static int vcpu_inject_hi_exception(struct vcpu *vcpu)

Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,9 @@ static void vcpu_inject_exception(struct vcpu *vcpu, uint32_t vector)`
`261`	`261`	`(exception_type[vector] << 8U) \| (vector & 0xFFU));`
`262`	`262`
`263`	`263`	`vcpu->arch_vcpu.exception_info.exception = VECTOR_INVALID;`
	`264`	`+`
	`265`	`+ /* retain rip for exception injection */`
	`266`	`+ vcpu_retain_rip(vcpu);`
`264`	`267`	`}`
`265`	`268`
`266`	`269`	`static int vcpu_inject_hi_exception(struct vcpu *vcpu)`