Skip to content

Commit 0b091a4

Browse files
vittyvkbonzini
authored andcommitted
KVM: selftests: vmx_pmu_msrs_test: Drop tests mangling guest visible CPUIDs
Host initiated writes to MSR_IA32_PERF_CAPABILITIES should not depend on guest visible CPUIDs and (incorrect) KVM logic implementing it is about to change. Also, KVM_SET_CPUID{,2} after KVM_RUN is now forbidden and causes test to fail. Reported-by: kernel test robot <[email protected]> Fixes: feb627e ("KVM: x86: Forbid KVM_SET_CPUID{,2} after KVM_RUN") Signed-off-by: Vitaly Kuznetsov <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 1aa2abb commit 0b091a4

File tree

1 file changed

+0
-17
lines changed

1 file changed

+0
-17
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,5 @@ int main(int argc, char *argv[])
110110
ret = _vcpu_set_msr(vm, 0, MSR_IA32_PERF_CAPABILITIES, PMU_CAP_LBR_FMT);
111111
TEST_ASSERT(ret == 0, "Bad PERF_CAPABILITIES didn't fail.");
112112

113-
/* testcase 4, set capabilities when we don't have PDCM bit */
114-
entry_1_0->ecx &= ~X86_FEATURE_PDCM;
115-
vcpu_set_cpuid(vm, VCPU_ID, cpuid);
116-
ret = _vcpu_set_msr(vm, 0, MSR_IA32_PERF_CAPABILITIES, host_cap.capabilities);
117-
TEST_ASSERT(ret == 0, "Bad PERF_CAPABILITIES didn't fail.");
118-
119-
/* testcase 5, set capabilities when we don't have PMU version bits */
120-
entry_1_0->ecx |= X86_FEATURE_PDCM;
121-
eax.split.version_id = 0;
122-
entry_1_0->ecx = eax.full;
123-
vcpu_set_cpuid(vm, VCPU_ID, cpuid);
124-
ret = _vcpu_set_msr(vm, 0, MSR_IA32_PERF_CAPABILITIES, PMU_CAP_FW_WRITES);
125-
TEST_ASSERT(ret == 0, "Bad PERF_CAPABILITIES didn't fail.");
126-
127-
vcpu_set_msr(vm, 0, MSR_IA32_PERF_CAPABILITIES, 0);
128-
ASSERT_EQ(vcpu_get_msr(vm, VCPU_ID, MSR_IA32_PERF_CAPABILITIES), 0);
129-
130113
kvm_vm_free(vm);
131114
}

0 commit comments

Comments
 (0)