iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Aoid earlier modification.

Signed-off-by: Lai Jiangshan <laijs@linux.alibaba.com>
Message-Id: <20211118110814.2568-4-jiangshanlai@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Lai Jiangshan 2021-11-18 19:08:02 +08:00 committed by Paolo Bonzini
parent 6ab8a4053f
commit 3ab4ac877c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kvm/vmx/vmx.c
View File

@ -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;
}