KVM: selftests: Add x86 mmu_role test and cleanups
Sean Christopherson
reviewercover KVM: selftests: Add x86 mmu_role test and cleanups
The primary intent of this series is to allow x86-64 tests to create arbitrary hugepages and use the new functionality to abuse x86's CPUID APIs to test KVM MMU behavior.
The majority of the prep work refactors the selftests APIs related to memory allocation. The core memory allocation APIs within the selftests don't provide defaults for memslot or min virtual address, which has led to a ridiculous amount of magic and duplicate code. Literally zero tests use non-standard values in a meaningful way, and if a test comes along that has a legitimate use case, it should use lower-level helpers.
Patches 01 and 02 are fixes for bugs found during the refactoring.
As for the mmu_role test itself, the idea is to change the vCPU model while the guest is running (via KVM_SET_CPUID2) to verify that KVM reconfigures its MMUs when the vCPU model is changed. E.g. toggling guest support for 1gb hugepages and changing guest MAXPHYADDR.
Sadly, the test doesn't pass when KVM is using TDP paging (even with all my mmu_role fixes) because KVM doesn't fully support manipulating GBPAGES and MAXPHYADDR (and other CPUID-based properties that affect the MMU) while the guest is running. And practically speaking, KVM will never fully support such behavior becuase (a) there is likely no sane use case,
(b) fixing the issues is very costly (memory consumption), (c) GBPAGES and potentially other features _can't_ be handled correctly due to lack of hardware support, and (d) userspace can workaround all issues simply by deleting a memslot.
All that said, I purposely made the test off-by-default instead of requiring TDP. Partly because detecting whether TDP is enabled is a pain becuase it's per-vendor, but also because running the test with TDP enabled is still interesting to some extent, e.g. the test will fail, but it shouldn't crash KVM, trigger WARNs, etc...
Sean Christopherson (19):
KVM: selftests: Remove errant asm/barrier.h include to fix arm64 build
KVM: selftests: Zero out the correct page in the Hyper-V features test
KVM: selftests: Unconditionally use memslot 0 when loading elf binary
KVM: selftests: Unconditionally use memslot 0 for x86's GDT/TSS setup
KVM: selftests: Use "standard" min virtual address for Hyper-V pages
KVM: selftests: Add helpers to allocate N pages of virtual memory
KVM: selftests: Lower the min virtual address for misc page
allocations
KVM: selftests: Use alloc_page helper for x86-64's GDT/ITD/TSS
allocations
KVM: selftests: Use alloc page helper for xAPIC IPI test
KVM: selftests: Use "standard" min virtual address for CPUID test
alloc
KVM: selftest: Unconditionally use memslot 0 for vaddr allocations
KVM: selftests: Unconditionally use memslot '0' for page table
allocations
KVM: selftests: Unconditionally allocate EPT tables in memslot 0
KVM: selftests: Add wrapper to allocate page table page
KVM: selftests: Rename x86's page table "address" to "pfn"
KVM: selfests: Add PTE helper for x86-64 in preparation for hugepages
KVM: selftests: Genericize upper level page table entry struct
KVM: selftests: Add hugepage support for x86-64
KVM: sefltests: Add x86-64 test to verify MMU reacts to CPUID updates
tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 1 + tools/testing/selftests/kvm/dirty_log_test.c | 5 +- .../selftests/kvm/hardware_disable_test.c | 2 +- .../testing/selftests/kvm/include/kvm_util.h | 18 +- .../selftests/kvm/include/x86_64/processor.h | 11 + .../selftests/kvm/include/x86_64/vmx.h | 10 +- .../selftests/kvm/kvm_page_table_test.c | 2 +- .../selftests/kvm/lib/aarch64/processor.c | 34 +-- .../testing/selftests/kvm/lib/aarch64/ucall.c | 2 +- tools/testing/selftests/kvm/lib/elf.c | 6 +- tools/testing/selftests/kvm/lib/kvm_util.c | 62 ++++- .../selftests/kvm/lib/perf_test_util.c | 2 +- .../selftests/kvm/lib/s390x/processor.c | 17 +- .../selftests/kvm/lib/x86_64/processor.c | 254 ++++++++---------- tools/testing/selftests/kvm/lib/x86_64/svm.c | 9 +- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 52 ++-- .../testing/selftests/kvm/memslot_perf_test.c | 2 +- .../selftests/kvm/set_memory_region_test.c | 2 +- tools/testing/selftests/kvm/steal_time.c | 2 +- .../selftests/kvm/x86_64/get_cpuid_test.c | 3 +- .../selftests/kvm/x86_64/hyperv_clock.c | 2 +- .../selftests/kvm/x86_64/hyperv_features.c | 8 +- .../selftests/kvm/x86_64/mmu_role_test.c | 147 ++++++++++ .../selftests/kvm/x86_64/set_boot_cpu_id.c | 2 +- .../kvm/x86_64/vmx_apic_access_test.c | 2 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 8 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 4 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 2 +- .../selftests/kvm/x86_64/xen_vmcall_test.c | 2 +- 30 files changed, 414 insertions(+), 260 deletions(-) create mode 100644 tools/testing/selftests/kvm/x86_64/mmu_role_test.c
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 1/19 KVM: selftests: Remove errant asm/barrier.h include to fix arm64 build
Drop an unnecessary include of asm/barrier.h from dirty_log_test.c to allow the test to build on arm64. arm64, s390, and x86 all build cleanly without the include (PPC and MIPS aren't supported in KVM's selftests).
arm64's barrier.h includes linux/kasan-checks.h, which is not copied into tools/.
In file included from ../../../../tools/include/asm/barrier.h:8,
from dirty_log_test.c:19:
.../arm64/include/asm/barrier.h:12:10: fatal error: linux/kasan-checks.h: No such file or directory 12 | #include <linux/kasan-checks.h>
| ^~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
--- tools/testing/selftests/kvm/dirty_log_test.c | 1 - 1 file changed, 1 deletion(-)
tools/testing/selftests/kvm/dirty_log_test.c +0 -1
@@ -16,7 +16,6 @@#include <errno.h> #include <linux/bitmap.h> #include <linux/bitops.h> -#include <asm/barrier.h> #include <linux/atomic.h> #include "kvm_util.h"
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 2/19 KVM: selftests: Zero out the correct page in the Hyper-V features test
In reply to Sean ChristophersonFix an apparent copy-paste goof in hyperv_features where hcall_page (which is two pages, so technically just the first page) gets zeroed twice, and hcall_params gets zeroed none times.
--- tools/testing/selftests/kvm/x86_64/hyperv_features.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/x86_64/hyperv_features.c +1 -1
@@ -630,7 +630,7 @@ int main(void)memset (addr_gva2hva (vm, hcall_page),0x0 ,2 *getpagesize ()); hcall_params =vm_vaddr_alloc (vm,getpagesize (),0x20000 ,0 ,0 ); -memset (addr_gva2hva (vm, hcall_page),0x0 ,getpagesize ()); +memset (addr_gva2hva (vm, hcall_params),0x0 ,getpagesize ());vcpu_args_set (vm,VCPU_ID ,2 ,addr_gva2gpa (vm, hcall_page), hcall_params);vcpu_enable_cap (vm,VCPU_ID , &cap);
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 3/19 KVM: selftests: Unconditionally use memslot 0 when loading elf binary
In reply to Sean ChristophersonUse memslot '0' for all vm_vaddr_alloc() calls when loading the test binary. This is the first step toward adding a helper to handle page allocations with a default value for the target memslot.
No functional change intended.
--- tools/testing/selftests/kvm/dirty_log_test.c | 2 +- tools/testing/selftests/kvm/hardware_disable_test.c | 2 +- tools/testing/selftests/kvm/include/kvm_util.h | 3 +-- tools/testing/selftests/kvm/lib/elf.c | 6 ++---- tools/testing/selftests/kvm/lib/kvm_util.c | 2 +- tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/dirty_log_test.c +1 -1
@@ -680,7 +680,7 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, uint32_t vcpuid,pr_info ("Testing guest mode: %s\n" ,vm_guest_mode_string (mode)); vm =vm_create (mode,DEFAULT_GUEST_PHY_PAGES + extra_pg_pages,O_RDWR ); -kvm_vm_elf_load (vm, program_invocation_name,0 ,0 ); +kvm_vm_elf_load (vm, program_invocation_name);#ifdef __x86_64__vm_create_irqchip (vm);#endif
tools/testing/selftests/kvm/hardware_disable_test.c +1 -1
@@ -105,7 +105,7 @@ static void run_test(uint32_t run)CPU_SET (i, &cpu_set); vm =vm_create (VM_MODE_DEFAULT ,DEFAULT_GUEST_PHY_PAGES ,O_RDWR ); -kvm_vm_elf_load (vm, program_invocation_name,0 ,0 ); +kvm_vm_elf_load (vm, program_invocation_name);vm_create_irqchip (vm);pr_debug ("%s: [%d] start vcpus\n" , __func__, run);
tools/testing/selftests/kvm/include/kvm_util.h +1 -2
@@ -98,8 +98,7 @@ uint32_t kvm_vm_reset_dirty_ring(struct kvm_vm *vm);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, -uint32_t data_memslot,uint32_t pgd_memslot); +void kvm_vm_elf_load (struct kvm_vm *vm,const char *filename);void vm_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent);
tools/testing/selftests/kvm/lib/elf.c +2 -4
@@ -111,8 +111,7 @@ static void elfhdr_get(const char *filename, Elf64_Ehdr *hdrp)* by the image and it needs to have sufficient available physical pages, to * back the virtual pages used to load the image. */ -void kvm_vm_elf_load (struct kvm_vm *vm,const char *filename, -uint32_t data_memslot,uint32_t pgd_memslot) +void kvm_vm_elf_load (struct kvm_vm *vm,const char *filename) {off_t offset, offset_rv;Elf64_Ehdr hdr;
@@ -164,8 +163,7 @@ void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename, seg_vend |= vm->page_size -1 ;size_t seg_size = seg_vend - seg_vstart +1 ; -vm_vaddr_t vaddr =vm_vaddr_alloc (vm, seg_size, seg_vstart, - data_memslot, pgd_memslot); +vm_vaddr_t vaddr =vm_vaddr_alloc (vm, seg_size, seg_vstart,0 ,0 );TEST_ASSERT (vaddr == seg_vstart,"Unable to allocate " "virtual memory for segment at requested min addr,\n" " segment idx: %u\n"
tools/testing/selftests/kvm/lib/kvm_util.c +1 -1
@@ -365,7 +365,7 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus, pages =vm_adjust_num_guest_pages (mode, pages); vm =vm_create (mode, pages,O_RDWR ); -kvm_vm_elf_load (vm, program_invocation_name,0 ,0 ); +kvm_vm_elf_load (vm, program_invocation_name);#ifdef __x86_64__vm_create_irqchip (vm);
tools/testing/selftests/kvm/x86_64/set_boot_cpu_id.c +1 -1
@@ -90,7 +90,7 @@ static struct kvm_vm *create_vm(void) pages =vm_adjust_num_guest_pages (VM_MODE_DEFAULT , pages); vm =vm_create (VM_MODE_DEFAULT , pages,O_RDWR ); -kvm_vm_elf_load (vm, program_invocation_name,0 ,0 ); +kvm_vm_elf_load (vm, program_invocation_name);vm_create_irqchip (vm);return vm;
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 4/19 KVM: selftests: Unconditionally use memslot 0 for x86's GDT/TSS setup
In reply to Sean ChristophersonRefactor x86's GDT/TSS allocations to for memslot '0' at its vm_addr_alloc() call sites instead of passing in '0' from on high. This is a step toward using a common helper for allocating pages.
No functional change intended.
--- .../selftests/kvm/lib/x86_64/processor.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
tools/testing/selftests/kvm/lib/x86_64/processor.c +8 -10
@@ -518,24 +518,22 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)exit (EXIT_FAILURE ); } -static void kvm_setup_gdt (struct kvm_vm *vm,struct kvm_dtable *dt,int gdt_memslot, -int pgd_memslot) +static void kvm_setup_gdt (struct kvm_vm *vm,struct kvm_dtable *dt) {if (!vm->gdt) vm->gdt =vm_vaddr_alloc (vm,getpagesize (), -KVM_UTIL_MIN_VADDR , gdt_memslot, pgd_memslot); +KVM_UTIL_MIN_VADDR ,0 ,0 ); dt->base = vm->gdt; dt->limit =getpagesize (); }static void kvm_setup_tss_64bit (struct kvm_vm *vm,struct kvm_segment *segp, -int selector,int gdt_memslot, -int pgd_memslot) +int selector) {if (!vm->tss) vm->tss =vm_vaddr_alloc (vm,getpagesize (), -KVM_UTIL_MIN_VADDR , gdt_memslot, pgd_memslot); +KVM_UTIL_MIN_VADDR ,0 ,0 );memset (segp,0 ,sizeof (*segp)); segp->base = vm->tss;
@@ -546,7 +544,7 @@ static void kvm_setup_tss_64bit(struct kvm_vm *vm, struct kvm_segment *segp,kvm_seg_fill_gdt_64bit (vm, segp); } -static void vcpu_setup (struct kvm_vm *vm,int vcpuid,int pgd_memslot,int gdt_memslot) +static void vcpu_setup (struct kvm_vm *vm,int vcpuid) {struct kvm_sregs sregs;
@@ -555,7 +553,7 @@ static void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot, int gdt_m sregs.idt.limit =0 ; -kvm_setup_gdt (vm, &sregs.gdt, gdt_memslot, pgd_memslot); +kvm_setup_gdt (vm, &sregs.gdt);switch (vm->mode) {case VM_MODE_PXXV48_4K :
@@ -567,7 +565,7 @@ static void vcpu_setup(struct kvm_vm *vm, int vcpuid, int pgd_memslot, int gdt_mkvm_seg_set_kernel_code_64bit (vm,DEFAULT_CODE_SELECTOR , &sregs.cs);kvm_seg_set_kernel_data_64bit (vm,DEFAULT_DATA_SELECTOR , &sregs.ds);kvm_seg_set_kernel_data_64bit (vm,DEFAULT_DATA_SELECTOR , &sregs.es); -kvm_setup_tss_64bit (vm, &sregs.tr,0x18 , gdt_memslot, pgd_memslot); +kvm_setup_tss_64bit (vm, &sregs.tr,0x18 );break ;default :
@@ -588,7 +586,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)/* Create VCPU */ vm_vcpu_add (vm, vcpuid); -vcpu_setup (vm, vcpuid,0 ,0 ); +vcpu_setup (vm, vcpuid);/* Setup guest general purpose registers */ vcpu_regs_get (vm, vcpuid, ®s);
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 5/19 KVM: selftests: Use "standard" min virtual address for Hyper-V pages
In reply to Sean ChristophersonUse the de facto standard minimum virtual address for Hyper-V's hcall params page. It's the allocator's job to not double-allocate memory, i.e. there's no reason to force different regions for the params vs. hcall page. This will allow adding a page allocation helper with a "standard" minimum address.
--- tools/testing/selftests/kvm/x86_64/hyperv_features.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/x86_64/hyperv_features.c +1 -1
@@ -629,7 +629,7 @@ int main(void) hcall_page =vm_vaddr_alloc (vm,2 *getpagesize (),0x10000 ,0 ,0 );memset (addr_gva2hva (vm, hcall_page),0x0 ,2 *getpagesize ()); - hcall_params =vm_vaddr_alloc (vm,getpagesize (),0x20000 ,0 ,0 ); + hcall_params =vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 );memset (addr_gva2hva (vm, hcall_params),0x0 ,getpagesize ());vcpu_args_set (vm,VCPU_ID ,2 ,addr_gva2gpa (vm, hcall_page), hcall_params);
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 7/19 KVM: selftests: Lower the min virtual address for misc page allocations
In reply to Sean ChristophersonReduce the minimum virtual address of page allocations from 0x10000 to KVM_UTIL_MIN_VADDR (0x2000). Both values appear to be completely arbitrary, and reducing the min to KVM_UTIL_MIN_VADDR will allow for additional consolidation of code.
--- tools/testing/selftests/kvm/lib/kvm_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/lib/kvm_util.c +1 -1
@@ -1296,7 +1296,7 @@ vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,*/ vm_vaddr_t vm_vaddr_alloc_pages (struct kvm_vm *vm,int nr_pages) { -return vm_vaddr_alloc (vm, nr_pages *getpagesize (),0x10000 ,0 ,0 ); +return vm_vaddr_alloc (vm, nr_pages *getpagesize (),KVM_UTIL_MIN_VADDR ,0 ,0 ); }/*
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 6/19 KVM: selftests: Add helpers to allocate N pages of virtual memory
In reply to Sean ChristophersonAdd wrappers to allocate 1 and N pages of memory using de facto standard values as the defaults for minimum virtual address, data memslot, and page table memslot. Convert all compatible users.
No functional change intended.
--- .../testing/selftests/kvm/include/kvm_util.h | 3 ++ tools/testing/selftests/kvm/lib/kvm_util.c | 38 +++++++++++++++++++ tools/testing/selftests/kvm/lib/x86_64/svm.c | 9 ++--- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 25 ++++++------ .../selftests/kvm/x86_64/hyperv_clock.c | 2 +- .../selftests/kvm/x86_64/hyperv_features.c | 6 +-- 6 files changed, 59 insertions(+), 24 deletions(-)
tools/testing/selftests/kvm/include/kvm_util.h +3 -0
@@ -142,6 +142,9 @@ void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot);void vm_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid);vm_vaddr_t vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min,uint32_t data_memslot,uint32_t pgd_memslot); +vm_vaddr_t vm_vaddr_alloc_pages (struct kvm_vm *vm,int nr_pages); +vm_vaddr_t vm_vaddr_alloc_page (struct kvm_vm *vm); +void virt_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr,unsigned int npages,uint32_t pgd_memslot);void *addr_gpa2hva (struct kvm_vm *vm,vm_paddr_t gpa);
tools/testing/selftests/kvm/lib/kvm_util.c +38 -0
@@ -1280,6 +1280,44 @@ vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,return vaddr_start; } +/* +* VM Virtual Address Allocate Pages +* +* Input Args: +* vm - Virtual Machine +* +* Output Args: None +* +* Return: +* Starting guest virtual address +* +* Allocates at least N system pages worth of bytes within the virtual address +* space of the vm. +*/ +vm_vaddr_t vm_vaddr_alloc_pages (struct kvm_vm *vm,int nr_pages) +{ +return vm_vaddr_alloc (vm, nr_pages *getpagesize (),0x10000 ,0 ,0 ); +} + +/* +* VM Virtual Address Allocate Page +* +* Input Args: +* vm - Virtual Machine +* +* Output Args: None +* +* Return: +* Starting guest virtual address +* +* Allocates at least one system page worth of bytes within the virtual address +* space of the vm. +*/ +vm_vaddr_t vm_vaddr_alloc_page (struct kvm_vm *vm) +{ +return vm_vaddr_alloc_pages (vm,1 ); +} +/* * Map a range of VM virtual address to the VM's physical address *
tools/testing/selftests/kvm/lib/x86_64/svm.c +3 -6
@@ -30,17 +30,14 @@ u64 rflags;struct svm_test_data *vcpu_alloc_svm (struct kvm_vm *vm,vm_vaddr_t *p_svm_gva) { -vm_vaddr_t svm_gva =vm_vaddr_alloc (vm,getpagesize (), -0x10000 ,0 ,0 ); +vm_vaddr_t svm_gva =vm_vaddr_alloc_page (vm);struct svm_test_data *svm =addr_gva2hva (vm, svm_gva); - svm->vmcb = (void *)vm_vaddr_alloc (vm,getpagesize (), -0x10000 ,0 ,0 ); + svm->vmcb = (void *)vm_vaddr_alloc_page (vm); svm->vmcb_hva =addr_gva2hva (vm, (uintptr_t )svm->vmcb); svm->vmcb_gpa =addr_gva2gpa (vm, (uintptr_t )svm->vmcb); - svm->save_area = (void *)vm_vaddr_alloc (vm,getpagesize (), -0x10000 ,0 ,0 ); + svm->save_area = (void *)vm_vaddr_alloc_page (vm); svm->save_area_hva =addr_gva2hva (vm, (uintptr_t )svm->save_area); svm->save_area_gpa =addr_gva2gpa (vm, (uintptr_t )svm->save_area);
tools/testing/selftests/kvm/lib/x86_64/vmx.c +11 -14
@@ -77,50 +77,48 @@ int vcpu_enable_evmcs(struct kvm_vm *vm, int vcpu_id)struct vmx_pages *vcpu_alloc_vmx (struct kvm_vm *vm,vm_vaddr_t *p_vmx_gva) { -vm_vaddr_t vmx_gva =vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); +vm_vaddr_t vmx_gva =vm_vaddr_alloc_page (vm);struct vmx_pages *vmx =addr_gva2hva (vm, vmx_gva);/* Setup of a region of guest memory for the vmxon region. */ - vmx->vmxon = (void *)vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); + vmx->vmxon = (void *)vm_vaddr_alloc_page (vm); vmx->vmxon_hva =addr_gva2hva (vm, (uintptr_t )vmx->vmxon); vmx->vmxon_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->vmxon);/* Setup of a region of guest memory for a vmcs. */ - vmx->vmcs = (void *)vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); + vmx->vmcs = (void *)vm_vaddr_alloc_page (vm); vmx->vmcs_hva =addr_gva2hva (vm, (uintptr_t )vmx->vmcs); vmx->vmcs_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->vmcs);/* Setup of a region of guest memory for the MSR bitmap. */ - vmx->msr = (void *)vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); + vmx->msr = (void *)vm_vaddr_alloc_page (vm); vmx->msr_hva =addr_gva2hva (vm, (uintptr_t )vmx->msr); vmx->msr_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->msr);memset (vmx->msr_hva,0 ,getpagesize ());/* Setup of a region of guest memory for the shadow VMCS. */ - vmx->shadow_vmcs = (void *)vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); + vmx->shadow_vmcs = (void *)vm_vaddr_alloc_page (vm); vmx->shadow_vmcs_hva =addr_gva2hva (vm, (uintptr_t )vmx->shadow_vmcs); vmx->shadow_vmcs_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->shadow_vmcs);/* Setup of a region of guest memory for the VMREAD and VMWRITE bitmaps. */ - vmx->vmread = (void *)vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); + vmx->vmread = (void *)vm_vaddr_alloc_page (vm); vmx->vmread_hva =addr_gva2hva (vm, (uintptr_t )vmx->vmread); vmx->vmread_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->vmread);memset (vmx->vmread_hva,0 ,getpagesize ()); - vmx->vmwrite = (void *)vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); + vmx->vmwrite = (void *)vm_vaddr_alloc_page (vm); vmx->vmwrite_hva =addr_gva2hva (vm, (uintptr_t )vmx->vmwrite); vmx->vmwrite_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->vmwrite);memset (vmx->vmwrite_hva,0 ,getpagesize ());/* Setup of a region of guest memory for the VP Assist page. */ - vmx->vp_assist = (void *)vm_vaddr_alloc (vm,getpagesize (), -0x10000 ,0 ,0 ); + vmx->vp_assist = (void *)vm_vaddr_alloc_page (vm); vmx->vp_assist_hva =addr_gva2hva (vm, (uintptr_t )vmx->vp_assist); vmx->vp_assist_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->vp_assist);/* Setup of a region of guest memory for the enlightened VMCS. */ - vmx->enlightened_vmcs = (void *)vm_vaddr_alloc (vm,getpagesize (), -0x10000 ,0 ,0 ); + vmx->enlightened_vmcs = (void *)vm_vaddr_alloc_page (vm); vmx->enlightened_vmcs_hva =addr_gva2hva (vm, (uintptr_t )vmx->enlightened_vmcs); vmx->enlightened_vmcs_gpa =
@@ -538,7 +536,7 @@ void nested_map_memslot(struct vmx_pages *vmx, struct kvm_vm *vm,void prepare_eptp (struct vmx_pages *vmx,struct kvm_vm *vm,uint32_t eptp_memslot) { - vmx->eptp = (void *)vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); + vmx->eptp = (void *)vm_vaddr_alloc_page (vm); vmx->eptp_hva =addr_gva2hva (vm, (uintptr_t )vmx->eptp); vmx->eptp_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->eptp); }
@@ -546,8 +544,7 @@ void prepare_eptp(struct vmx_pages *vmx, struct kvm_vm *vm,void prepare_virtualize_apic_accesses (struct vmx_pages *vmx,struct kvm_vm *vm,uint32_t eptp_memslot) { - vmx->apic_access = (void *)vm_vaddr_alloc (vm,getpagesize (), -0x10000 ,0 ,0 ); + vmx->apic_access = (void *)vm_vaddr_alloc_page (vm); vmx->apic_access_hva =addr_gva2hva (vm, (uintptr_t )vmx->apic_access); vmx->apic_access_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->apic_access); }
tools/testing/selftests/kvm/x86_64/hyperv_clock.c +1 -1
@@ -214,7 +214,7 @@ int main(void)vcpu_set_hv_cpuid (vm,VCPU_ID ); - tsc_page_gva =vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); + tsc_page_gva =vm_vaddr_alloc_page (vm);memset (addr_gpa2hva (vm, tsc_page_gva),0x0 ,getpagesize ());TEST_ASSERT ((addr_gva2gpa (vm, tsc_page_gva) & (getpagesize () -1 )) ==0 ,"TSC page has to be page aligned\n" );
tools/testing/selftests/kvm/x86_64/hyperv_features.c +3 -3
@@ -604,7 +604,7 @@ int main(void)/* Test MSRs */ vm =vm_create_default (VCPU_ID ,0 , guest_msr); - msr_gva =vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); + msr_gva =vm_vaddr_alloc_page (vm);memset (addr_gva2hva (vm, msr_gva),0x0 ,getpagesize ());vcpu_args_set (vm,VCPU_ID ,1 , msr_gva);vcpu_enable_cap (vm,VCPU_ID , &cap);
@@ -626,10 +626,10 @@ int main(void) vm =vm_create_default (VCPU_ID ,0 , guest_hcall);/* Hypercall input/output */ - hcall_page =vm_vaddr_alloc (vm,2 *getpagesize (),0x10000 ,0 ,0 ); + hcall_page =vm_vaddr_alloc_pages (vm,2 );memset (addr_gva2hva (vm, hcall_page),0x0 ,2 *getpagesize ()); - hcall_params =vm_vaddr_alloc (vm,getpagesize (),0x10000 ,0 ,0 ); + hcall_params =vm_vaddr_alloc_page (vm);memset (addr_gva2hva (vm, hcall_params),0x0 ,getpagesize ());vcpu_args_set (vm,VCPU_ID ,2 ,addr_gva2gpa (vm, hcall_page), hcall_params);
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 8/19 KVM: selftests: Use alloc_page helper for x86-64's GDT/ITD/TSS allocations
In reply to Sean ChristophersonSwitch to the vm_vaddr_alloc_page() helper for x86-64's "kernel" allocations now that the helper uses the same min virtual address as the open coded versions.
No functional change intended.
--- tools/testing/selftests/kvm/lib/x86_64/processor.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/lib/x86_64/processor.c +4 -6
@@ -521,8 +521,7 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)static void kvm_setup_gdt (struct kvm_vm *vm,struct kvm_dtable *dt) {if (!vm->gdt) - vm->gdt =vm_vaddr_alloc (vm,getpagesize (), -KVM_UTIL_MIN_VADDR ,0 ,0 ); + vm->gdt =vm_vaddr_alloc_page (vm); dt->base = vm->gdt; dt->limit =getpagesize ();
@@ -532,8 +531,7 @@ static void kvm_setup_tss_64bit(struct kvm_vm *vm, struct kvm_segment *segp, int selector) {if (!vm->tss) - vm->tss =vm_vaddr_alloc (vm,getpagesize (), -KVM_UTIL_MIN_VADDR ,0 ,0 ); + vm->tss =vm_vaddr_alloc_page (vm);memset (segp,0 ,sizeof (*segp)); segp->base = vm->tss;
@@ -1220,8 +1218,8 @@ void vm_init_descriptor_tables(struct kvm_vm *vm)extern void *idt_handlers;int i; - vm->idt =vm_vaddr_alloc (vm,getpagesize (),0x2000 ,0 ,0 ); - vm->handlers =vm_vaddr_alloc (vm,256 *sizeof (void *),0x2000 ,0 ,0 ); + vm->idt =vm_vaddr_alloc_page (vm); + vm->handlers =vm_vaddr_alloc_page (vm);/* Handlers have the same address in both address spaces.*/ for (i =0 ; i <NUM_INTERRUPTS ; i++) set_idt_entry(vm, i, (unsigned long)(&idt_handlers)[i], 0,
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 9/19 KVM: selftests: Use alloc page helper for xAPIC IPI test
In reply to Sean ChristophersonUse the common page allocation helper for the xAPIC IPI test, effectively raising the minimum virtual address from 0x1000 to 0x2000. Presumably the test won't explode if it can't get a page at address 0x1000...
--- tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c +1 -1
@@ -427,7 +427,7 @@ int main(int argc, char *argv[])vm_vcpu_add_default (vm,SENDER_VCPU_ID , sender_guest_code); - test_data_page_vaddr =vm_vaddr_alloc (vm,0x1000 ,0x1000 ,0 ,0 ); + test_data_page_vaddr =vm_vaddr_alloc_page (vm); data = (struct test_data_page *)addr_gva2hva (vm, test_data_page_vaddr);memset (data,0 ,sizeof (*data));
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 11/19 KVM: selftest: Unconditionally use memslot 0 for vaddr allocations
In reply to Sean ChristophersonDrop the memslot param(s) from vm_vaddr_alloc() now that all callers directly specific '0' as the memslot. Drop the memslot param from virt_pgd_alloc() as well since vm_vaddr_alloc() is its only user. I.e. shove the hardcoded '0' down to the vm_phy_pages_alloc() calls.
No functional change intended.
--- tools/testing/selftests/kvm/include/kvm_util.h | 5 ++--- tools/testing/selftests/kvm/lib/aarch64/processor.c | 6 +++--- tools/testing/selftests/kvm/lib/elf.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 12 +++++------- tools/testing/selftests/kvm/lib/s390x/processor.c | 6 +++--- tools/testing/selftests/kvm/lib/x86_64/processor.c | 6 +++--- tools/testing/selftests/kvm/x86_64/get_cpuid_test.c | 2 +- 7 files changed, 18 insertions(+), 21 deletions(-)
tools/testing/selftests/kvm/include/kvm_util.h +2 -3
@@ -140,8 +140,7 @@ void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags);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);void vm_vcpu_add (struct kvm_vm *vm,uint32_t vcpuid); -vm_vaddr_t vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min, -uint32_t data_memslot,uint32_t pgd_memslot); +vm_vaddr_t vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min);vm_vaddr_t vm_vaddr_alloc_pages (struct kvm_vm *vm,int nr_pages);vm_vaddr_t vm_vaddr_alloc_page (struct kvm_vm *vm);
@@ -239,7 +238,7 @@ int kvm_device_access(int dev_fd, uint32_t group, uint64_t attr,const char *exit_reason_str (unsigned int exit_reason); -void virt_pgd_alloc (struct kvm_vm *vm,uint32_t pgd_memslot); +void virt_pgd_alloc (struct kvm_vm *vm);/* * VM Virtual Page Map
tools/testing/selftests/kvm/lib/aarch64/processor.c +3 -3
@@ -72,12 +72,12 @@ static uint64_t __maybe_unused ptrs_per_pte(struct kvm_vm *vm)return 1 << (vm->page_shift -3 ); } -void virt_pgd_alloc (struct kvm_vm *vm,uint32_t pgd_memslot) +void virt_pgd_alloc (struct kvm_vm *vm) {if (!vm->pgd_created) {vm_paddr_t paddr =vm_phy_pages_alloc (vm,page_align (vm,ptrs_per_pgd (vm) *8 ) / vm->page_size, -KVM_GUEST_PAGE_TABLE_MIN_PADDR , pgd_memslot); +KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); vm->pgd = paddr; vm->pgd_created = true; }
@@ -302,7 +302,7 @@ void aarch64_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, DEFAULT_STACK_PGS * vm->page_size : vm->page_size;uint64_t stack_vaddr =vm_vaddr_alloc (vm, stack_size, -DEFAULT_ARM64_GUEST_STACK_VADDR_MIN ,0 ,0 ); +DEFAULT_ARM64_GUEST_STACK_VADDR_MIN );vm_vcpu_add (vm, vcpuid);aarch64_vcpu_setup (vm, vcpuid, init);
tools/testing/selftests/kvm/lib/elf.c +1 -1
@@ -163,7 +163,7 @@ void kvm_vm_elf_load(struct kvm_vm *vm, const char *filename) seg_vend |= vm->page_size -1 ;size_t seg_size = seg_vend - seg_vstart +1 ; -vm_vaddr_t vaddr =vm_vaddr_alloc (vm, seg_size, seg_vstart,0 ,0 ); +vm_vaddr_t vaddr =vm_vaddr_alloc (vm, seg_size, seg_vstart);TEST_ASSERT (vaddr == seg_vstart,"Unable to allocate " "virtual memory for segment at requested min addr,\n" " segment idx: %u\n"
tools/testing/selftests/kvm/lib/kvm_util.c +5 -7
@@ -1251,15 +1251,13 @@ static vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz,* a unique set of pages, with the minimum real allocation being at least * a page. */ -vm_vaddr_t vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min, -uint32_t data_memslot,uint32_t pgd_memslot) +vm_vaddr_t vm_vaddr_alloc (struct kvm_vm *vm,size_t sz,vm_vaddr_t vaddr_min) {uint64_t pages = (sz >> vm->page_shift) + ((sz % vm->page_size) !=0 ); -virt_pgd_alloc (vm, pgd_memslot); +virt_pgd_alloc (vm);vm_paddr_t paddr =vm_phy_pages_alloc (vm, pages, -KVM_UTIL_MIN_PFN * vm->page_size, - data_memslot); +KVM_UTIL_MIN_PFN * vm->page_size,0 );/* * Find an unused range of virtual page addresses of at least
@@ -1271,7 +1269,7 @@ vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,for (vm_vaddr_t vaddr = vaddr_start; pages >0 ; pages--, vaddr += vm->page_size, paddr += vm->page_size) { -virt_pg_map (vm, vaddr, paddr, pgd_memslot); +virt_pg_map (vm, vaddr, paddr,0 );sparsebit_set (vm->vpages_mapped, vaddr >> vm->page_shift);
@@ -1296,7 +1294,7 @@ vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,*/ vm_vaddr_t vm_vaddr_alloc_pages (struct kvm_vm *vm,int nr_pages) { -return vm_vaddr_alloc (vm, nr_pages *getpagesize (),KVM_UTIL_MIN_VADDR ,0 ,0 ); +return vm_vaddr_alloc (vm, nr_pages *getpagesize (),KVM_UTIL_MIN_VADDR ); }/*
tools/testing/selftests/kvm/lib/s390x/processor.c +3 -3
@@ -13,7 +13,7 @@#define PAGES_PER_REGION 4 -void virt_pgd_alloc (struct kvm_vm *vm,uint32_t memslot) +void virt_pgd_alloc (struct kvm_vm *vm) {vm_paddr_t paddr;
@@ -24,7 +24,7 @@ void virt_pgd_alloc(struct kvm_vm *vm, uint32_t memslot)return ; paddr =vm_phy_pages_alloc (vm,PAGES_PER_REGION , -KVM_GUEST_PAGE_TABLE_MIN_PADDR , memslot); +KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 );memset (addr_gpa2hva (vm, paddr),0xff ,PAGES_PER_REGION * vm->page_size); vm->pgd = paddr;
@@ -170,7 +170,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code) vm->page_size); stack_vaddr =vm_vaddr_alloc (vm, stack_size, -DEFAULT_GUEST_STACK_VADDR_MIN ,0 ,0 ); +DEFAULT_GUEST_STACK_VADDR_MIN );vm_vcpu_add (vm, vcpuid);
tools/testing/selftests/kvm/lib/x86_64/processor.c +3 -3
@@ -207,7 +207,7 @@ void sregs_dump(FILE *stream, struct kvm_sregs *sregs, } } -void virt_pgd_alloc (struct kvm_vm *vm,uint32_t pgd_memslot) +void virt_pgd_alloc (struct kvm_vm *vm) {TEST_ASSERT (vm->mode ==VM_MODE_PXXV48_4K ,"Attempt to use " "unknown or unsupported guest mode, mode: 0x%x" , vm->mode);
@@ -215,7 +215,7 @@ void virt_pgd_alloc(struct kvm_vm *vm, uint32_t pgd_memslot)/* If needed, create page map l4 table. */ if (!vm->pgd_created) {vm_paddr_t paddr =vm_phy_page_alloc (vm, -KVM_GUEST_PAGE_TABLE_MIN_PADDR , pgd_memslot); +KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); vm->pgd = paddr; vm->pgd_created = true; }
@@ -580,7 +580,7 @@ void vm_vcpu_add_default(struct kvm_vm *vm, uint32_t vcpuid, void *guest_code)struct kvm_regs regs;vm_vaddr_t stack_vaddr; stack_vaddr =vm_vaddr_alloc (vm,DEFAULT_STACK_PGS *getpagesize (), -DEFAULT_GUEST_STACK_VADDR_MIN ,0 ,0 ); +DEFAULT_GUEST_STACK_VADDR_MIN );/* Create VCPU */ vm_vcpu_add (vm, vcpuid);
tools/testing/selftests/kvm/x86_64/get_cpuid_test.c +1 -1
@@ -145,7 +145,7 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpuid, int stage)struct kvm_cpuid2 *vcpu_alloc_cpuid (struct kvm_vm *vm,vm_vaddr_t *p_gva,struct kvm_cpuid2 *cpuid) {int size =sizeof (*cpuid) + cpuid->nent *sizeof (cpuid->entries[0 ]); -vm_vaddr_t gva =vm_vaddr_alloc (vm, size,KVM_UTIL_MIN_VADDR ,0 ,0 ); +vm_vaddr_t gva =vm_vaddr_alloc (vm, size,KVM_UTIL_MIN_VADDR );struct kvm_cpuid2 *guest_cpuids =addr_gva2hva (vm, gva);memcpy (guest_cpuids, cpuid, size);
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 10/19 KVM: selftests: Use "standard" min virtual address for CPUID test alloc
In reply to Sean ChristophersonUse KVM_UTIL_MIN_ADDR as the minimum for x86-64's CPUID array. The system page size was likely used as the minimum because _something_ had to be provided. Increasing the min from 0x1000 to 0x2000 should have no meaningful impact on the test, and will allow changing vm_vaddr_alloc() to use KVM_UTIL_MIN_VADDR as the default.
--- tools/testing/selftests/kvm/x86_64/get_cpuid_test.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/testing/selftests/kvm/x86_64/get_cpuid_test.c +1 -2
@@ -145,8 +145,7 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpuid, int stage)struct kvm_cpuid2 *vcpu_alloc_cpuid (struct kvm_vm *vm,vm_vaddr_t *p_gva,struct kvm_cpuid2 *cpuid) {int size =sizeof (*cpuid) + cpuid->nent *sizeof (cpuid->entries[0 ]); -vm_vaddr_t gva =vm_vaddr_alloc (vm, size, -getpagesize (),0 ,0 ); +vm_vaddr_t gva =vm_vaddr_alloc (vm, size,KVM_UTIL_MIN_VADDR ,0 ,0 );struct kvm_cpuid2 *guest_cpuids =addr_gva2hva (vm, gva);memcpy (guest_cpuids, cpuid, size);
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 12/19 KVM: selftests: Unconditionally use memslot '0' for page table allocations
In reply to Sean ChristophersonDrop the memslot param from virt_pg_map() and virt_map() and shove the hardcoded '0' down to the vm_phy_page_alloc() calls.
No functional change intended.
--- tools/testing/selftests/kvm/dirty_log_test.c | 2 +- tools/testing/selftests/kvm/include/kvm_util.h | 5 ++--- tools/testing/selftests/kvm/kvm_page_table_test.c | 2 +- .../testing/selftests/kvm/lib/aarch64/processor.c | 15 +++++++-------- tools/testing/selftests/kvm/lib/aarch64/ucall.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 6 +++--- tools/testing/selftests/kvm/lib/perf_test_util.c | 2 +- tools/testing/selftests/kvm/lib/s390x/processor.c | 9 ++++----- .../testing/selftests/kvm/lib/x86_64/processor.c | 9 ++++----- tools/testing/selftests/kvm/memslot_perf_test.c | 2 +- .../selftests/kvm/set_memory_region_test.c | 2 +- tools/testing/selftests/kvm/steal_time.c | 2 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 2 +- .../testing/selftests/kvm/x86_64/xapic_ipi_test.c | 2 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 2 +- .../selftests/kvm/x86_64/xen_vmcall_test.c | 2 +- 16 files changed, 31 insertions(+), 35 deletions(-)
tools/testing/selftests/kvm/dirty_log_test.c +1 -1
@@ -760,7 +760,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) KVM_MEM_LOG_DIRTY_PAGES);/* Do mapping for the dirty track memory slot */ -virt_map (vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages,0 ); +virt_map (vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages);/* Cache the HVA pointer of the region */ host_test_mem =addr_gpa2hva (vm, (vm_paddr_t )guest_test_phys_mem);
tools/testing/selftests/kvm/include/kvm_util.h +2 -3
@@ -145,7 +145,7 @@ vm_vaddr_t vm_vaddr_alloc_pages(struct kvm_vm *vm, int nr_pages);vm_vaddr_t vm_vaddr_alloc_page (struct kvm_vm *vm);void virt_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr, -unsigned int npages,uint32_t pgd_memslot); +unsigned int npages);void *addr_gpa2hva (struct kvm_vm *vm,vm_paddr_t gpa);void *addr_gva2hva (struct kvm_vm *vm,vm_vaddr_t gva);vm_paddr_t addr_hva2gpa (struct kvm_vm *vm,void *hva);
@@ -256,8 +256,7 @@ void virt_pgd_alloc(struct kvm_vm *vm);* Within @vm, creates a virtual translation for the page starting * at @vaddr to the page starting at @paddr. */ -void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr, -uint32_t memslot); +void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr);vm_paddr_t vm_phy_page_alloc (struct kvm_vm *vm,vm_paddr_t paddr_min,uint32_t memslot);
tools/testing/selftests/kvm/kvm_page_table_test.c +1 -1
@@ -303,7 +303,7 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg) TEST_MEM_SLOT_INDEX, guest_num_pages, 0);/* Do mapping(GVA->GPA) for the testing memory slot */ -virt_map (vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages,0 ); +virt_map (vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages);/* Cache the HVA pointer of the region */ host_test_mem =addr_gpa2hva (vm, (vm_paddr_t )guest_test_phys_mem);
tools/testing/selftests/kvm/lib/aarch64/processor.c +7 -8
@@ -83,8 +83,8 @@ void virt_pgd_alloc(struct kvm_vm *vm) } } -void _virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr, -uint32_t pgd_memslot,uint64_t flags) +static void _virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr, +uint64_t flags) {uint8_t attr_idx = flags &7 ;uint64_t *ptep;
@@ -105,7 +105,7 @@ void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, ptep =addr_gpa2hva (vm, vm->pgd) +pgd_index (vm, vaddr) *8 ;if (!*ptep) { - *ptep =vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR , pgd_memslot); + *ptep =vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); *ptep |=3 ; }
@@ -113,14 +113,14 @@ void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,case 4 : ptep =addr_gpa2hva (vm,pte_addr (vm, *ptep)) +pud_index (vm, vaddr) *8 ;if (!*ptep) { - *ptep =vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR , pgd_memslot); + *ptep =vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); *ptep |=3 ; }/* fall through */ case 3 : ptep =addr_gpa2hva (vm,pte_addr (vm, *ptep)) +pmd_index (vm, vaddr) *8 ;if (!*ptep) { - *ptep =vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR , pgd_memslot); + *ptep =vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); *ptep |=3 ; }/* fall through */
@@ -135,12 +135,11 @@ void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, *ptep |= (attr_idx <<2 ) | (1 <<10 )/* Access Flag */ ; } -void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr, -uint32_t pgd_memslot) +void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) {uint64_t attr_idx =4 ;/* NORMAL (See DEFAULT_MAIR_EL1) */ -_virt_pg_map (vm, vaddr, paddr, pgd_memslot, attr_idx); +_virt_pg_map (vm, vaddr, paddr, attr_idx); }vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva)
tools/testing/selftests/kvm/lib/aarch64/ucall.c +1 -1
@@ -14,7 +14,7 @@ static bool ucall_mmio_init(struct kvm_vm *vm, vm_paddr_t gpa)if (kvm_userspace_memory_region_find (vm, gpa, gpa +1 ))return false; -virt_pg_map (vm, gpa, gpa,0 ); +virt_pg_map (vm, gpa, gpa); ucall_exit_mmio_addr = (vm_vaddr_t *)gpa;sync_global_to_guest (vm, ucall_exit_mmio_addr);
tools/testing/selftests/kvm/lib/kvm_util.c +3 -3
@@ -1269,7 +1269,7 @@ vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min)for (vm_vaddr_t vaddr = vaddr_start; pages >0 ; pages--, vaddr += vm->page_size, paddr += vm->page_size) { -virt_pg_map (vm, vaddr, paddr,0 ); +virt_pg_map (vm, vaddr, paddr);sparsebit_set (vm->vpages_mapped, vaddr >> vm->page_shift);
@@ -1334,7 +1334,7 @@ vm_vaddr_t vm_vaddr_alloc_page(struct kvm_vm *vm)* @npages starting at @vaddr to the page range starting at @paddr. */ void virt_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr, -unsigned int npages,uint32_t pgd_memslot) +unsigned int npages) {size_t page_size = vm->page_size;size_t size = npages * page_size;
@@ -1343,7 +1343,7 @@ void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,TEST_ASSERT (paddr + size > paddr,"Paddr overflow" );while (npages--) { -virt_pg_map (vm, vaddr, paddr, pgd_memslot); +virt_pg_map (vm, vaddr, paddr); vaddr += page_size; paddr += page_size; }
tools/testing/selftests/kvm/lib/perf_test_util.c +1 -1
@@ -101,7 +101,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus, guest_num_pages, 0);/* Do mapping for the demand paging memory slot */ -virt_map (vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages,0 ); +virt_map (vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages);ucall_init (vm,NULL );
tools/testing/selftests/kvm/lib/s390x/processor.c +4 -5
@@ -36,12 +36,12 @@ void virt_pgd_alloc(struct kvm_vm *vm)* a page table (ri == 4). Returns a suitable region/segment table entry * which points to the freshly allocated pages. */ -static uint64_t virt_alloc_region (struct kvm_vm *vm,int ri,uint32_t memslot) +static uint64_t virt_alloc_region (struct kvm_vm *vm,int ri) {uint64_t taddr; taddr =vm_phy_pages_alloc (vm, ri <4 ?PAGES_PER_REGION :1 , -KVM_GUEST_PAGE_TABLE_MIN_PADDR , memslot); +KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 );memset (addr_gpa2hva (vm, taddr),0xff ,PAGES_PER_REGION * vm->page_size);return (taddr ®ION_ENTRY_ORIGIN )
@@ -49,8 +49,7 @@ static uint64_t virt_alloc_region(struct kvm_vm *vm, int ri, uint32_t memslot) | ((ri < 4 ? (PAGES_PER_REGION - 1) : 0) & REGION_ENTRY_LENGTH); } -void virt_pg_map (struct kvm_vm *vm,uint64_t gva,uint64_t gpa, -uint32_t memslot) +void virt_pg_map (struct kvm_vm *vm,uint64_t gva,uint64_t gpa) {int ri, idx;uint64_t *entry;
@@ -77,7 +76,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t gva, uint64_t gpa,for (ri =1 ; ri <=4 ; ri++) { idx = (gva >> (64 -11 * ri)) &0x7ffu ;if (entry[idx] ®ION_ENTRY_INVALID ) - entry[idx] =virt_alloc_region (vm, ri, memslot); + entry[idx] =virt_alloc_region (vm, ri); entry =addr_gpa2hva (vm, entry[idx] ®ION_ENTRY_ORIGIN ); }
tools/testing/selftests/kvm/lib/x86_64/processor.c +4 -5
@@ -221,8 +221,7 @@ void virt_pgd_alloc(struct kvm_vm *vm) } } -void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr, -uint32_t pgd_memslot) +void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) {uint16_t index[4 ];struct pageMapL4Entry *pml4e;
@@ -256,7 +255,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, pml4e =addr_gpa2hva (vm, vm->pgd);if (!pml4e[index[3 ]].present) { pml4e[index[3 ]].address =vm_phy_page_alloc (vm, -KVM_GUEST_PAGE_TABLE_MIN_PADDR , pgd_memslot) +KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ) >> vm->page_shift; pml4e[index[3 ]].writable = true; pml4e[index[3 ]].present = true;
@@ -267,7 +266,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, pdpe =addr_gpa2hva (vm, pml4e[index[3 ]].address * vm->page_size);if (!pdpe[index[2 ]].present) { pdpe[index[2 ]].address =vm_phy_page_alloc (vm, -KVM_GUEST_PAGE_TABLE_MIN_PADDR , pgd_memslot) +KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ) >> vm->page_shift; pdpe[index[2 ]].writable = true; pdpe[index[2 ]].present = true;
@@ -278,7 +277,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, pde =addr_gpa2hva (vm, pdpe[index[2 ]].address * vm->page_size);if (!pde[index[1 ]].present) { pde[index[1 ]].address =vm_phy_page_alloc (vm, -KVM_GUEST_PAGE_TABLE_MIN_PADDR , pgd_memslot) +KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ) >> vm->page_shift; pde[index[1 ]].writable = true; pde[index[1 ]].present = true;
tools/testing/selftests/kvm/memslot_perf_test.c +1 -1
@@ -306,7 +306,7 @@ static bool prepare_vm(struct vm_data *data, int nslots, uint64_t *maxslots, guest_addr += npages *4096 ; } -virt_map (data->vm,MEM_GPA ,MEM_GPA , mempages,0 ); +virt_map (data->vm,MEM_GPA ,MEM_GPA , mempages); sync = (typeof (sync ))vm_gpa2hva (data,MEM_SYNC_GPA ,NULL );atomic_init (&sync->start_flag, false);
tools/testing/selftests/kvm/set_memory_region_test.c +1 -1
@@ -132,7 +132,7 @@ static struct kvm_vm *spawn_vm(pthread_t *vcpu_thread, void *guest_code) gpa =vm_phy_pages_alloc (vm,2 ,MEM_REGION_GPA ,MEM_REGION_SLOT );TEST_ASSERT (gpa ==MEM_REGION_GPA ,"Failed vm_phy_pages_alloc\n" ); -virt_map (vm,MEM_REGION_GPA ,MEM_REGION_GPA ,2 ,0 ); +virt_map (vm,MEM_REGION_GPA ,MEM_REGION_GPA ,2 );/* Ditto for the host mapping so that both pages can be zeroed. */ hva =addr_gpa2hva (vm,MEM_REGION_GPA );
tools/testing/selftests/kvm/steal_time.c +1 -1
@@ -295,7 +295,7 @@ int main(int ac, char **av) vm =vm_create_default (0 ,0 , guest_code); gpages =vm_calc_num_guest_pages (VM_MODE_DEFAULT ,STEAL_TIME_SIZE *NR_VCPUS );vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS ,ST_GPA_BASE ,1 , gpages,0 ); -virt_map (vm,ST_GPA_BASE ,ST_GPA_BASE , gpages,0 ); +virt_map (vm,ST_GPA_BASE ,ST_GPA_BASE , gpages);ucall_init (vm,NULL );/* Add the rest of the VCPUs */
tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c +1 -1
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])* Add an identity map for GVA range [0xc0000000, 0xc0002000). This * affects both L1 and L2. However... */ -virt_map (vm,GUEST_TEST_MEM ,GUEST_TEST_MEM ,TEST_MEM_PAGES ,0 ); +virt_map (vm,GUEST_TEST_MEM ,GUEST_TEST_MEM ,TEST_MEM_PAGES );/* * ... pages in the L2 GPA range [0xc0001000, 0xc0003000) will map to
tools/testing/selftests/kvm/x86_64/xapic_ipi_test.c +1 -1
@@ -423,7 +423,7 @@ int main(int argc, char *argv[])vcpu_init_descriptor_tables (vm,HALTER_VCPU_ID );vm_handle_exception (vm,IPI_VECTOR , guest_ipi_handler); -virt_pg_map (vm,APIC_DEFAULT_GPA ,APIC_DEFAULT_GPA ,0 ); +virt_pg_map (vm,APIC_DEFAULT_GPA ,APIC_DEFAULT_GPA );vm_vcpu_add_default (vm,SENDER_VCPU_ID , sender_guest_code);
tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +1 -1
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])/* Map a region for the shared_info page */ vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS ,SHINFO_REGION_GPA ,SHINFO_REGION_SLOT ,2 ,0 ); -virt_map (vm,SHINFO_REGION_GVA ,SHINFO_REGION_GPA ,2 ,0 ); +virt_map (vm,SHINFO_REGION_GVA ,SHINFO_REGION_GPA ,2 );struct kvm_xen_hvm_config hvmc = { .flags =KVM_XEN_HVM_CONFIG_INTERCEPT_HCALL ,
tools/testing/selftests/kvm/x86_64/xen_vmcall_test.c +1 -1
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])/* Map a region for the hypercall pages */ vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS ,HCALL_REGION_GPA ,HCALL_REGION_SLOT ,2 ,0 ); -virt_map (vm,HCALL_REGION_GPA ,HCALL_REGION_GPA ,2 ,0 ); +virt_map (vm,HCALL_REGION_GPA ,HCALL_REGION_GPA ,2 );for (;;) {volatile struct kvm_run *run =vcpu_state (vm,VCPU_ID );
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 13/19 KVM: selftests: Unconditionally allocate EPT tables in memslot 0
In reply to Sean ChristophersonDrop the EPTP memslot param from all EPT helpers and shove the hardcoded '0' down to the vm_phy_page_alloc() calls.
No functional change intended.
--- .../selftests/kvm/include/x86_64/vmx.h | 10 ++++----- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 21 ++++++++----------- .../kvm/x86_64/vmx_apic_access_test.c | 2 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 6 +++--- 4 files changed, 17 insertions(+), 22 deletions(-)
tools/testing/selftests/kvm/include/x86_64/vmx.h +4 -6
@@ -608,15 +608,13 @@ bool nested_vmx_supported(void);void nested_vmx_check_supported (void );void nested_pg_map (struct vmx_pages *vmx,struct kvm_vm *vm, -uint64_t nested_paddr,uint64_t paddr,uint32_t eptp_memslot); +uint64_t nested_paddr,uint64_t paddr);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); +uint64_t nested_paddr,uint64_t paddr,uint64_t size);void nested_map_memslot (struct vmx_pages *vmx,struct kvm_vm *vm, -uint32_t memslot,uint32_t eptp_memslot); +uint32_t memslot);void prepare_eptp (struct vmx_pages *vmx,struct kvm_vm *vm,uint32_t eptp_memslot); -void prepare_virtualize_apic_accesses (struct vmx_pages *vmx,struct kvm_vm *vm, -uint32_t eptp_memslot); +void prepare_virtualize_apic_accesses (struct vmx_pages *vmx,struct kvm_vm *vm);#endif /* SELFTEST_KVM_VMX_H */
tools/testing/selftests/kvm/lib/x86_64/vmx.c +9 -12
@@ -393,7 +393,7 @@ void nested_vmx_check_supported(void) }void nested_pg_map (struct vmx_pages *vmx,struct kvm_vm *vm, -uint64_t nested_paddr,uint64_t paddr,uint32_t eptp_memslot) +uint64_t nested_paddr,uint64_t paddr) {uint16_t index[4 ];struct eptPageTableEntry *pml4e;
@@ -427,7 +427,7 @@ void nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm, pml4e = vmx->eptp_hva;if (!pml4e[index[3 ]].readable) { pml4e[index[3 ]].address =vm_phy_page_alloc (vm, -KVM_EPT_PAGE_TABLE_MIN_PADDR , eptp_memslot) +KVM_EPT_PAGE_TABLE_MIN_PADDR ,0 ) >> vm->page_shift; pml4e[index[3 ]].writable = true; pml4e[index[3 ]].readable = true;
@@ -439,7 +439,7 @@ void nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm, pdpe =addr_gpa2hva (vm, pml4e[index[3 ]].address * vm->page_size);if (!pdpe[index[2 ]].readable) { pdpe[index[2 ]].address =vm_phy_page_alloc (vm, -KVM_EPT_PAGE_TABLE_MIN_PADDR , eptp_memslot) +KVM_EPT_PAGE_TABLE_MIN_PADDR ,0 ) >> vm->page_shift; pdpe[index[2 ]].writable = true; pdpe[index[2 ]].readable = true;
@@ -451,7 +451,7 @@ void nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm, pde =addr_gpa2hva (vm, pdpe[index[2 ]].address * vm->page_size);if (!pde[index[1 ]].readable) { pde[index[1 ]].address =vm_phy_page_alloc (vm, -KVM_EPT_PAGE_TABLE_MIN_PADDR , eptp_memslot) +KVM_EPT_PAGE_TABLE_MIN_PADDR ,0 ) >> vm->page_shift; pde[index[1 ]].writable = true; pde[index[1 ]].readable = true;
@@ -492,8 +492,7 @@ void nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm,* page range starting at nested_paddr to the page range starting at paddr. */ 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) +uint64_t nested_paddr,uint64_t paddr,uint64_t size) {size_t page_size = vm->page_size;size_t npages = size / page_size;
@@ -502,7 +501,7 @@ void nested_map(struct vmx_pages *vmx, struct kvm_vm *vm,TEST_ASSERT (paddr + size > paddr,"Paddr overflow" );while (npages--) { -nested_pg_map (vmx, vm, nested_paddr, paddr, eptp_memslot); +nested_pg_map (vmx, vm, nested_paddr, paddr); nested_paddr += page_size; paddr += page_size; }
@@ -512,7 +511,7 @@ void nested_map(struct vmx_pages *vmx, struct kvm_vm *vm,* physical pages in VM. */ void nested_map_memslot (struct vmx_pages *vmx,struct kvm_vm *vm, -uint32_t memslot,uint32_t eptp_memslot) +uint32_t memslot) {sparsebit_idx_t i, last; struct userspace_mem_region *region =
@@ -528,8 +527,7 @@ void nested_map_memslot(struct vmx_pages *vmx, struct kvm_vm *vm,nested_map (vmx, vm, (uint64_t )i << vm->page_shift, (uint64_t )i << vm->page_shift, -1 << vm->page_shift, - eptp_memslot); +1 << vm->page_shift); } }
@@ -541,8 +539,7 @@ void prepare_eptp(struct vmx_pages *vmx, struct kvm_vm *vm, vmx->eptp_gpa =addr_gva2gpa (vm, (uintptr_t )vmx->eptp); } -void prepare_virtualize_apic_accesses (struct vmx_pages *vmx,struct kvm_vm *vm, -uint32_t eptp_memslot) +void prepare_virtualize_apic_accesses (struct vmx_pages *vmx,struct kvm_vm *vm) { vmx->apic_access = (void *)vm_vaddr_alloc_page (vm); vmx->apic_access_hva =addr_gva2hva (vm, (uintptr_t )vmx->apic_access);
tools/testing/selftests/kvm/x86_64/vmx_apic_access_test.c +1 -1
@@ -96,7 +96,7 @@ int main(int argc, char *argv[]) } vmx =vcpu_alloc_vmx (vm, &vmx_pages_gva); -prepare_virtualize_apic_accesses (vmx, vm,0 ); +prepare_virtualize_apic_accesses (vmx, vm);vcpu_args_set (vm,VCPU_ID ,2 , vmx_pages_gva, high_gpa);while (!done) {
tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c +3 -3
@@ -107,9 +107,9 @@ int main(int argc, char *argv[])* meaning after the last call to virt_map. */ prepare_eptp (vmx, vm,0 ); -nested_map_memslot (vmx, vm,0 ,0 ); -nested_map (vmx, vm,NESTED_TEST_MEM1 ,GUEST_TEST_MEM ,4096 ,0 ); -nested_map (vmx, vm,NESTED_TEST_MEM2 ,GUEST_TEST_MEM ,4096 ,0 ); +nested_map_memslot (vmx, vm,0 ); +nested_map (vmx, vm,NESTED_TEST_MEM1 ,GUEST_TEST_MEM ,4096 ); +nested_map (vmx, vm,NESTED_TEST_MEM2 ,GUEST_TEST_MEM ,4096 ); bmap =bitmap_alloc (TEST_MEM_PAGES ); host_test_mem =addr_gpa2hva (vm,GUEST_TEST_MEM );
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 14/19 KVM: selftests: Add wrapper to allocate page table page
In reply to Sean ChristophersonAdd a helper to allocate a page for use in constructing the guest's page tables. All architectures have identical address and memslot requirements (which appear to be arbitrary anyways).
No functional change intended.
--- .../testing/selftests/kvm/include/kvm_util.h | 2 ++ .../selftests/kvm/lib/aarch64/processor.c | 19 ++++++------------- tools/testing/selftests/kvm/lib/kvm_util.c | 8 ++++++++ .../selftests/kvm/lib/s390x/processor.c | 2 -- .../selftests/kvm/lib/x86_64/processor.c | 19 ++++--------------- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 12 +++--------- 6 files changed, 23 insertions(+), 39 deletions(-)
tools/testing/selftests/kvm/include/kvm_util.h +2 -0
@@ -30,6 +30,7 @@ typedef uint64_t vm_vaddr_t; /* Virtual Machine (Guest) virtual address *//* Minimum allocated guest virtual and physical addresses */ #define KVM_UTIL_MIN_VADDR 0x2000 +#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000#define DEFAULT_GUEST_PHY_PAGES 512#define DEFAULT_GUEST_STACK_VADDR_MIN 0xab6000
@@ -262,6 +263,7 @@ vm_paddr_t vm_phy_page_alloc(struct kvm_vm *vm, vm_paddr_t paddr_min, uint32_t memslot);vm_paddr_t vm_phy_pages_alloc (struct kvm_vm *vm,size_t num,vm_paddr_t paddr_min,uint32_t memslot); +vm_paddr_t vm_alloc_page_table (struct kvm_vm *vm);/* * Create a VM with reasonable defaults
tools/testing/selftests/kvm/lib/aarch64/processor.c +6 -13
@@ -11,7 +11,6 @@#include "../kvm_util_internal.h" #include "processor.h" -#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000#define DEFAULT_ARM64_GUEST_STACK_VADDR_MIN 0xac0000static uint64_t page_align (struct kvm_vm *vm,uint64_t v)
@@ -104,25 +103,19 @@ static void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, paddr, vm->max_gfn, vm->page_size); ptep =addr_gpa2hva (vm, vm->pgd) +pgd_index (vm, vaddr) *8 ; -if (!*ptep) { - *ptep =vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); - *ptep |=3 ; - } +if (!*ptep) + *ptep =vm_alloc_page_table (vm) |3 ;switch (vm->pgtable_levels) {case 4 : ptep =addr_gpa2hva (vm,pte_addr (vm, *ptep)) +pud_index (vm, vaddr) *8 ; -if (!*ptep) { - *ptep =vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); - *ptep |=3 ; - } +if (!*ptep) + *ptep =vm_alloc_page_table (vm) |3 ;/* fall through */ case 3 : ptep =addr_gpa2hva (vm,pte_addr (vm, *ptep)) +pmd_index (vm, vaddr) *8 ; -if (!*ptep) { - *ptep =vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); - *ptep |=3 ; - } +if (!*ptep) + *ptep =vm_alloc_page_table (vm) |3 ;/* fall through */ case 2 : ptep =addr_gpa2hva (vm,pte_addr (vm, *ptep)) +pte_index (vm, vaddr) *8 ;
tools/testing/selftests/kvm/lib/kvm_util.c +8 -0
@@ -2213,6 +2213,14 @@ vm_paddr_t vm_phy_page_alloc(struct kvm_vm *vm, vm_paddr_t paddr_min,return vm_phy_pages_alloc (vm,1 , paddr_min, memslot); } +/* Arbitrary minimum physical address used for virtual translation tables. */ +#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000 + +vm_paddr_t vm_alloc_page_table (struct kvm_vm *vm) +{ +return vm_phy_page_alloc (vm,KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); +} +/* * Address Guest Virtual to Host Virtual *
tools/testing/selftests/kvm/lib/s390x/processor.c +0 -2
@@ -9,8 +9,6 @@#include "kvm_util.h" #include "../kvm_util_internal.h" -#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000 -#define PAGES_PER_REGION 4void virt_pgd_alloc (struct kvm_vm *vm)
tools/testing/selftests/kvm/lib/x86_64/processor.c +4 -15
@@ -17,9 +17,6 @@#define DEFAULT_CODE_SELECTOR 0x8#define DEFAULT_DATA_SELECTOR 0x10 -/* Minimum physical address used for virtual translation tables. */ -#define KVM_GUEST_PAGE_TABLE_MIN_PADDR 0x180000 -vm_vaddr_t exception_handlers;/* Virtual translation table structure declarations */
@@ -214,9 +211,7 @@ void virt_pgd_alloc(struct kvm_vm *vm)/* If needed, create page map l4 table. */ if (!vm->pgd_created) { -vm_paddr_t paddr =vm_phy_page_alloc (vm, -KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ); - vm->pgd = paddr; + vm->pgd =vm_alloc_page_table (vm); vm->pgd_created = true; } }
@@ -254,9 +249,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)/* Allocate page directory pointer table if not present. */ pml4e =addr_gpa2hva (vm, vm->pgd);if (!pml4e[index[3 ]].present) { - pml4e[index[3 ]].address =vm_phy_page_alloc (vm, -KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ) - >> vm->page_shift; + pml4e[index[3 ]].address =vm_alloc_page_table (vm) >> vm->page_shift; pml4e[index[3 ]].writable = true; pml4e[index[3 ]].present = true; }
@@ -265,9 +258,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)struct pageDirectoryPointerEntry *pdpe; pdpe =addr_gpa2hva (vm, pml4e[index[3 ]].address * vm->page_size);if (!pdpe[index[2 ]].present) { - pdpe[index[2 ]].address =vm_phy_page_alloc (vm, -KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ) - >> vm->page_shift; + pdpe[index[2 ]].address =vm_alloc_page_table (vm) >> vm->page_shift; pdpe[index[2 ]].writable = true; pdpe[index[2 ]].present = true; }
@@ -276,9 +267,7 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)struct pageDirectoryEntry *pde; pde =addr_gpa2hva (vm, pdpe[index[2 ]].address * vm->page_size);if (!pde[index[1 ]].present) { - pde[index[1 ]].address =vm_phy_page_alloc (vm, -KVM_GUEST_PAGE_TABLE_MIN_PADDR ,0 ) - >> vm->page_shift; + pde[index[1 ]].address =vm_alloc_page_table (vm) >> vm->page_shift; pde[index[1 ]].writable = true; pde[index[1 ]].present = true; }
tools/testing/selftests/kvm/lib/x86_64/vmx.c +3 -9
@@ -426,9 +426,7 @@ void nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm,/* Allocate page directory pointer table if not present. */ pml4e = vmx->eptp_hva;if (!pml4e[index[3 ]].readable) { - pml4e[index[3 ]].address =vm_phy_page_alloc (vm, -KVM_EPT_PAGE_TABLE_MIN_PADDR ,0 ) - >> vm->page_shift; + pml4e[index[3 ]].address =vm_alloc_page_table (vm) >> vm->page_shift; pml4e[index[3 ]].writable = true; pml4e[index[3 ]].readable = true; pml4e[index[3 ]].executable = true;
@@ -438,9 +436,7 @@ void nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm,struct eptPageTableEntry *pdpe; pdpe =addr_gpa2hva (vm, pml4e[index[3 ]].address * vm->page_size);if (!pdpe[index[2 ]].readable) { - pdpe[index[2 ]].address =vm_phy_page_alloc (vm, -KVM_EPT_PAGE_TABLE_MIN_PADDR ,0 ) - >> vm->page_shift; + pdpe[index[2 ]].address =vm_alloc_page_table (vm) >> vm->page_shift; pdpe[index[2 ]].writable = true; pdpe[index[2 ]].readable = true; pdpe[index[2 ]].executable = true;
@@ -450,9 +446,7 @@ void nested_pg_map(struct vmx_pages *vmx, struct kvm_vm *vm,struct eptPageTableEntry *pde; pde =addr_gpa2hva (vm, pdpe[index[2 ]].address * vm->page_size);if (!pde[index[1 ]].readable) { - pde[index[1 ]].address =vm_phy_page_alloc (vm, -KVM_EPT_PAGE_TABLE_MIN_PADDR ,0 ) - >> vm->page_shift; + pde[index[1 ]].address =vm_alloc_page_table (vm) >> vm->page_shift; pde[index[1 ]].writable = true; pde[index[1 ]].readable = true; pde[index[1 ]].executable = true;
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 15/19 KVM: selftests: Rename x86's page table "address" to "pfn"
In reply to Sean ChristophersonRename the "address" field to "pfn" in x86's page table structs to match reality.
No functional change intended.
--- .../selftests/kvm/lib/x86_64/processor.c | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-)
tools/testing/selftests/kvm/lib/x86_64/processor.c +22 -25
@@ -30,7 +30,7 @@ struct pageMapL4Entry { uint64_t ignored_06:1; uint64_t page_size:1; uint64_t ignored_11_08:4; - uint64_t address:40; + uint64_t pfn:40; uint64_t ignored_62_52:11; uint64_t execute_disable:1; };
@@ -45,7 +45,7 @@ struct pageDirectoryPointerEntry { uint64_t ignored_06:1; uint64_t page_size:1; uint64_t ignored_11_08:4; - uint64_t address:40; + uint64_t pfn:40; uint64_t ignored_62_52:11; uint64_t execute_disable:1; };
@@ -60,7 +60,7 @@ struct pageDirectoryEntry { uint64_t ignored_06:1; uint64_t page_size:1; uint64_t ignored_11_08:4; - uint64_t address:40; + uint64_t pfn:40; uint64_t ignored_62_52:11; uint64_t execute_disable:1; };
@@ -76,7 +76,7 @@ struct pageTableEntry { uint64_t reserved_07:1; uint64_t global:1; uint64_t ignored_11_09:3; - uint64_t address:40; + uint64_t pfn:40; uint64_t ignored_62_52:11; uint64_t execute_disable:1; };
@@ -249,33 +249,33 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)/* Allocate page directory pointer table if not present. */ pml4e =addr_gpa2hva (vm, vm->pgd);if (!pml4e[index[3 ]].present) { - pml4e[index[3 ]].address =vm_alloc_page_table (vm) >> vm->page_shift; + pml4e[index[3 ]].pfn =vm_alloc_page_table (vm) >> vm->page_shift; pml4e[index[3 ]].writable = true; pml4e[index[3 ]].present = true; }/* Allocate page directory table if not present. */ struct pageDirectoryPointerEntry *pdpe; - pdpe =addr_gpa2hva (vm, pml4e[index[3 ]].address * vm->page_size); + pdpe =addr_gpa2hva (vm, pml4e[index[3 ]].pfn * vm->page_size);if (!pdpe[index[2 ]].present) { - pdpe[index[2 ]].address =vm_alloc_page_table (vm) >> vm->page_shift; + pdpe[index[2 ]].pfn =vm_alloc_page_table (vm) >> vm->page_shift; pdpe[index[2 ]].writable = true; pdpe[index[2 ]].present = true; }/* Allocate page table if not present. */ struct pageDirectoryEntry *pde; - pde =addr_gpa2hva (vm, pdpe[index[2 ]].address * vm->page_size); + pde =addr_gpa2hva (vm, pdpe[index[2 ]].pfn * vm->page_size);if (!pde[index[1 ]].present) { - pde[index[1 ]].address =vm_alloc_page_table (vm) >> vm->page_shift; + pde[index[1 ]].pfn =vm_alloc_page_table (vm) >> vm->page_shift; pde[index[1 ]].writable = true; pde[index[1 ]].present = true; }/* Fill in page table entry. */ struct pageTableEntry *pte; - pte =addr_gpa2hva (vm, pde[index[1 ]].address * vm->page_size); - pte[index[0 ]].address = paddr >> vm->page_shift; + pte =addr_gpa2hva (vm, pde[index[1 ]].pfn * vm->page_size); + pte[index[0 ]].pfn = paddr >> vm->page_shift; pte[index[0 ]].writable = true; pte[index[0 ]].present =1 ; }
@@ -305,11 +305,10 @@ void virt_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent)" %u\n" , indent,"" , pml4e - pml4e_start, pml4e, -addr_hva2gpa (vm, pml4e), (uint64_t ) pml4e->address, +addr_hva2gpa (vm, pml4e), (uint64_t ) pml4e->pfn, pml4e->writable, pml4e->execute_disable); - pdpe_start =addr_gpa2hva (vm, pml4e->address - * vm->page_size); + pdpe_start =addr_gpa2hva (vm, pml4e->pfn * vm->page_size);for (uint16_t n2 =0 ; n2 <=0x1ffu ; n2++) { pdpe = &pdpe_start[n2];if (!pdpe->present)
@@ -319,11 +318,10 @@ void virt_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent) indent,"" , pdpe - pdpe_start, pdpe,addr_hva2gpa (vm, pdpe), - (uint64_t ) pdpe->address, pdpe->writable, + (uint64_t ) pdpe->pfn, pdpe->writable, pdpe->execute_disable); - pde_start =addr_gpa2hva (vm, - pdpe->address * vm->page_size); + pde_start =addr_gpa2hva (vm, pdpe->pfn * vm->page_size);for (uint16_t n3 =0 ; n3 <=0x1ffu ; n3++) { pde = &pde_start[n3];if (!pde->present)
@@ -332,11 +330,10 @@ void virt_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent)"0x%-12lx 0x%-10lx %u %u\n" , indent,"" , pde - pde_start, pde,addr_hva2gpa (vm, pde), - (uint64_t ) pde->address, pde->writable, + (uint64_t ) pde->pfn, pde->writable, pde->execute_disable); - pte_start =addr_gpa2hva (vm, - pde->address * vm->page_size); + pte_start =addr_gpa2hva (vm, pde->pfn * vm->page_size);for (uint16_t n4 =0 ; n4 <=0x1ffu ; n4++) { pte = &pte_start[n4];if (!pte->present)
@@ -347,7 +344,7 @@ void virt_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent) indent,"" , pte - pte_start, pte,addr_hva2gpa (vm, pte), - (uint64_t ) pte->address, + (uint64_t ) pte->pfn, pte->writable, pte->execute_disable, pte->dirty,
@@ -487,19 +484,19 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)if (!pml4e[index[3 ]].present) goto unmapped_gva; - pdpe =addr_gpa2hva (vm, pml4e[index[3 ]].address * vm->page_size); + pdpe =addr_gpa2hva (vm, pml4e[index[3 ]].pfn * vm->page_size);if (!pdpe[index[2 ]].present) goto unmapped_gva; - pde =addr_gpa2hva (vm, pdpe[index[2 ]].address * vm->page_size); + pde =addr_gpa2hva (vm, pdpe[index[2 ]].pfn * vm->page_size);if (!pde[index[1 ]].present) goto unmapped_gva; - pte =addr_gpa2hva (vm, pde[index[1 ]].address * vm->page_size); + pte =addr_gpa2hva (vm, pde[index[1 ]].pfn * vm->page_size);if (!pte[index[0 ]].present) goto unmapped_gva; -return (pte[index[0 ]].address * vm->page_size) + (gva &0xfffu ); +return (pte[index[0 ]].pfn * vm->page_size) + (gva &0xfffu ); unmapped_gva:TEST_FAIL ("No mapping for vm virtual address, gva: 0x%lx" , gva);
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 16/19 KVM: selfests: Add PTE helper for x86-64 in preparation for hugepages
In reply to Sean ChristophersonAdd a helper to retrieve a PTE pointer given a PFN, address, and level in preparation for adding hugepage support.
No functional change intended.
--- .../selftests/kvm/lib/x86_64/processor.c | 59 ++++++++++--------- 1 file changed, 31 insertions(+), 28 deletions(-)
tools/testing/selftests/kvm/lib/x86_64/processor.c +31 -28
@@ -216,10 +216,21 @@ void virt_pgd_alloc(struct kvm_vm *vm) } } +static void *virt_get_pte (struct kvm_vm *vm,uint64_t pt_pfn,uint64_t vaddr, +int level) +{ +uint64_t *page_table =addr_gpa2hva (vm, pt_pfn << vm->page_shift); +int index = vaddr >> (vm->page_shift + level *9 ) &0x1ffu ; + +return &page_table[index]; +} +void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) { -uint16_t index[4 ];struct pageMapL4Entry *pml4e; +struct pageDirectoryPointerEntry *pdpe; +struct pageDirectoryEntry *pde; +struct pageTableEntry *pte;TEST_ASSERT (vm->mode ==VM_MODE_PXXV48_4K ,"Attempt to use " "unknown or unsupported guest mode, mode: 0x%x" , vm->mode);
@@ -241,43 +252,35 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)" paddr: 0x%lx vm->max_gfn: 0x%lx vm->page_size: 0x%x" , paddr, vm->max_gfn, vm->page_size); - index[0 ] = (vaddr >>12 ) &0x1ffu ; - index[1 ] = (vaddr >>21 ) &0x1ffu ; - index[2 ] = (vaddr >>30 ) &0x1ffu ; - index[3 ] = (vaddr >>39 ) &0x1ffu ; -/* Allocate page directory pointer table if not present. */ - pml4e =addr_gpa2hva (vm, vm->pgd); -if (!pml4e[index[3 ]].present) { - pml4e[index[3 ]].pfn =vm_alloc_page_table (vm) >> vm->page_shift; - pml4e[index[3 ]].writable = true; - pml4e[index[3 ]].present = true; + pml4e =virt_get_pte (vm, vm->pgd >> vm->page_shift, vaddr,3 ); +if (!pml4e->present) { + pml4e->pfn =vm_alloc_page_table (vm) >> vm->page_shift; + pml4e->writable = true; + pml4e->present = true; }/* Allocate page directory table if not present. */ -struct pageDirectoryPointerEntry *pdpe; - pdpe =addr_gpa2hva (vm, pml4e[index[3 ]].pfn * vm->page_size); -if (!pdpe[index[2 ]].present) { - pdpe[index[2 ]].pfn =vm_alloc_page_table (vm) >> vm->page_shift; - pdpe[index[2 ]].writable = true; - pdpe[index[2 ]].present = true; + pdpe =virt_get_pte (vm, pml4e->pfn, vaddr,2 ); +if (!pdpe->present) { + pdpe->pfn =vm_alloc_page_table (vm) >> vm->page_shift; + pdpe->writable = true; + pdpe->present = true; }/* Allocate page table if not present. */ -struct pageDirectoryEntry *pde; - pde =addr_gpa2hva (vm, pdpe[index[2 ]].pfn * vm->page_size); -if (!pde[index[1 ]].present) { - pde[index[1 ]].pfn =vm_alloc_page_table (vm) >> vm->page_shift; - pde[index[1 ]].writable = true; - pde[index[1 ]].present = true; + pde =virt_get_pte (vm, pdpe->pfn, vaddr,1 ); +if (!pde->present) { + pde->pfn =vm_alloc_page_table (vm) >> vm->page_shift; + pde->writable = true; + pde->present = true; }/* Fill in page table entry. */ -struct pageTableEntry *pte; - pte =addr_gpa2hva (vm, pde[index[1 ]].pfn * vm->page_size); - pte[index[0 ]].pfn = paddr >> vm->page_shift; - pte[index[0 ]].writable = true; - pte[index[0 ]].present =1 ; + pte =virt_get_pte (vm, pde->pfn, vaddr,0 ); + pte->pfn = paddr >> vm->page_shift; + pte->writable = true; + pte->present =1 ; }void virt_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent)
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 17/19 KVM: selftests: Genericize upper level page table entry struct
In reply to Sean ChristophersonIn preparation for adding hugepage support, replace "pageMapL4Entry", "pageDirectoryPointerEntry", and "pageDirectoryEntry" with a common "pageUpperEntry", and add a helper to create an upper level entry. All upper level entries have the same layout, using unique structs provides minimal value and requires a non-trivial amount of code duplication.
No functional change intended.
--- .../selftests/kvm/lib/x86_64/processor.c | 91 ++++++------------- 1 file changed, 26 insertions(+), 65 deletions(-)
tools/testing/selftests/kvm/lib/x86_64/processor.c +26 -65
@@ -20,37 +20,7 @@vm_vaddr_t exception_handlers;/* Virtual translation table structure declarations */ -struct pageMapL4Entry { -uint64_t present:1 ; -uint64_t writable:1 ; -uint64_t user:1 ; -uint64_t write_through:1 ; -uint64_t cache_disable:1 ; -uint64_t accessed:1 ; -uint64_t ignored_06:1 ; -uint64_t page_size:1 ; -uint64_t ignored_11_08:4 ; -uint64_t pfn:40 ; -uint64_t ignored_62_52:11 ; -uint64_t execute_disable:1 ; -}; - -struct pageDirectoryPointerEntry { -uint64_t present:1 ; -uint64_t writable:1 ; -uint64_t user:1 ; -uint64_t write_through:1 ; -uint64_t cache_disable:1 ; -uint64_t accessed:1 ; -uint64_t ignored_06:1 ; -uint64_t page_size:1 ; -uint64_t ignored_11_08:4 ; -uint64_t pfn:40 ; -uint64_t ignored_62_52:11 ; -uint64_t execute_disable:1 ; -}; - -struct pageDirectoryEntry { +struct pageUpperEntry {uint64_t present:1 ;uint64_t writable:1 ;uint64_t user:1 ;
@@ -225,11 +195,24 @@ static void *virt_get_pte(struct kvm_vm *vm, uint64_t pt_pfn, uint64_t vaddr,return &page_table[index]; } +static struct pageUpperEntry *virt_create_upper_pte (struct kvm_vm *vm, +uint64_t pt_pfn, +uint64_t vaddr, +int level) +{ +struct pageUpperEntry *pte =virt_get_pte (vm, pt_pfn, vaddr, level); + +if (!pte->present) { + pte->pfn =vm_alloc_page_table (vm) >> vm->page_shift; + pte->writable = true; + pte->present = true; + } +return pte; +} +void virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr) { -struct pageMapL4Entry *pml4e; -struct pageDirectoryPointerEntry *pdpe; -struct pageDirectoryEntry *pde; +struct pageUpperEntry *pml4e, *pdpe, *pde;struct pageTableEntry *pte; TEST_ASSERT(vm->mode == VM_MODE_PXXV48_4K, "Attempt to use "
@@ -252,29 +235,10 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)" paddr: 0x%lx vm->max_gfn: 0x%lx vm->page_size: 0x%x" , paddr, vm->max_gfn, vm->page_size); -/* Allocate page directory pointer table if not present. */ - pml4e =virt_get_pte (vm, vm->pgd >> vm->page_shift, vaddr,3 ); -if (!pml4e->present) { - pml4e->pfn =vm_alloc_page_table (vm) >> vm->page_shift; - pml4e->writable = true; - pml4e->present = true; - } - -/* Allocate page directory table if not present. */ - pdpe =virt_get_pte (vm, pml4e->pfn, vaddr,2 ); -if (!pdpe->present) { - pdpe->pfn =vm_alloc_page_table (vm) >> vm->page_shift; - pdpe->writable = true; - pdpe->present = true; - } - -/* Allocate page table if not present. */ - pde =virt_get_pte (vm, pdpe->pfn, vaddr,1 ); -if (!pde->present) { - pde->pfn =vm_alloc_page_table (vm) >> vm->page_shift; - pde->writable = true; - pde->present = true; - } +/* Allocate upper level page tables, if not already present. */ + pml4e =virt_create_upper_pte (vm, vm->pgd >> vm->page_shift, vaddr,3 ); + pdpe =virt_create_upper_pte (vm, pml4e->pfn, vaddr,2 ); + pde =virt_create_upper_pte (vm, pdpe->pfn, vaddr,1 );/* Fill in page table entry. */ pte =virt_get_pte (vm, pde->pfn, vaddr,0 );
@@ -285,9 +249,9 @@ void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)void virt_dump (FILE *stream,struct kvm_vm *vm,uint8_t indent) { -struct pageMapL4Entry *pml4e, *pml4e_start; -struct pageDirectoryPointerEntry *pdpe, *pdpe_start; -struct pageDirectoryEntry *pde, *pde_start; +struct pageUpperEntry *pml4e, *pml4e_start; +struct pageUpperEntry *pdpe, *pdpe_start; +struct pageUpperEntry *pde, *pde_start;struct pageTableEntry *pte, *pte_start;if (!vm->pgd_created)
@@ -298,8 +262,7 @@ void virt_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent)fprintf (stream,"%*s index hvaddr gpaddr " "addr w exec dirty\n" , indent,"" ); - pml4e_start = (struct pageMapL4Entry *)addr_gpa2hva (vm, - vm->pgd); + pml4e_start = (struct pageUpperEntry *)addr_gpa2hva (vm, vm->pgd);for (uint16_t n1 =0 ; n1 <=0x1ffu ; n1++) { pml4e = &pml4e_start[n1];if (!pml4e->present)
@@ -468,9 +431,7 @@ static void kvm_seg_set_kernel_data_64bit(struct kvm_vm *vm, uint16_t selector,vm_paddr_t addr_gva2gpa (struct kvm_vm *vm,vm_vaddr_t gva) {uint16_t index[4 ]; -struct pageMapL4Entry *pml4e; -struct pageDirectoryPointerEntry *pdpe; -struct pageDirectoryEntry *pde; +struct pageUpperEntry *pml4e, *pdpe, *pde;struct pageTableEntry *pte; TEST_ASSERT(vm->mode == VM_MODE_PXXV48_4K, "Attempt to use "
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 19/19 KVM: sefltests: Add x86-64 test to verify MMU reacts to CPUID updates
In reply to Sean ChristophersonAdd an x86-only test to verify that x86's MMU reacts to CPUID updates that impact the MMU. KVM has had multiple bugs where it fails to reconfigure the MMU after the guest's vCPU model changes.
Sadly, this test is effectively limited to shadow paging because the hardware page walk handler doesn't support software disabling of GBPAGES support, and KVM doesn't manually walk the GVA->GPA on faults for performance reasons (doing so would large defeat the benefits of TDP).
Don't require !TDP for the tests as there is still value in running the tests with TDP, even though the tests will fail (barring KVM hacks). E.g. KVM should not completely explode if MAXPHYADDR results in KVM using 4-level vs. 5-level paging for the guest.
--- tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/x86_64/processor.h | 3 + .../selftests/kvm/x86_64/mmu_role_test.c | 147 ++++++++++++++++++ 4 files changed, 152 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86_64/mmu_role_test.c
tools/testing/selftests/kvm/.gitignore +1 -0
@@ -15,6 +15,7 @@ /x86_64/hyperv_cpuid /x86_64/hyperv_features /x86_64/mmio_warning_test +/x86_64/mmu_role_test /x86_64/platform_info_test /x86_64/set_boot_cpu_id /x86_64/set_sregs_test
tools/testing/selftests/kvm/Makefile +1 -0
@@ -47,6 +47,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid TEST_GEN_PROGS_x86_64 += x86_64/hyperv_features TEST_GEN_PROGS_x86_64 += x86_64/kvm_pv_test TEST_GEN_PROGS_x86_64 += x86_64/mmio_warning_test +TEST_GEN_PROGS_x86_64 += x86_64/mmu_role_test TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test TEST_GEN_PROGS_x86_64 += x86_64/set_boot_cpu_id TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test
tools/testing/selftests/kvm/include/x86_64/processor.h +3 -0
@@ -55,6 +55,9 @@#define CPUID_PKU (1ul << 3)#define CPUID_LA57 (1ul << 16) +/* CPUID.0x8000_0001.EDX */ +#define CPUID_GBPAGES (1ul << 26) +#define UNEXPECTED_VECTOR_PORT 0xfff0u/* General Registers in 64-Bit Mode */
tools/testing/selftests/kvm/x86_64/mmu_role_test.c new file +147 -0
147 lines not on this page · raw message
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Sean Christopherson
reviewerPATCH 18/19 KVM: selftests: Add hugepage support for x86-64
In reply to Sean ChristophersonAdd x86-64 hugepage support in the form of a x86-only variant of virt_pg_map() that takes an explicit page size. To keep things simple, follow the existing logic for 4k pages and disallow creating a hugepage if the upper-level entry is present, even if the desired pfn matches.
Opportunistically fix a double "beyond beyond" reported by checkpatch.
--- .../selftests/kvm/include/x86_64/processor.h | 8 ++ .../selftests/kvm/lib/x86_64/processor.c | 83 +++++++++++++------ 2 files changed, 67 insertions(+), 24 deletions(-)
tools/testing/selftests/kvm/include/x86_64/processor.h +8 -0
@@ -412,6 +412,14 @@ struct kvm_cpuid2 *kvm_get_supported_hv_cpuid(void);void vcpu_set_hv_cpuid (struct kvm_vm *vm,uint32_t vcpuid);struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid (struct kvm_vm *vm,uint32_t vcpuid); +enum x86_page_size { +X86_PAGE_SIZE_4K =0 , +X86_PAGE_SIZE_2M , +X86_PAGE_SIZE_1G , +}; +void __virt_pg_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr, +enum x86_page_size page_size); +/* * Basic CPU control in CR0 */
tools/testing/selftests/kvm/lib/x86_64/processor.c +59 -24
114 lines not on this page · raw message
Signature · 1 line
2.32.0.288.g62a8d224e6-goog
Quoted 90 lines · Sean Christopherson
The primary intent of this series is to allow x86-64 tests to create arbitrary hugepages and use the new functionality to abuse x86's CPUID APIs to test KVM MMU behavior.
The majority of the prep work refactors the selftests APIs related to memory allocation. The core memory allocation APIs within the selftests don't provide defaults for memslot or min virtual address, which has led to a ridiculous amount of magic and duplicate code. Literally zero tests use non-standard values in a meaningful way, and if a test comes along that has a legitimate use case, it should use lower-level helpers.
Patches 01 and 02 are fixes for bugs found during the refactoring.
As for the
mmu_roletest itself, the idea is to change the vCPU model while the guest is running (viaKVM_SET_CPUID2) to verify that KVM reconfigures its MMUs when the vCPU model is changed. E.g. toggling guest support for 1gb hugepages and changing guest MAXPHYADDR.Sadly, the test doesn't pass when KVM is using TDP paging (even with all my
mmu_rolefixes) because KVM doesn't fully support manipulating GBPAGES and MAXPHYADDR (and other CPUID-based properties that affect the MMU) while the guest is running. And practically speaking, KVM will never fully support such behavior becuase (a) there is likely no sane use case,
(b) fixing the issues is very costly (memory consumption), (c) GBPAGES and potentially other features _can't_ be handled correctly due to lack of hardware support, and (d) userspace can workaround all issues simply by deleting a memslot.All that said, I purposely made the test off-by-default instead of requiring TDP. Partly because detecting whether TDP is enabled is a pain becuase it's per-vendor, but also because running the test with TDP enabled is still interesting to some extent, e.g. the test will fail, but it shouldn't crash KVM, trigger WARNs, etc...
Sean Christopherson (19):
KVM: selftests: Remove errantasm/barrier.hinclude to fix arm64 build
KVM: selftests: Zero out the correct page in the Hyper-V features test
KVM: selftests: Unconditionally use memslot 0 when loading elf binary
KVM: selftests: Unconditionally use memslot 0 for x86's GDT/TSS setup
KVM: selftests: Use "standard" min virtual address for Hyper-V pages
KVM: selftests: Add helpers to allocate N pages of virtual memory
KVM: selftests: Lower the min virtual address for misc page
allocations
KVM: selftests: Usealloc_pagehelper for x86-64's GDT/ITD/TSS
allocations
KVM: selftests: Use alloc page helper for xAPIC IPI test
KVM: selftests: Use "standard" min virtual address for CPUID test
alloc
KVM: selftest: Unconditionally use memslot 0 for vaddr allocations
KVM: selftests: Unconditionally use memslot '0' for page table
allocations
KVM: selftests: Unconditionally allocate EPT tables in memslot 0
KVM: selftests: Add wrapper to allocate page table page
KVM: selftests: Rename x86's page table "address" to "pfn"
KVM: selfests: Add PTE helper for x86-64 in preparation for hugepages
KVM: selftests: Genericize upper level page table entry struct
KVM: selftests: Add hugepage support for x86-64
KVM: sefltests: Add x86-64 test to verify MMU reacts to CPUID updatestools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 1 + tools/testing/selftests/kvm/dirty_log_test.c | 5 +- .../selftests/kvm/hardware_disable_test.c | 2 +- .../testing/selftests/kvm/include/kvm_util.h | 18 +- .../selftests/kvm/include/x86_64/processor.h | 11 + .../selftests/kvm/include/x86_64/vmx.h | 10 +- .../selftests/kvm/kvm_page_table_test.c | 2 +- .../selftests/kvm/lib/aarch64/processor.c | 34 +-- .../testing/selftests/kvm/lib/aarch64/ucall.c | 2 +- tools/testing/selftests/kvm/lib/elf.c | 6 +- tools/testing/selftests/kvm/lib/kvm_util.c | 62 ++++- .../selftests/kvm/lib/perf_test_util.c | 2 +- .../selftests/kvm/lib/s390x/processor.c | 17 +- .../selftests/kvm/lib/x86_64/processor.c | 254 ++++++++---------- tools/testing/selftests/kvm/lib/x86_64/svm.c | 9 +- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 52 ++-- .../testing/selftests/kvm/memslot_perf_test.c | 2 +- .../selftests/kvm/set_memory_region_test.c | 2 +- tools/testing/selftests/kvm/steal_time.c | 2 +- .../selftests/kvm/x86_64/get_cpuid_test.c | 3 +- .../selftests/kvm/x86_64/hyperv_clock.c | 2 +- .../selftests/kvm/x86_64/hyperv_features.c | 8 +- .../selftests/kvm/x86_64/mmu_role_test.c | 147 ++++++++++ .../selftests/kvm/x86_64/set_boot_cpu_id.c | 2 +- .../kvm/x86_64/vmx_apic_access_test.c | 2 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 8 +- .../selftests/kvm/x86_64/xapic_ipi_test.c | 4 +- .../selftests/kvm/x86_64/xen_shinfo_test.c | 2 +- .../selftests/kvm/x86_64/xen_vmcall_test.c | 2 +- 30 files changed, 414 insertions(+), 260 deletions(-)
Quoted 2 lines
create mode 100644
tools/testing/selftests/kvm/x86_64/mmu_role_test.c
Queued, thanks.
Paolo
Re: [PATCH 19/19] KVM: sefltests: Add x86-64 test to verify MMU reacts to CPUID updates
In reply to Sean ChristophersonQuoted 5 lines · Sean Christopherson
Add an x86-only test to verify that x86's MMU reacts to CPUID updates that impact the MMU. KVM has had multiple bugs where it fails to reconfigure the MMU after the guest's vCPU model changes.
Sadly, this test is effectively limited to shadow paging because the
The x86_64/mmu_role_test fails when "N=/sys/module/kvm_intel/parameters/ept" :
KVM_SET_CPUID2 failed, rc: -1 errno: 22 (due to "63f5a1909f9e")
Does this regression meet your expectations even after "feb627e8d6f6" ?
Quoted 6 lines
hardware page walk handler doesn't support software disabling of GBPAGES support, and KVM doesn't manually walk the
GVA->GPAon faults for performance reasons (doing so would large defeat the benefits of TDP).Don't require !TDP for the tests as there is still value in running the tests with TDP, even though the tests will fail (barring KVM hacks).
In this case, we could assert that the test will fail, rather than throwing the failure, which is unfriendly to many CI systems. What do you think ?
Quoted 203 lines
E.g. KVM should not completely explode if MAXPHYADDR results in KVM using 4-level vs. 5-level paging for the guest.
Signed-off-by Sean Christopherson <[email protected]>--- tools/testing/selftests/kvm/.gitignore | 1 + tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/x86_64/processor.h | 3 + .../selftests/kvm/x86_64/mmu_role_test.c | 147 ++++++++++++++++++ 4 files changed, 152 insertions(+)create mode 100644
tools/testing/selftests/kvm/x86_64/mmu_role_test.ctools/testing/selftests/kvm/.gitignore +1
-0@@ -15,6 +15,7 @@ /x86_64/hyperv_cpuid /x86_64/hyperv_features /x86_64/mmio_warning_test +/x86_64/mmu_role_test /x86_64/platform_info_test /x86_64/set_boot_cpu_id /x86_64/set_sregs_testtools/testing/selftests/kvm/Makefile +1
-0@@ -47,6 +47,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/hyperv_cpuid TEST_GEN_PROGS_x86_64 += x86_64/hyperv_features TEST_GEN_PROGS_x86_64 += x86_64/kvm_pv_test TEST_GEN_PROGS_x86_64 += x86_64/mmio_warning_test +TEST_GEN_PROGS_x86_64 += x86_64/mmu_role_test TEST_GEN_PROGS_x86_64 += x86_64/platform_info_test TEST_GEN_PROGS_x86_64 += x86_64/set_boot_cpu_id TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_testtools/testing/selftests/kvm/include/x86_64/processor.h +3
-0@@ -55,6 +55,9 @@#define CPUID_PKU (1ul << 3)#define CPUID_LA57 (1ul << 16) +/* CPUID.0x8000_0001.EDX */ +#define CPUID_GBPAGES (1ul << 26) +#define UNEXPECTED_VECTOR_PORT 0xfff0u/* General Registers in 64-Bit Mode */ tools/testing/selftests/kvm/x86_64/mmu_role_test.c new file +147
-0@@ -0,0 +1,147 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "kvm_util.h" +#include "processor.h" + +#define VCPU_ID 1 + +#define MMIO_GPA 0x100000000ull + +static void guest_code (void ) +{ + (void )READ_ONCE (*((uint64_t *)MMIO_GPA )); + (void )READ_ONCE (*((uint64_t *)MMIO_GPA )); + +GUEST_ASSERT (0 ); +} + +static void guest_pf_handler (struct ex_regs *regs) +{ +/* PFEC == RSVD | PRESENT (read, kernel). */ +GUEST_ASSERT (regs->error_code ==0x9 ); +GUEST_DONE (); +} + +static void mmu_role_test (u32 *cpuid_reg,u32 evil_cpuid_val) +{ +u32 good_cpuid_val = *cpuid_reg; +struct kvm_run *run; +struct kvm_vm *vm; +uint64_t cmd; +int r; + +/* Create VM */ + vm =vm_create_default (VCPU_ID ,0 , guest_code); + run =vcpu_state (vm,VCPU_ID ); + +/* Map 1gb page without a backing memlot. */ +__virt_pg_map (vm,MMIO_GPA ,MMIO_GPA ,X86_PAGE_SIZE_1G ); + + r =_vcpu_run (vm,VCPU_ID ); + +/* Guest access to the 1gb page should trigger MMIO. */ +TEST_ASSERT (r ==0 ,"vcpu_run failed: %d\n" , r); +TEST_ASSERT (run->exit_reason ==KVM_EXIT_MMIO , +"Unexpected exit reason: %u (%s), expected MMIO exit (1gb page w/o memslot)\n" , + run->exit_reason,exit_reason_str (run->exit_reason)); + +TEST_ASSERT (run->mmio.len ==8 ,"Unexpected exit mmio size = %u" , run->mmio.len); + +TEST_ASSERT (run->mmio.phys_addr ==MMIO_GPA , +"Unexpected exit mmio address = 0x%llx" , run->mmio.phys_addr); + +/* +* Effect the CPUID change for the guest and re-enter the guest. Its +* access should now #PF due to the PAGE_SIZE bit being reserved or +* the resulting GPA being invalid. Note, kvm_get_supported_cpuid() +* returns the struct that contains the entry being modified. Eww. +*/ + *cpuid_reg = evil_cpuid_val; +vcpu_set_cpuid (vm,VCPU_ID ,kvm_get_supported_cpuid ()); + +/* +* Add a dummy memslot to coerce KVM into bumping the MMIO generation. +* KVM does not "officially" support mucking with CPUID after KVM_RUN, +* and will incorrectly reuse MMIO SPTEs. Don't delete the memslot! +* KVM x86 zaps all shadow pages on memslot deletion. +*/ +vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS , +MMIO_GPA <<1 ,10 ,1 ,0 ); + +/* Set up a #PF handler to eat the RSVD #PF and signal all done! */ +vm_init_descriptor_tables (vm); +vcpu_init_descriptor_tables (vm,VCPU_ID ); +vm_handle_exception (vm,PF_VECTOR , guest_pf_handler); + + r =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (r ==0 ,"vcpu_run failed: %d\n" , r); + + cmd =get_ucall (vm,VCPU_ID ,NULL ); +TEST_ASSERT (cmd ==UCALL_DONE , +"Unexpected guest exit, exit_reason=%s, ucall.cmd = %lu\n" , +exit_reason_str (run->exit_reason), cmd); + +/* +* Restore the happy CPUID value for the next test. Yes, changes are +* indeed persistent across VM destruction. +*/ + *cpuid_reg = good_cpuid_val; + +kvm_vm_free (vm); +} + +int main (int argc,char *argv[]) +{ +struct kvm_cpuid_entry2 *entry; +int opt; + +/* +* All tests are opt-in because TDP doesn't play nice with reserved #PF +* in the GVA->GPA translation. The hardware page walker doesn't let +* software change GBPAGES or MAXPHYADDR, and KVM doesn't manually walk +* the GVA on fault for performance reasons. +*/ +bool do_gbpages = false; +bool do_maxphyaddr = false; + +setbuf (stdout,NULL ); + +while ((opt =getopt (argc, argv,"gm" )) !=-1 ) { +switch (opt) { +case 'g' : + do_gbpages = true; +break ; +case 'm' : + do_maxphyaddr = true; +break ; +case 'h' : +default : +printf ("usage: %s [-g (GBPAGES)] [-m (MAXPHYADDR)]\n" , argv[0 ]); +break ; + } + } + +if (!do_gbpages && !do_maxphyaddr) { +print_skip ("No sub-tests selected" ); +return 0 ; + } + + entry =kvm_get_supported_cpuid_entry (0x80000001 ); +if (!(entry->edx &CPUID_GBPAGES )) { +print_skip ("1gb hugepages not supported" ); +return 0 ; + } + +if (do_gbpages) { +pr_info ("Test MMIO after toggling CPUID.GBPAGES\n\n" ); +mmu_role_test (&entry->edx, entry->edx & ~CPUID_GBPAGES ); + } + +if (do_maxphyaddr) { +pr_info ("Test MMIO after changing CPUID.MAXPHYADDR\n\n" ); + entry =kvm_get_supported_cpuid_entry (0x80000008 ); +mmu_role_test (&entry->eax, (entry->eax & ~0xff ) |0x20 ); + } + +return 0 ; +}