Skip to contentSkip to conversation

KVM: VMX: Intercept FS/GS_BASE MSR accesses for 32-bit KVM

PATCH In review Sean Christopherson 2 participants 2 messages Apr 22, 2021

Subsystems (3)
lore
Share & tools
lore

Sean Christopherson

author maintainer
#0 lore raw

PATCH 1/1 KVM: VMX: Intercept FS/GS_BASE MSR accesses for 32-bit KVM

Disable pass-through of the FS and GS base MSRs for 32-bit KVM. Intel's SDM unequivocally states that the MSRs exist if and only if the CPU supports x86-64. FS_BASE and GS_BASE are mostly a non-issue; a clever guest could opportunistically use the MSRs without issue. KERNEL_GS_BASE is a bigger problem, as a clever guest would subtly be broken if it were migrated, as KVM disallows software access to the MSRs, and unlike the direct variants, KERNEL_GS_BASE needs to be explicitly migrated as it's not captured in the VMCS.

Fixes 25c5f225beda ("KVM: VMX: Enable MSR Bitmap feature")

---

Note, this breaks kvm-unit-tests on 32-bit KVM VMX due to the boot code using WRMSR(MSR_GS_BASE). But, the tests are already broken on SVM, and have always been broken on SVM, which is honestly the main reason I didn't just turn a blind eye. :-) I post the fix shortly.

 arch/x86/kvm/vmx/nested.c | 2 ++
 arch/x86/kvm/vmx/vmx.c    | 4 ++++
 2 files changed, 6 insertions(+)
arch/x86/kvm/vmx/nested.c +2 -0
index 8b111682fe5c..0f8c118ebc35 100644
@@ -614,6 +614,7 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu,
 	}
 
 	/* KVM unconditionally exposes the FS/GS base MSRs to L1. */
+#ifdef CONFIG_X86_64
 	nested_vmx_disable_intercept_for_msr(msr_bitmap_l1, msr_bitmap_l0,
 					     MSR_FS_BASE, MSR_TYPE_RW);
 
@@ -622,6 +623,7 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu,
 
 	nested_vmx_disable_intercept_for_msr(msr_bitmap_l1, msr_bitmap_l0,
 					     MSR_KERNEL_GS_BASE, MSR_TYPE_RW);
+#endif
 
 	/*
 	 * Checking the L0->L1 bitmap is trying to verify two things:
arch/x86/kvm/vmx/vmx.c +4 -0
index 6501d66167b8..b58dc2d454f1 100644
@@ -157,9 +157,11 @@ static u32 vmx_possible_passthrough_msrs[MAX_POSSIBLE_PASSTHROUGH_MSRS] = {
 	MSR_IA32_SPEC_CTRL,
 	MSR_IA32_PRED_CMD,
 	MSR_IA32_TSC,
+#ifdef CONFIG_X86_64
 	MSR_FS_BASE,
 	MSR_GS_BASE,
 	MSR_KERNEL_GS_BASE,
+#endif
 	MSR_IA32_SYSENTER_CS,
 	MSR_IA32_SYSENTER_ESP,
 	MSR_IA32_SYSENTER_EIP,
@@ -6969,9 +6971,11 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu)
 	bitmap_fill(vmx->shadow_msr_intercept.write, MAX_POSSIBLE_PASSTHROUGH_MSRS);
 
 	vmx_disable_intercept_for_msr(vcpu, MSR_IA32_TSC, MSR_TYPE_R);
+#ifdef CONFIG_X86_64
 	vmx_disable_intercept_for_msr(vcpu, MSR_FS_BASE, MSR_TYPE_RW);
 	vmx_disable_intercept_for_msr(vcpu, MSR_GS_BASE, MSR_TYPE_RW);
 	vmx_disable_intercept_for_msr(vcpu, MSR_KERNEL_GS_BASE, MSR_TYPE_RW);
+#endif
 	vmx_disable_intercept_for_msr(vcpu, MSR_IA32_SYSENTER_CS, MSR_TYPE_RW);
 	vmx_disable_intercept_for_msr(vcpu, MSR_IA32_SYSENTER_ESP, MSR_TYPE_RW);
 	vmx_disable_intercept_for_msr(vcpu, MSR_IA32_SYSENTER_EIP, MSR_TYPE_RW);
Signature · 1 line
2.31.1.498.g6c1eba8ee3d-goog
maintainer
#1 lore raw
Quoted 11 lines · Sean Christopherson

Disable pass-through of the FS and GS base MSRs for 32-bit KVM. Intel's SDM unequivocally states that the MSRs exist if and only if the CPU supports x86-64. FS_BASE and GS_BASE are mostly a non-issue; a clever guest could opportunistically use the MSRs without issue. KERNEL_GS_BASE is a bigger problem, as a clever guest would subtly be broken if it were migrated, as KVM disallows software access to the MSRs, and unlike the direct variants, KERNEL_GS_BASE needs to be explicitly migrated as it's not captured in the VMCS.

Fixes 25c5f225beda ("KVM: VMX: Enable MSR Bitmap feature")

I added an explicit note that this is not for stable kernels. The clever guest breaking after migration is the clever guest's problem.

Quoted 6 lines

---

Note, this breaks kvm-unit-tests on 32-bit KVM VMX due to the boot code using WRMSR(MSR_GS_BASE). But, the tests are already broken on SVM, and have always been broken on SVM, which is honestly the main reason I didn't just turn a blind eye. :-) I post the fix shortly.

Fair enough. Queued, thanks.

Quoted 53 lines
  arch/x86/kvm/vmx/nested.c | 2 ++
  arch/x86/kvm/vmx/vmx.c    | 4 ++++
  2 files changed, 6 insertions(+)
arch/x86/kvm/vmx/nested.c +2 -0
index 8b111682fe5c..0f8c118ebc35 100644
@@ -614,6 +614,7 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu,
  	}
 
  	/* KVM unconditionally exposes the FS/GS base MSRs to L1. */
