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

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

KVM selftests changes for 6.12:

 - Fix a goof that caused some Hyper-V tests to be skipped when run on bare
   metal, i.e. NOT in a VM.

 - Add a regression test for KVM's handling of SHUTDOWN for an SEV-ES guest.

 - Explicitly include one-off assets in .gitignore.  Past Sean was completely
   wrong about not being able to detect missing .gitignore entries.

 - Verify userspace single-stepping works when KVM happens to handle a VM-Exit
   in its fastpath.

 - Misc cleanups
parents 41786cc5 c32e0280

tools/testing/selftests/kvm/.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -5,4 +5,7 @@ 
!*.h

!*.S

!*.sh

!.gitignore

!config

!settings

!Makefile

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

+0 −2
Original line number Diff line number Diff line
@@ -428,8 +428,6 @@ const char *vm_guest_mode_string(uint32_t i); 
void kvm_vm_free(struct kvm_vm *vmp);

void kvm_vm_restart(struct kvm_vm *vmp);

void kvm_vm_release(struct kvm_vm *vmp);

int kvm_memcmp_hva_gva(void *hva, struct kvm_vm *vm, const vm_vaddr_t gva,

		       size_t len);

void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename);

int kvm_memfd_alloc(size_t size, bool hugepages);

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

+18 −0
Original line number Diff line number Diff line
@@ -186,6 +186,18 @@ 
#define HV_X64_ENLIGHTENED_VMCS_RECOMMENDED		\

	KVM_X86_CPU_FEATURE(HYPERV_CPUID_ENLIGHTMENT_INFO, 0, EAX, 14)



/* HYPERV_CPUID_NESTED_FEATURES.EAX */

#define HV_X64_NESTED_DIRECT_FLUSH			\

	KVM_X86_CPU_FEATURE(HYPERV_CPUID_NESTED_FEATURES, 0, EAX, 17)

#define HV_X64_NESTED_GUEST_MAPPING_FLUSH		\

	KVM_X86_CPU_FEATURE(HYPERV_CPUID_NESTED_FEATURES, 0, EAX, 18)

#define HV_X64_NESTED_MSR_BITMAP			\

	KVM_X86_CPU_FEATURE(HYPERV_CPUID_NESTED_FEATURES, 0, EAX, 19)



/* HYPERV_CPUID_NESTED_FEATURES.EBX */

#define HV_X64_NESTED_EVMCS1_PERF_GLOBAL_CTRL		\

	KVM_X86_CPU_FEATURE(HYPERV_CPUID_NESTED_FEATURES, 0, EBX, 0)



/* HYPERV_CPUID_SYNDBG_PLATFORM_CAPABILITIES.EAX */

#define HV_X64_SYNDBG_CAP_ALLOW_KERNEL_DEBUGGING	\

	KVM_X86_CPU_FEATURE(HYPERV_CPUID_SYNDBG_PLATFORM_CAPABILITIES, 0, EAX, 1)
@@ -343,4 +355,10 @@ struct hyperv_test_pages *vcpu_alloc_hyperv_test_pages(struct kvm_vm *vm, 
/* HV_X64_MSR_TSC_INVARIANT_CONTROL bits */

#define HV_INVARIANT_TSC_EXPOSED               BIT_ULL(0)



const struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void);

const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu);

void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu);



bool kvm_hv_cpu_has(struct kvm_x86_cpu_feature feature);



#endif /* !SELFTEST_KVM_HYPERV_H */

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

+4 −3
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ extern bool host_cpu_is_intel; 
extern bool host_cpu_is_amd;

extern uint64_t guest_tsc_khz;



#ifndef MAX_NR_CPUID_ENTRIES

#define MAX_NR_CPUID_ENTRIES 100

#endif



/* Forced emulation prefix, used to invoke the emulator unconditionally. */

#define KVM_FEP "ud2; .byte 'k', 'v', 'm';"
@@ -908,8 +912,6 @@ static inline void vcpu_xcrs_set(struct kvm_vcpu *vcpu, struct kvm_xcrs *xcrs) 
const struct kvm_cpuid_entry2 *get_cpuid_entry(const struct kvm_cpuid2 *cpuid,

					       uint32_t function, uint32_t index);

const struct kvm_cpuid2 *kvm_get_supported_cpuid(void);

const struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void);

const struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vcpu *vcpu);



static inline uint32_t kvm_cpu_fms(void)

{
@@ -1009,7 +1011,6 @@ static inline struct kvm_cpuid2 *allocate_kvm_cpuid2(int nr_entries) 
}



