KVM: VMX: add MSR_IA32_TSX_CTRL into msrs_to_save
PATCH v3 1/1 KVM: VMX: add MSR_IA32_TSX_CTRL into msrs_to_save
Add MSR_IA32_TSX_CTRL into msrs_to_save[] to explicitly tell userspace to save/restore the register value during migration. Missing this may cause userspace that relies on KVM ioctl(KVM_GET_MSR_INDEX_LIST) fail to port the value to the target VM.
In addition, there is no need to add MSR_IA32_TSX_CTRL when ARCH_CAP_TSX_CTRL_MSR is not supported in kvm_get_arch_capabilities(). So add the checking in kvm_probe_msr_to_save().
--- arch/x86/kvm/x86.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +5 -1
@@ -1431,7 +1431,7 @@ static const u32 msrs_to_save_base[] = {#endif MSR_IA32_TSC ,MSR_IA32_CR_PAT ,MSR_VM_HSAVE_PA ,MSR_IA32_FEAT_CTL ,MSR_IA32_BNDCFGS ,MSR_TSC_AUX , -MSR_IA32_SPEC_CTRL , +MSR_IA32_SPEC_CTRL ,MSR_IA32_TSX_CTRL ,MSR_IA32_RTIT_CTL ,MSR_IA32_RTIT_STATUS ,MSR_IA32_RTIT_CR3_MATCH ,MSR_IA32_RTIT_OUTPUT_BASE ,MSR_IA32_RTIT_OUTPUT_MASK , MSR_IA32_RTIT_ADDR0_A, MSR_IA32_RTIT_ADDR0_B,
@@ -7077,6 +7077,10 @@ static void kvm_probe_msr_to_save(u32 msr_index)if (!kvm_cpu_cap_has (X86_FEATURE_XFD ))return ;break ; +case MSR_IA32_TSX_CTRL : +if (!(kvm_get_arch_capabilities () &ARCH_CAP_TSX_CTRL_MSR )) +return ; +break ;default :break ; }
Signature · 1 line
2.40.1.521.gf1e218fcd8-goog
Quoted 6 lines · Mingwei Zhang
Add
MSR_IA32_TSX_CTRLinto msrs_to_save[] to explicitly tell userspace to save/restore the register value during migration. Missing this may cause userspace that relies on KVMioctl(KVM_GET_MSR_INDEX_LIST)fail to port the value to the target VM.
Quoted 8 lines
In addition, there is no need to add
MSR_IA32_TSX_CTRLwhenARCH_CAP_TSX_CTRL_MSRis not supported inkvm_get_arch_capabilities(). So add the checking inkvm_probe_msr_to_save().Fixes c11f83e0626b ("KVM: vmx: implement MSR_IA32_TSX_CTRL disable RTM functionality")Reported-by Jim Mattson <[email protected]>Signed-off-by Mingwei Zhang <[email protected]>---
Sign... missed the following two Reviewed-by...
Since this is probably the final version, I hope Sean or Paolo would help add them up before merging it. Appreciate your help. Thanks.
-Mingwei
Quoted 30 lines · Mingwei Zhang
Add
MSR_IA32_TSX_CTRLinto msrs_to_save[] to explicitly tell userspace to save/restore the register value during migration. Missing this may cause userspace that relies on KVMioctl(KVM_GET_MSR_INDEX_LIST)fail to port the value to the target VM.In addition, there is no need to add
MSR_IA32_TSX_CTRLwhenARCH_CAP_TSX_CTRL_MSRis not supported inkvm_get_arch_capabilities(). So add the checking inkvm_probe_msr_to_save().Fixes c11f83e0626b ("KVM: vmx: implement MSR_IA32_TSX_CTRL disable RTM functionality")Reported-by Jim Mattson <[email protected]>Signed-off-by Mingwei Zhang <[email protected]>--- arch/x86/kvm/x86.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)arch/x86/kvm/x86.c +1
-1@@ -1431,7 +1431,7 @@ static const u32 msrs_to_save_base[] = {#endif MSR_IA32_TSC ,MSR_IA32_CR_PAT ,MSR_VM_HSAVE_PA ,MSR_IA32_FEAT_CTL ,MSR_IA32_BNDCFGS ,MSR_TSC_AUX , -MSR_IA32_SPEC_CTRL , +MSR_IA32_SPEC_CTRL ,MSR_IA32_TSX_CTRL ,MSR_IA32_RTIT_CTL ,MSR_IA32_RTIT_STATUS ,MSR_IA32_RTIT_CR3_MATCH ,MSR_IA32_RTIT_OUTPUT_BASE ,MSR_IA32_RTIT_OUTPUT_MASK , MSR_IA32_RTIT_ADDR0_A, MSR_IA32_RTIT_ADDR0_B,
arch/x86/kvm/x86.c static void kvm_probe_msr_to_save(u32 msr_index) · line 7086
Quoted 10 lines
arch/x86/kvm/x86.c +4
-0@@ -7077,6 +7077,10 @@ static void kvm_probe_msr_to_save(u32 msr_index)if (!kvm_cpu_cap_has (X86_FEATURE_XFD ))return ;break ; +case MSR_IA32_TSX_CTRL : +if (!(kvm_get_arch_capabilities () &ARCH_CAP_TSX_CTRL_MSR )) +return ; +break ;default :break ; }
Queued, thanks.
Paolo