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

selftests: kvm: add test for dirty logging inside nested guests 



Check that accesses by nested guests are logged according to the
L1 physical addresses rather than L2.

Most of the patch is really adding EPT support to the testing
framework.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1f4e5fc8

tools/testing/selftests/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/smm_test 
TEST_GEN_PROGS_x86_64 += x86_64/state_test

TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test

TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test

TEST_GEN_PROGS_x86_64 += x86_64/vmx_dirty_log_test

TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test

TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test

TEST_GEN_PROGS_x86_64 += clear_dirty_log_test

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

+3 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,9 @@ void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bits); 
#define VMX_BASIC_MEM_TYPE_WB	6LLU

#define VMX_BASIC_INOUT		0x0040000000000000LLU



/* VMX_EPT_VPID_CAP bits */

#define VMX_EPT_VPID_CAP_AD_BITS	(1ULL << 21)



/* MSR_IA32_VMX_MISC bits */

#define MSR_IA32_VMX_MISC_VMWRITE_SHADOW_RO_FIELDS (1ULL << 29)

#define MSR_IA32_VMX_MISC_PREEMPTION_TIMER_SCALE   0x1F

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

+14 −0
Original line number Diff line number Diff line
@@ -569,6 +569,10 @@ struct vmx_pages { 
	void *enlightened_vmcs_hva;

	uint64_t enlightened_vmcs_gpa;

	void *enlightened_vmcs;



	void *eptp_hva;

	uint64_t eptp_gpa;

	void *eptp;

};



struct vmx_pages *vcpu_alloc_vmx(struct kvm_vm *vm, vm_vaddr_t *p_vmx_gva);
@@ -576,4 +580,14 @@ bool prepare_for_vmx_operation(struct vmx_pages *vmx); 
void prepare_vmcs(struct vmx_pages *vmx, void *guest_rip, void *guest_rsp);

bool load_vmcs(struct vmx_pages *vmx);



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

		   uint64_t nested_paddr, uint64_t paddr, uint32_t eptp_memslot);

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

		 uint64_t nested_paddr, uint64_t paddr, uint64_t size,

		 uint32_t eptp_memslot);

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

			uint32_t memslot, uint32_t eptp_memslot);

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

		  uint32_t eptp_memslot);



#endif /* SELFTEST_KVM_VMX_H */

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

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
 *   on error (e.g. currently no memory region using memslot as a KVM

 *   memory slot ID).

 */

static struct userspace_mem_region *

struct userspace_mem_region *

memslot2region(struct kvm_vm *vm, uint32_t memslot)

{

	struct userspace_mem_region *region;

tools/testing/selftests/kvm/lib/kvm_util_internal.h

+3 −0
Original line number Diff line number Diff line
@@ -68,4 +68,7 @@ void virt_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent); 
void regs_dump(FILE *stream, struct kvm_regs *regs, uint8_t indent);

void sregs_dump(FILE *stream, struct kvm_sregs *sregs, uint8_t indent);



struct userspace_mem_region *

memslot2region(struct kvm_vm *vm, uint32_t memslot);



#endif /* SELFTEST_KVM_UTIL_INTERNAL_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE