Commit a0c468ed authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-selftests-6.20' of https://github.com/kvm-x86/linux into HEAD 

KVM selftests changes for 6.20

 - Add a regression test for TPR<=>CR8 synchronization and IRQ masking.

 - Overhaul selftest's MMU infrastructure to genericize stage-2 MMU support,
   and extend x86's infrastructure to support EPT and NPT (for L2 guests).

 - Extend several nested VMX tests to also cover nested SVM.

 - Add a selftest for nested VMLOAD/VMSAVE.

 - Rework the nested dirty log test, originally added as a regression test for
   PML where KVM logged L2 GPAs instead of L1 GPAs, to improve test coverage
   and to hopefully make the test easier to understand and maintain.
parents 54900632 a91cc482

tools/testing/selftests/kvm/Makefile.kvm

+3 −1
Original line number Diff line number Diff line
@@ -89,11 +89,13 @@ TEST_GEN_PROGS_x86 += x86/kvm_buslock_test 
TEST_GEN_PROGS_x86 += x86/monitor_mwait_test

TEST_GEN_PROGS_x86 += x86/msrs_test

TEST_GEN_PROGS_x86 += x86/nested_close_kvm_test

TEST_GEN_PROGS_x86 += x86/nested_dirty_log_test

TEST_GEN_PROGS_x86 += x86/nested_emulation_test

TEST_GEN_PROGS_x86 += x86/nested_exceptions_test

TEST_GEN_PROGS_x86 += x86/nested_invalid_cr3_test

TEST_GEN_PROGS_x86 += x86/nested_tsc_adjust_test

TEST_GEN_PROGS_x86 += x86/nested_tsc_scaling_test

TEST_GEN_PROGS_x86 += x86/nested_vmsave_vmload_test

TEST_GEN_PROGS_x86 += x86/platform_info_test

TEST_GEN_PROGS_x86 += x86/pmu_counters_test

TEST_GEN_PROGS_x86 += x86/pmu_event_filter_test
@@ -115,7 +117,6 @@ TEST_GEN_PROGS_x86 += x86/ucna_injection_test 
TEST_GEN_PROGS_x86 += x86/userspace_io_test

TEST_GEN_PROGS_x86 += x86/userspace_msr_exit_test

TEST_GEN_PROGS_x86 += x86/vmx_apic_access_test

TEST_GEN_PROGS_x86 += x86/vmx_dirty_log_test

TEST_GEN_PROGS_x86 += x86/vmx_exception_with_invalid_guest_state

TEST_GEN_PROGS_x86 += x86/vmx_msrs_test

TEST_GEN_PROGS_x86 += x86/vmx_invalid_nested_guest_state
@@ -124,6 +125,7 @@ TEST_GEN_PROGS_x86 += x86/vmx_set_nested_state_test 
TEST_GEN_PROGS_x86 += x86/apic_bus_clock_test

TEST_GEN_PROGS_x86 += x86/xapic_ipi_test

TEST_GEN_PROGS_x86 += x86/xapic_state_test

TEST_GEN_PROGS_x86 += x86/xapic_tpr_test

TEST_GEN_PROGS_x86 += x86/xcr0_cpuid_test

TEST_GEN_PROGS_x86 += x86/xss_msr_test

TEST_GEN_PROGS_x86 += x86/debug_regs

tools/testing/selftests/kvm/include/arm64/kvm_util_arch.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef SELFTEST_KVM_UTIL_ARCH_H

#define SELFTEST_KVM_UTIL_ARCH_H



struct kvm_mmu_arch {};



struct kvm_vm_arch {

	bool	has_gic;

	int	gic_fd;

tools/testing/selftests/kvm/include/kvm_util.h

+15 −3
Original line number Diff line number Diff line
@@ -88,12 +88,19 @@ enum kvm_mem_region_type { 
	NR_MEM_REGIONS,

};



struct kvm_mmu {

	bool pgd_created;

	uint64_t pgd;

	int pgtable_levels;



	struct kvm_mmu_arch arch;

};



struct kvm_vm {

	int mode;

	unsigned long type;

	int kvm_fd;

	int fd;

	unsigned int pgtable_levels;

	unsigned int page_size;

	unsigned int page_shift;

	unsigned int pa_bits;
@@ -104,13 +111,18 @@ struct kvm_vm { 
	struct sparsebit *vpages_valid;

	struct sparsebit *vpages_mapped;

	bool has_irqchip;

	bool pgd_created;

	vm_paddr_t ucall_mmio_addr;

	vm_paddr_t pgd;

	vm_vaddr_t handlers;

	uint32_t dirty_ring_size;

	uint64_t gpa_tag_mask;



	/*

	 * "mmu" is the guest's stage-1, with a short name because the vast

	 * majority of tests only care about the stage-1 MMU.

	 */

	struct kvm_mmu mmu;

	struct kvm_mmu stage2_mmu;



	struct kvm_vm_arch arch;



	struct kvm_binary_stats stats;

tools/testing/selftests/kvm/include/loongarch/kvm_util_arch.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef SELFTEST_KVM_UTIL_ARCH_H

#define SELFTEST_KVM_UTIL_ARCH_H



struct kvm_mmu_arch {};

struct kvm_vm_arch {};



#endif  // SELFTEST_KVM_UTIL_ARCH_H

tools/testing/selftests/kvm/include/riscv/kvm_util_arch.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#ifndef SELFTEST_KVM_UTIL_ARCH_H

#define SELFTEST_KVM_UTIL_ARCH_H



struct kvm_mmu_arch {};

struct kvm_vm_arch {};



#endif  // SELFTEST_KVM_UTIL_ARCH_H