Skip to content

Commit a33ba1b

Browse files
Wenyao Haisean-jc
authored andcommitted
KVM: VMX: Open code writing vCPU's PAT in VMX's MSR handler
Open code setting "vcpu->arch.pat" in vmx_set_msr() instead of bouncing through kvm_set_msr_common() to get to the same code in kvm_mtrr_set_msr(). This aligns VMX with SVM, avoids hiding a very simple operation behind a relatively complicated function call (finding the PAT MSR case in kvm_set_msr_common() is non-trivial), and most importantly, makes it clear that not unwinding the VMCS updates if kvm_set_msr_common() isn't a bug (because kvm_set_msr_common() can never fail for PAT). Opportunistically set vcpu->arch.pat before updating the VMCS info so that a future patch can move the common bits (back) into kvm_set_msr_common() without a functional change. Note, MSR_IA32_CR_PAT is 0x277, and is very subtly handled by case 0x200 ... MSR_IA32_MC0_CTL2 - 1: in kvm_set_msr_common(). Cc: Kai Huang <kai.huang@intel.com> Signed-off-by: Wenyao Hai <haiwenyao@uniontech.com> [sean: massage changelog, hoist setting vcpu->arch.pat up] Reviewed-by: Kai Huang <kai.huang@intel.com> Link: https://lore.kernel.org/r/20230511233351.635053-2-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent b9846a6 commit a33ba1b

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

arch/x86/kvm/vmx/vmx.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2290,16 +2290,14 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
22902290
if (!kvm_pat_valid(data))
22912291
return 1;
22922292

2293+
vcpu->arch.pat = data;
2294+
22932295
if (is_guest_mode(vcpu) &&
22942296
get_vmcs12(vcpu)->vm_exit_controls & VM_EXIT_SAVE_IA32_PAT)
22952297
get_vmcs12(vcpu)->guest_ia32_pat = data;
22962298

2297-
if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) {
2299+
if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
22982300
vmcs_write64(GUEST_IA32_PAT, data);
2299-
vcpu->arch.pat = data;
2300-
break;
2301-
}
2302-
ret = kvm_set_msr_common(vcpu, msr_info);
23032301
break;
23042302
case MSR_IA32_MCG_EXT_CTL:
23052303
if ((!msr_info->host_initiated &&

0 commit comments

Comments
 (0)