Skip to content

Commit 92292c1

Browse files
committed
Merge tag 'kvm-selftests-6.2-1' of https://github.com/kvm-x86/linux into HEAD
KVM selftests updates for 6.2 perf_util: - Add support for pinning vCPUs in dirty_log_perf_test. - Add a lightweight psuedo RNG for guest use, and use it to randomize the access pattern and write vs. read percentage in the so called "perf util" tests. - Rename the so called "perf_util" framework to "memstress". ucall: - Add a common pool-based ucall implementation (code dedup and pre-work for running SEV (and beyond) guests in selftests. - Fix an issue in ARM's single-step test when using the new pool-based implementation; LDREX/STREX don't play nice with single-step exceptions. init: - Provide a common constructor and arch hook, which will eventually be used by x86 to automatically select the right hypercall (AMD vs. Intel). x86: - Clean up x86's page tabe management. - Clean up and enhance the "smaller maxphyaddr" test, and add a related test to cover generic emulation failure. - Clean up the nEPT support checks. - Add X86_PROPERTY_* framework to retrieve multi-bit CPUID values.
2 parents ecb89a5 + 5c107f7 commit 92292c1

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

tools/testing/selftests/kvm/lib/x86_64/memstress.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ void memstress_setup_nested(struct kvm_vm *vm, int nr_vcpus, struct kvm_vcpu *vc
8585
int vcpu_id;
8686

8787
TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX));
88+
TEST_REQUIRE(kvm_cpu_has_ept());
8889

8990
for (vcpu_id = 0; vcpu_id < nr_vcpus; vcpu_id++) {
9091
vmx = vcpu_alloc_vmx(vm, &vmx_gva);

tools/testing/selftests/kvm/lib/x86_64/vmx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ bool kvm_cpu_has_ept(void)
559559
void prepare_eptp(struct vmx_pages *vmx, struct kvm_vm *vm,
560560
uint32_t eptp_memslot)
561561
{
562-
TEST_REQUIRE(kvm_cpu_has_ept());
562+
TEST_ASSERT(kvm_cpu_has_ept(), "KVM doesn't support nested EPT");
563563

564564
vmx->eptp = (void *)vm_vaddr_alloc_page(vm);
565565
vmx->eptp_hva = addr_gva2hva(vm, (uintptr_t)vmx->eptp);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ int main(int argc, char *argv[])
7878
bool done = false;
7979

8080
TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX));
81+
TEST_REQUIRE(kvm_cpu_has_ept());
8182

8283
/* Create VM */
8384
vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code);

0 commit comments

Comments
 (0)