void vcpu_init_cpuid(struct kvm_vcpu *vcpu, const struct kvm_cpuid2 *cpuid);

void vcpu_set_hv_cpuid(struct kvm_vcpu *vcpu);



static inline struct kvm_cpuid_entry2 *__vcpu_get_cpuid_entry(struct kvm_vcpu *vcpu,

							      uint32_t function,

tools/testing/selftests/kvm/lib/kvm_util.c

+6 −79
Original line number Diff line number Diff line
@@ -712,16 +712,13 @@ void kvm_vm_release(struct kvm_vm *vmp) 
}



static void __vm_mem_region_delete(struct kvm_vm *vm,

				   struct userspace_mem_region *region,

				   bool unlink)

				   struct userspace_mem_region *region)

{

	int ret;



	if (unlink) {

	rb_erase(&region->gpa_node, &vm->regions.gpa_tree);

	rb_erase(&region->hva_node, &vm->regions.hva_tree);

	hash_del(&region->slot_node);

	}



	region->region.memory_size = 0;

	vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, &region->region);
@@ -762,7 +759,7 @@ void kvm_vm_free(struct kvm_vm *vmp) 


	/* Free userspace_mem_regions. */

	hash_for_each_safe(vmp->regions.slot_hash, ctr, node, region, slot_node)

		__vm_mem_region_delete(vmp, region, false);

		__vm_mem_region_delete(vmp, region);



	/* Free sparsebit arrays. */

	sparsebit_free(&vmp->vpages_valid);
@@ -794,76 +791,6 @@ int kvm_memfd_alloc(size_t size, bool hugepages) 
	return fd;

}



/*

 * Memory Compare, host virtual to guest virtual

 *

 * Input Args:

 *   hva - Starting host virtual address

 *   vm - Virtual Machine

 *   gva - Starting guest virtual address

 *   len - number of bytes to compare

 *

 * Output Args: None

 *

 * Input/Output Args: None

 *

 * Return:

 *   Returns 0 if the bytes starting at hva for a length of len

 *   are equal the guest virtual bytes starting at gva.  Returns

 *   a value < 0, if bytes at hva are less than those at gva.

 *   Otherwise a value > 0 is returned.

 *

 * Compares the bytes starting at the host virtual address hva, for

 * a length of len, to the guest bytes starting at the guest virtual

 * address given by gva.

 */

int kvm_memcmp_hva_gva(void *hva, struct kvm_vm *vm, vm_vaddr_t gva, size_t len)

{

	size_t amt;



	/*

	 * Compare a batch of bytes until either a match is found

	 * or all the bytes have been compared.

	 */

	for (uintptr_t offset = 0; offset < len; offset += amt) {

		uintptr_t ptr1 = (uintptr_t)hva + offset;



		/*

		 * Determine host address for guest virtual address

		 * at offset.

		 */

		uintptr_t ptr2 = (uintptr_t)addr_gva2hva(vm, gva + offset);



		/*

		 * Determine amount to compare on this pass.

		 * Don't allow the comparsion to cross a page boundary.

		 */

		amt = len - offset;

		if ((ptr1 >> vm->page_shift) != ((ptr1 + amt) >> vm->page_shift))

			amt = vm->page_size - (ptr1 % vm->page_size);

		if ((ptr2 >> vm->page_shift) != ((ptr2 + amt) >> vm->page_shift))

			amt = vm->page_size - (ptr2 % vm->page_size);



		assert((ptr1 >> vm->page_shift) == ((ptr1 + amt - 1) >> vm->page_shift));

		assert((ptr2 >> vm->page_shift) == ((ptr2 + amt - 1) >> vm->page_shift));



		/*

		 * Perform the comparison.  If there is a difference

		 * return that result to the caller, otherwise need

		 * to continue on looking for a mismatch.

		 */

		int ret = memcmp((void *)ptr1, (void *)ptr2, amt);

		if (ret != 0)

			return ret;

	}



	/*

	 * No mismatch found.  Let the caller know the two memory

	 * areas are equal.

	 */

	return 0;

}



static void vm_userspace_mem_region_gpa_insert(struct rb_root *gpa_tree,

					       struct userspace_mem_region *region)

{
@@ -1270,7 +1197,7 @@ void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa) 
 */

void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot)

{

	__vm_mem_region_delete(vm, memslot2region(vm, slot), true);

	__vm_mem_region_delete(vm, memslot2region(vm, slot));

}



void vm_guest_mem_fallocate(struct kvm_vm *vm, uint64_t base, uint64_t size,