x86: vmx: Remove bogus GUEST_RIP update from interrupt test

PATCH New Jan Kiszka 1 participant 1 message May 4, 2015 KVM

Share & tools

Jan Kiszka

author

2015-05-04 08:12 UTC #0 lore raw

PATCH 1/1 x86: vmx: Remove bogus GUEST_RIP update from interrupt test

When we get an EXTINT exit, the guest RIP already points to the instruction after the one that sent it into HLT state. Moving the RIP based on stale insn_len caused spurious L2 crashes.

Signed-off-by Jan Kiszka <[email protected]>

---
 x86/vmx_tests.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

x86/vmx_tests.c +1 -3

index 4f8ace1..79552fd 100644
@@ -1297,10 +1297,8 @@ static int interrupt_exit_handler(void)
 			asm volatile ("nop");
 			irq_disable();
 		}
-		if (vmx_get_test_stage() >= 2) {
+		if (vmx_get_test_stage() >= 2)
 			vmcs_write(GUEST_ACTV_STATE, ACTV_ACTIVE);
-			vmcs_write(GUEST_RIP, guest_rip + insn_len);
-		}
 		return VMX_TEST_RESUME;
 	default:
 		printf("Unknown exit reason, %d\n", reason);

Signature · 1 line

2.1.4