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

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

KVM selftests changes for 6.19:

 - Fix a math goof in mmu_stress_test when running on a single-CPU system/VM.

 - Forcefully override ARCH from x86_64 to x86 to play nice with specifying
   ARCH=x86_64 on the command line.

 - Extend a bunch of nested VMX to validate nested SVM as well.

 - Add support for LA57 in the core VM_MODE_xxx macro, and add a test to
   verify KVM can save/restore nested VMX state when L1 is using 5-level
   paging, but L2 is not.

 - Clean up the guest paging code in anticipation of sharing the core logic for
   nested EPT and nested NPT.
parents e64dcfab d2e50389

tools/testing/selftests/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ ARCH ?= $(SUBARCH) 
ifeq ($(ARCH),$(filter $(ARCH),arm64 s390 riscv x86 x86_64 loongarch))

# Top-level selftests allows ARCH=x86_64 :-(

ifeq ($(ARCH),x86_64)

	ARCH := x86

	override ARCH := x86

endif

include Makefile.kvm

else

tools/testing/selftests/kvm/Makefile.kvm

+5 −3
Original line number Diff line number Diff line
@@ -88,8 +88,12 @@ TEST_GEN_PROGS_x86 += x86/kvm_pv_test 
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_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/platform_info_test

TEST_GEN_PROGS_x86 += x86/pmu_counters_test

TEST_GEN_PROGS_x86 += x86/pmu_event_filter_test
@@ -111,14 +115,12 @@ 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_close_while_nested_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

TEST_GEN_PROGS_x86 += x86/vmx_nested_la57_state_test

TEST_GEN_PROGS_x86 += x86/vmx_set_nested_state_test

TEST_GEN_PROGS_x86 += x86/vmx_tsc_adjust_test

TEST_GEN_PROGS_x86 += x86/vmx_nested_tsc_scaling_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

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

+3 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ enum vm_guest_mode { 
	VM_MODE_P40V48_4K,

	VM_MODE_P40V48_16K,

	VM_MODE_P40V48_64K,

	VM_MODE_PXXV48_4K,	/* For 48bits VA but ANY bits PA */

	VM_MODE_PXXVYY_4K,	/* For 48-bit or 57-bit VA, depending on host support */

	VM_MODE_P47V64_4K,

	VM_MODE_P44V64_4K,

	VM_MODE_P36V48_4K,
@@ -220,7 +220,7 @@ extern enum vm_guest_mode vm_mode_default; 


#elif defined(__x86_64__)



#define VM_MODE_DEFAULT			VM_MODE_PXXV48_4K

#define VM_MODE_DEFAULT			VM_MODE_PXXVYY_4K

#define MIN_PAGE_SHIFT			12U

#define ptes_per_page(page_size)	((page_size) / 8)
@@ -1203,6 +1203,7 @@ void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr); 
static inline void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)

{

	virt_arch_pg_map(vm, vaddr, paddr);

	sparsebit_set(vm->vpages_mapped, vaddr >> vm->page_shift);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -1441,7 +1441,7 @@ enum pg_level { 
	PG_LEVEL_2M,

	PG_LEVEL_1G,

	PG_LEVEL_512G,

	PG_LEVEL_NUM

	PG_LEVEL_256T

};



#define PG_LEVEL_SHIFT(_level) ((_level - 1) * 9 + 12)

tools/testing/selftests/kvm/include/x86/vmx.h

+1 −2
Original line number Diff line number Diff line
@@ -568,8 +568,7 @@ void nested_map_memslot(struct vmx_pages *vmx, struct kvm_vm *vm, 
void nested_identity_map_1g(struct vmx_pages *vmx, struct kvm_vm *vm,

			    uint64_t addr, uint64_t size);

bool kvm_cpu_has_ept(void);

void prepare_eptp(struct vmx_pages *vmx, struct kvm_vm *vm,

		  uint32_t eptp_memslot);

void prepare_eptp(struct vmx_pages *vmx, struct kvm_vm *vm);

void prepare_virtualize_apic_accesses(struct vmx_pages *vmx, struct kvm_vm *vm);



#endif /* SELFTEST_KVM_VMX_H */