Commit f00f519c authored by Yosry Ahmed's avatar Yosry Ahmed Committed by Sean Christopherson
Browse files

KVM: selftests: Use a TDP MMU to share EPT page tables between vCPUs 



prepare_eptp() currently allocates new EPTs for each vCPU.  memstress has
its own hack to share the EPTs between vCPUs.  Currently, there is no
reason to have separate EPTs for each vCPU, and the complexity is
significant.  The only reason it doesn't matter now is because memstress
is the only user with multiple vCPUs.

Add vm_enable_ept() to allocate EPT page tables for an entire VM, and use
it everywhere to replace prepare_eptp().  Drop 'eptp' and 'eptp_hva' from
'struct vmx_pages' as they serve no purpose (e.g. the EPTP can be built
from the PGD), but keep 'eptp_gpa' so that the MMU structure doesn't need
to be passed in along with vmx_pages.  Dynamically allocate the TDP MMU
structure to avoid a cyclical dependency between kvm_util_arch.h and
kvm_util.h.

Remove the workaround in memstress to copy the EPT root between vCPUs
since that's now the default behavior.

Name the MMU tdp_mmu instead of e.g. nested_mmu or nested.mmu to avoid
recreating the same mess that KVM has with respect to "nested" MMUs, e.g.
does nested refer to the stage-2 page tables created by L1, or the stage-1
page tables created by L2?

Signed-off-by: default avatarYosry Ahmed <yosry.ahmed@linux.dev>
Co-developed-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://patch.msgid.link/20251230230150.4150236-11-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 6dd70757

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

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ struct kvm_mmu_arch { 
	struct pte_masks pte_masks;

};



struct kvm_mmu;



struct kvm_vm_arch {

	vm_vaddr_t gdt;

	vm_vaddr_t tss;
@@ -35,6 +37,8 @@ struct kvm_vm_arch { 
	uint64_t s_bit;

	int sev_fd;

	bool is_pt_protected;



	struct kvm_mmu *tdp_mmu;

};



static inline bool __vm_arch_has_protected_memory(struct kvm_vm_arch *arch)

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

+3 −0
Original line number Diff line number Diff line
@@ -1459,6 +1459,9 @@ enum pg_level { 
#define is_huge_pte(mmu, pte)		(!!(*(pte) & PTE_HUGE_MASK(mmu)))

#define is_nx_pte(mmu, pte)		(!!(*(pte) & PTE_NX_MASK(mmu)))



void tdp_mmu_init(struct kvm_vm *vm, int pgtable_levels,

		  struct pte_masks *pte_masks);



void __virt_pg_map(struct kvm_vm *vm, struct kvm_mmu *mmu, uint64_t vaddr,

		   uint64_t paddr,  int level);

void virt_map_level(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,

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

+3 −5
Original line number Diff line number Diff line
@@ -520,13 +520,11 @@ struct vmx_pages { 
	uint64_t vmwrite_gpa;

	void *vmwrite;



	void *eptp_hva;

	uint64_t eptp_gpa;

	void *eptp;



	void *apic_access_hva;

	uint64_t apic_access_gpa;

	void *apic_access;



	uint64_t eptp_gpa;

};



union vmx_basic {
@@ -568,7 +566,7 @@ void tdp_identity_map_default_memslots(struct vmx_pages *vmx, 
void tdp_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);

void vm_enable_ept(struct kvm_vm *vm);

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



#endif /* SELFTEST_KVM_VMX_H */

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

+6 −13
Original line number Diff line number Diff line
@@ -59,12 +59,10 @@ uint64_t memstress_nested_pages(int nr_vcpus) 
	return 513 + 10 * nr_vcpus;

}



void memstress_setup_ept(struct vmx_pages *vmx, struct kvm_vm *vm)

static void memstress_setup_ept_mappings(struct vmx_pages *vmx, struct kvm_vm *vm)

{

	uint64_t start, end;



	prepare_eptp(vmx, vm);



	/*

	 * Identity map the first 4G and the test region with 1G pages so that

	 * KVM can shadow the EPT12 with the maximum huge page size supported
@@ -79,7 +77,7 @@ void memstress_setup_ept(struct vmx_pages *vmx, struct kvm_vm *vm) 


void memstress_setup_nested(struct kvm_vm *vm, int nr_vcpus, struct kvm_vcpu *vcpus[])

{

	struct vmx_pages *vmx, *vmx0 = NULL;

	struct vmx_pages *vmx;

	struct kvm_regs regs;

	vm_vaddr_t vmx_gva;

	int vcpu_id;
@@ -87,18 +85,13 @@ void memstress_setup_nested(struct kvm_vm *vm, int nr_vcpus, struct kvm_vcpu *vc 
	TEST_REQUIRE(kvm_cpu_has(X86_FEATURE_VMX));

	TEST_REQUIRE(kvm_cpu_has_ept());



	vm_enable_ept(vm);

	for (vcpu_id = 0; vcpu_id < nr_vcpus; vcpu_id++) {

		vmx = vcpu_alloc_vmx(vm, &vmx_gva);



		if (vcpu_id == 0) {

			memstress_setup_ept(vmx, vm);

			vmx0 = vmx;

		} else {

			/* Share the same EPT table across all vCPUs. */

			vmx->eptp = vmx0->eptp;

			vmx->eptp_hva = vmx0->eptp_hva;

			vmx->eptp_gpa = vmx0->eptp_gpa;

		}

		/* The EPTs are shared across vCPUs, setup the mappings once */

		if (vcpu_id == 0)

			memstress_setup_ept_mappings(vmx, vm);



		/*

		 * Override the vCPU to run memstress_l1_guest_code() which will

tools/testing/selftests/kvm/lib/x86/processor.c

+9 −0
Original line number Diff line number Diff line
@@ -187,6 +187,15 @@ void virt_arch_pgd_alloc(struct kvm_vm *vm) 
	virt_mmu_init(vm, &vm->mmu, &pte_masks);

}



void tdp_mmu_init(struct kvm_vm *vm, int pgtable_levels,

		  struct pte_masks *pte_masks)

{

	TEST_ASSERT(!vm->arch.tdp_mmu, "TDP MMU already initialized");



	vm->arch.tdp_mmu = calloc(1, sizeof(*vm->arch.tdp_mmu));

	virt_mmu_init(vm, vm->arch.tdp_mmu, pte_masks);

}



static void *virt_get_pte(struct kvm_vm *vm, struct kvm_mmu *mmu,

			  uint64_t *parent_pte, uint64_t vaddr, int level)

{