KVM: SVM: Make sure rip is synced to vmcb before nested vmexit (2041a06a) · Commits · 戴 / test

This patch fixes a bug where a nested guest always went over the same instruction because the rip was not advanced on a nested vmexit. Signed-off-by:

arch/x86/kvm/svm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2960,6 +2960,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
		u16 gs_selector;
		u16 ldt_selector;

		svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX];
		svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP];
		svm->vmcb->save.rip = vcpu->arch.regs[VCPU_REGS_RIP];

		/*
		* A vmexit emulation is required before the vcpu can be executed
		* again.
		@@ -2967,10 +2971,6 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
		if (unlikely(svm->nested.exit_required))
		return;

		svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX];
		svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP];
		svm->vmcb->save.rip = vcpu->arch.regs[VCPU_REGS_RIP];

		pre_svm_run(svm);

		sync_lapic_to_cr8(vcpu);