+#ifdef CONFIG_X86_64
  	nested_vmx_disable_intercept_for_msr(msr_bitmap_l1, msr_bitmap_l0,
  					     MSR_FS_BASE, MSR_TYPE_RW);
 
@@ -622,6 +623,7 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu,
 
  	nested_vmx_disable_intercept_for_msr(msr_bitmap_l1, msr_bitmap_l0,
  					     MSR_KERNEL_GS_BASE, MSR_TYPE_RW);
+#endif
 
  	/*
  	 * Checking the L0->L1 bitmap is trying to verify two things:
arch/x86/kvm/vmx/vmx.c +4 -0
index 6501d66167b8..b58dc2d454f1 100644
@@ -157,9 +157,11 @@ static u32 vmx_possible_passthrough_msrs[MAX_POSSIBLE_PASSTHROUGH_MSRS] = {
  	MSR_IA32_SPEC_CTRL,
  	MSR_IA32_PRED_CMD,
  	MSR_IA32_TSC,
+#ifdef CONFIG_X86_64
  	MSR_FS_BASE,
  	MSR_GS_BASE,
  	MSR_KERNEL_GS_BASE,
+#endif
  	MSR_IA32_SYSENTER_CS,
  	MSR_IA32_SYSENTER_ESP,
  	MSR_IA32_SYSENTER_EIP,
@@ -6969,9 +6971,11 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu)
  	bitmap_fill(vmx->shadow_msr_intercept.write, MAX_POSSIBLE_PASSTHROUGH_MSRS);
 
  	vmx_disable_intercept_for_msr(vcpu, MSR_IA32_TSC, MSR_TYPE_R);
+#ifdef CONFIG_X86_64
  	vmx_disable_intercept_for_msr(vcpu, MSR_FS_BASE, MSR_TYPE_RW);
  	vmx_disable_intercept_for_msr(vcpu, MSR_GS_BASE, MSR_TYPE_RW);
  	vmx_disable_intercept_for_msr(vcpu, MSR_KERNEL_GS_BASE, MSR_TYPE_RW);
+#endif
  	vmx_disable_intercept_for_msr(vcpu, MSR_IA32_SYSENTER_CS, MSR_TYPE_RW);
  	vmx_disable_intercept_for_msr(vcpu, MSR_IA32_SYSENTER_ESP, MSR_TYPE_RW);
  	vmx_disable_intercept_for_msr(vcpu, MSR_IA32_SYSENTER_EIP, MSR_TYPE_RW);