Commit 3ab4ac87 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paolo Bonzini
Browse files

KVM: VMX: Update msr value after kvm_set_user_return_msr() succeeds 



Aoid earlier modification.

Signed-off-by: default avatarLai Jiangshan <laijs@linux.alibaba.com>
Message-Id: <20211118110814.2568-4-jiangshanlai@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6ab8a405

arch/x86/kvm/vmx/vmx.c

+3 −5
Original line number Diff line number Diff line
@@ -602,15 +602,13 @@ static int vmx_set_guest_uret_msr(struct vcpu_vmx *vmx, 
	unsigned int slot = msr - vmx->guest_uret_msrs;

	int ret = 0;



	u64 old_msr_data = msr->data;

	msr->data = data;

	if (msr->load_into_hardware) {

		preempt_disable();

		ret = kvm_set_user_return_msr(slot, msr->data, msr->mask);

		ret = kvm_set_user_return_msr(slot, data, msr->mask);

		preempt_enable();

		if (ret)

			msr->data = old_msr_data;

	}

	if (!ret)

		msr->data = data;

	return ret;

}