Skip to content

Commit b80732f

Browse files
committed
KVM: selftests: Verify userspace can stuff IA32_FEATURE_CONTROL at will
Verify the KVM allows userspace to set all supported bits in the IA32_FEATURE_CONTROL MSR irrespective of the current guest CPUID, and that all unsupported bits are rejected. Throw the testcase into vmx_msrs_test even though it's not technically a VMX MSR; it's close enough, and the most frequently feature controlled by the MSR is VMX. Signed-off-by: Sean Christopherson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 2d6cd68 commit b80732f

File tree

2 files changed

+49
-0
lines changed

2 files changed

+49
-0
lines changed

tools/testing/selftests/kvm/include/x86_64/processor.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ struct kvm_x86_cpu_feature {
102102
#define X86_FEATURE_XMM2 KVM_X86_CPU_FEATURE(0x1, 0, EDX, 26)
103103
#define X86_FEATURE_FSGSBASE KVM_X86_CPU_FEATURE(0x7, 0, EBX, 0)
104104
#define X86_FEATURE_TSC_ADJUST KVM_X86_CPU_FEATURE(0x7, 0, EBX, 1)
105+
#define X86_FEATURE_SGX KVM_X86_CPU_FEATURE(0x7, 0, EBX, 2)
105106
#define X86_FEATURE_HLE KVM_X86_CPU_FEATURE(0x7, 0, EBX, 4)
106107
#define X86_FEATURE_SMEP KVM_X86_CPU_FEATURE(0x7, 0, EBX, 7)
107108
#define X86_FEATURE_INVPCID KVM_X86_CPU_FEATURE(0x7, 0, EBX, 10)
@@ -115,6 +116,7 @@ struct kvm_x86_cpu_feature {
115116
#define X86_FEATURE_PKU KVM_X86_CPU_FEATURE(0x7, 0, ECX, 3)
116117
#define X86_FEATURE_LA57 KVM_X86_CPU_FEATURE(0x7, 0, ECX, 16)
117118
#define X86_FEATURE_RDPID KVM_X86_CPU_FEATURE(0x7, 0, ECX, 22)
119+
#define X86_FEATURE_SGX_LC KVM_X86_CPU_FEATURE(0x7, 0, ECX, 30)
118120
#define X86_FEATURE_SHSTK KVM_X86_CPU_FEATURE(0x7, 0, ECX, 7)
119121
#define X86_FEATURE_IBT KVM_X86_CPU_FEATURE(0x7, 0, EDX, 20)
120122
#define X86_FEATURE_AMX_TILE KVM_X86_CPU_FEATURE(0x7, 0, EDX, 24)

tools/testing/selftests/kvm/x86_64/vmx_msrs_test.c

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,52 @@ static void vmx_save_restore_msrs_test(struct kvm_vcpu *vcpu)
6767
vmx_fixed1_msr_test(vcpu, MSR_IA32_VMX_VMFUNC, -1ull);
6868
}
6969

70+
static void __ia32_feature_control_msr_test(struct kvm_vcpu *vcpu,
71+
uint64_t msr_bit,
72+
struct kvm_x86_cpu_feature feature)
73+
{
74+
uint64_t val;
75+
76+
vcpu_clear_cpuid_feature(vcpu, feature);
77+
78+
val = vcpu_get_msr(vcpu, MSR_IA32_FEAT_CTL);
79+
vcpu_set_msr(vcpu, MSR_IA32_FEAT_CTL, val | msr_bit | FEAT_CTL_LOCKED);
80+
vcpu_set_msr(vcpu, MSR_IA32_FEAT_CTL, (val & ~msr_bit) | FEAT_CTL_LOCKED);
81+
vcpu_set_msr(vcpu, MSR_IA32_FEAT_CTL, val | msr_bit | FEAT_CTL_LOCKED);
82+
vcpu_set_msr(vcpu, MSR_IA32_FEAT_CTL, (val & ~msr_bit) | FEAT_CTL_LOCKED);
83+
vcpu_set_msr(vcpu, MSR_IA32_FEAT_CTL, val);
84+
85+
if (!kvm_cpu_has(feature))
86+
return;
87+
88+
vcpu_set_cpuid_feature(vcpu, feature);
89+
}
90+
91+
static void ia32_feature_control_msr_test(struct kvm_vcpu *vcpu)
92+
{
93+
uint64_t supported_bits = FEAT_CTL_LOCKED |
94+
FEAT_CTL_VMX_ENABLED_INSIDE_SMX |
95+
FEAT_CTL_VMX_ENABLED_OUTSIDE_SMX |
96+
FEAT_CTL_SGX_LC_ENABLED |
97+
FEAT_CTL_SGX_ENABLED |
98+
FEAT_CTL_LMCE_ENABLED;
99+
int bit, r;
100+
101+
__ia32_feature_control_msr_test(vcpu, FEAT_CTL_VMX_ENABLED_INSIDE_SMX, X86_FEATURE_SMX);
102+
__ia32_feature_control_msr_test(vcpu, FEAT_CTL_VMX_ENABLED_INSIDE_SMX, X86_FEATURE_VMX);
103+
__ia32_feature_control_msr_test(vcpu, FEAT_CTL_VMX_ENABLED_OUTSIDE_SMX, X86_FEATURE_VMX);
104+
__ia32_feature_control_msr_test(vcpu, FEAT_CTL_SGX_LC_ENABLED, X86_FEATURE_SGX_LC);
105+
__ia32_feature_control_msr_test(vcpu, FEAT_CTL_SGX_LC_ENABLED, X86_FEATURE_SGX);
106+
__ia32_feature_control_msr_test(vcpu, FEAT_CTL_SGX_ENABLED, X86_FEATURE_SGX);
107+
__ia32_feature_control_msr_test(vcpu, FEAT_CTL_LMCE_ENABLED, X86_FEATURE_MCE);
108+
109+
for_each_clear_bit(bit, &supported_bits, 64) {
110+
r = _vcpu_set_msr(vcpu, MSR_IA32_FEAT_CTL, BIT(bit));
111+
TEST_ASSERT(r == 0,
112+
"Setting reserved bit %d in IA32_FEATURE_CONTROL should fail", bit);
113+
}
114+
}
115+
70116
int main(void)
71117
{
72118
struct kvm_vcpu *vcpu;
@@ -79,6 +125,7 @@ int main(void)
79125
vm = vm_create_with_one_vcpu(&vcpu, NULL);
80126

81127
vmx_save_restore_msrs_test(vcpu);
128+
ia32_feature_control_msr_test(vcpu);
82129

83130
kvm_vm_free(vm);
84131
}

0 commit comments

Comments
 (0)