KVM: selftests: Introduce steal-time tests for x86_64 and AArch64
cover KVM: selftests: Introduce steal-time tests for x86_64 and AArch64
Test steal/stolen-time on x86 and AArch64 to make sure what gets reported to the guest is consistent with run-delay.
The first patch of this series is just kvm selftests API cleanup. The series is based on kvm/queue and some in-flight patches that are also based on kvm/queue
KVM: selftests: Share common API documentation
KVM: selftests: Enable printf format warnings for TEST_ASSERT
KVM: selftests: Use consistent message for test skipping
KVM: selftests: s390x: Provide additional num-guest-pages adjustment
Thanks,
drew
Andrew Jones (2):
KVM: selftests: virt_map should take npages, not size
KVM: selftests: Introduce steal-time test
tools/testing/selftests/kvm/.gitignore | 2 + tools/testing/selftests/kvm/Makefile | 12 +- .../selftests/kvm/demand_paging_test.c | 3 +- tools/testing/selftests/kvm/dirty_log_test.c | 3 +- .../testing/selftests/kvm/include/kvm_util.h | 7 +- .../testing/selftests/kvm/include/test_util.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 17 +- tools/testing/selftests/kvm/lib/test_util.c | 15 + tools/testing/selftests/kvm/steal_time.c | 352 ++++++++++++++++++ .../kvm/x86_64/set_memory_region_test.c | 2 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 11 +- 11 files changed, 401 insertions(+), 24 deletions(-) create mode 100644 tools/testing/selftests/kvm/steal_time.c
Signature · 1 line
2.21.1
PATCH 1/2 KVM: selftests: virt_map should take npages, not size
Also correct the comment and prototype for vm_create_default(), as it takes a number of pages, not a size.
--- tools/testing/selftests/kvm/demand_paging_test.c | 3 +-- tools/testing/selftests/kvm/dirty_log_test.c | 3 +-- tools/testing/selftests/kvm/include/kvm_util.h | 6 +++--- tools/testing/selftests/kvm/lib/kvm_util.c | 10 +++++----- .../selftests/kvm/x86_64/set_memory_region_test.c | 2 +- .../testing/selftests/kvm/x86_64/vmx_dirty_log_test.c | 11 +++++------ 6 files changed, 16 insertions(+), 19 deletions(-)
tools/testing/selftests/kvm/demand_paging_test.c +1 -2
@@ -410,8 +410,7 @@ static void run_test(enum vm_guest_mode mode, bool use_uffd, 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 * guest_page_size,0 ); +virt_map (vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages,0 );ucall_init (vm,NULL );
tools/testing/selftests/kvm/dirty_log_test.c +1 -2
@@ -334,8 +334,7 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations, 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 * guest_page_size,0 ); +virt_map (vm, guest_test_virt_mem, guest_test_phys_mem, guest_num_pages,0 );/* 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 +3 -3
@@ -117,7 +117,7 @@ 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);void virt_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr, -size_t size,uint32_t pgd_memslot); +unsigned int npages,uint32_t pgd_memslot);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);
@@ -226,7 +226,7 @@ vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,* * Input Args: * vcpuid - The id of the single VCPU to add to the VM. -* extra_mem_pages - The size of extra memories to add (this will +* extra_mem_pages - The number of extra pages to add (this will * decide how much extra space we will need to * setup the page tables using memslot 0) * guest_code - The vCPU's entry point
@@ -236,7 +236,7 @@ vm_paddr_t vm_phy_pages_alloc(struct kvm_vm *vm, size_t num,* Return: * Pointer to opaque structure that describes the created VM. */ -struct kvm_vm *vm_create_default (uint32_t vcpuid,uint64_t extra_mem_size, +struct kvm_vm *vm_create_default (uint32_t vcpuid,uint64_t extra_mem_pages,void *guest_code);/*
tools/testing/selftests/kvm/lib/kvm_util.c +5 -5
@@ -1015,21 +1015,21 @@ vm_vaddr_t vm_vaddr_alloc(struct kvm_vm *vm, size_t sz, vm_vaddr_t vaddr_min,* vm - Virtual Machine * vaddr - Virtuall address to map * paddr - VM Physical Address -* size - The size of the range to map +* npages - The number of pages to map * pgd_memslot - Memory region slot for new virtual translation tables * * Output Args: None * * Return: None * -* Within the VM given by vm, creates a virtual translation for the -* page range starting at vaddr to the page range starting at paddr. +* Within the VM given by @vm, creates a virtual translation for +* @npages starting at @vaddr to the page range starting at @paddr. */ void virt_map (struct kvm_vm *vm,uint64_t vaddr,uint64_t paddr, -size_t size,uint32_t pgd_memslot) +unsigned int npages,uint32_t pgd_memslot) {size_t page_size = vm->page_size; -size_t npages = size / page_size; +size_t size = npages * page_size;TEST_ASSERT (vaddr + size > vaddr,"Vaddr overflow" );TEST_ASSERT (paddr + size > paddr,"Paddr overflow" );
tools/testing/selftests/kvm/x86_64/set_memory_region_test.c +1 -1
@@ -87,7 +87,7 @@ static void test_move_memory_region(void) 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 *4096 ,0 ); +virt_map (vm,MEM_REGION_GPA ,MEM_REGION_GPA ,2 ,0 );/* Ditto for the host mapping so that both pages can be zeroed. */ hva =addr_gpa2hva (vm,MEM_REGION_GPA );
tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c +5 -6
@@ -21,7 +21,7 @@/* The memory slot index to track dirty pages */ #define TEST_MEM_SLOT_INDEX 1 -#define TEST_MEM_SIZE 3 +#define TEST_MEM_PAGES 3/* L1 guest test virtual memory offset */ #define GUEST_TEST_MEM 0xc0000000
@@ -91,15 +91,14 @@ int main(int argc, char *argv[])vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS ,GUEST_TEST_MEM ,TEST_MEM_SLOT_INDEX , -TEST_MEM_SIZE , +TEST_MEM_PAGES ,KVM_MEM_LOG_DIRTY_PAGES );/* * 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_SIZE *4096 ,0 ); +virt_map (vm,GUEST_TEST_MEM ,GUEST_TEST_MEM ,TEST_MEM_PAGES ,0 );/* * ... pages in the L2 GPA range [0xc0001000, 0xc0003000) will map to
@@ -113,11 +112,11 @@ int main(int argc, char *argv[])nested_map (vmx, vm,NESTED_TEST_MEM1 ,GUEST_TEST_MEM ,4096 ,0 );nested_map (vmx, vm,NESTED_TEST_MEM2 ,GUEST_TEST_MEM ,4096 ,0 ); - bmap =bitmap_alloc (TEST_MEM_SIZE ); + bmap =bitmap_alloc (TEST_MEM_PAGES ); host_test_mem =addr_gpa2hva (vm,GUEST_TEST_MEM );while (!done) { -memset (host_test_mem,0xaa ,TEST_MEM_SIZE *4096 ); +memset (host_test_mem,0xaa ,TEST_MEM_PAGES *4096 );_vcpu_run (vm,VCPU_ID ); TEST_ASSERT(run->exit_reason == KVM_EXIT_IO, "Unexpected exit reason: %u (%s),\n",
Signature · 1 line
2.21.1
PATCH 2/2 KVM: selftests: Introduce steal-time test
In reply to Andrew JonesThe steal-time test confirms what is reported to the guest as stolen time is consistent with the run_delay reported for the VCPU thread on the host. Both x86_64 and AArch64 have the concept of steal/stolen time so this test is introduced for both architectures.
While adding the test we ensure .gitignore has all tests listed (it was missing s390x/resets) and that the Makefile has all tests listed in alphabetical order (not really necessary, but it almost was already...). We also extend the common API with a new num-guest- pages call and a new timespec call.
--- tools/testing/selftests/kvm/.gitignore | 2 + tools/testing/selftests/kvm/Makefile | 12 +- .../testing/selftests/kvm/include/kvm_util.h | 1 + .../testing/selftests/kvm/include/test_util.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 7 + tools/testing/selftests/kvm/lib/test_util.c | 15 + tools/testing/selftests/kvm/steal_time.c | 352 ++++++++++++++++++ 7 files changed, 385 insertions(+), 5 deletions(-) create mode 100644 tools/testing/selftests/kvm/steal_time.c
tools/testing/selftests/kvm/.gitignore +2 -0
@@ -1,4 +1,5 @@ /s390x/memop +/s390x/resets /s390x/sync_regs_test /x86_64/cr4_cpuid_sync_test /x86_64/evmcs_test
@@ -20,3 +21,4 @@ /demand_paging_test /dirty_log_test /kvm_create_max_vcpus +/steal_time
tools/testing/selftests/kvm/Makefile +7 -5
@@ -21,28 +21,30 @@ TEST_GEN_PROGS_x86_64 += x86_64/set_memory_region_test TEST_GEN_PROGS_x86_64 += x86_64/set_sregs_test TEST_GEN_PROGS_x86_64 += x86_64/smm_test TEST_GEN_PROGS_x86_64 += x86_64/state_test +TEST_GEN_PROGS_x86_64 += x86_64/svm_vmcall_test TEST_GEN_PROGS_x86_64 += x86_64/sync_regs_test TEST_GEN_PROGS_x86_64 += x86_64/vmx_close_while_nested_test TEST_GEN_PROGS_x86_64 += x86_64/vmx_dirty_log_test TEST_GEN_PROGS_x86_64 += x86_64/vmx_set_nested_state_test TEST_GEN_PROGS_x86_64 += x86_64/vmx_tsc_adjust_test TEST_GEN_PROGS_x86_64 += x86_64/xss_msr_test -TEST_GEN_PROGS_x86_64 += x86_64/svm_vmcall_test TEST_GEN_PROGS_x86_64 += clear_dirty_log_test -TEST_GEN_PROGS_x86_64 += dirty_log_test TEST_GEN_PROGS_x86_64 += demand_paging_test +TEST_GEN_PROGS_x86_64 += dirty_log_test TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus +TEST_GEN_PROGS_x86_64 += steal_time TEST_GEN_PROGS_aarch64 += clear_dirty_log_test -TEST_GEN_PROGS_aarch64 += dirty_log_test TEST_GEN_PROGS_aarch64 += demand_paging_test +TEST_GEN_PROGS_aarch64 += dirty_log_test TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus +TEST_GEN_PROGS_aarch64 += steal_time TEST_GEN_PROGS_s390x = s390x/memop -TEST_GEN_PROGS_s390x += s390x/sync_regs_test TEST_GEN_PROGS_s390x += s390x/resets -TEST_GEN_PROGS_s390x += dirty_log_test +TEST_GEN_PROGS_s390x += s390x/sync_regs_test TEST_GEN_PROGS_s390x += demand_paging_test +TEST_GEN_PROGS_s390x += dirty_log_test TEST_GEN_PROGS_s390x += kvm_create_max_vcpus TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))
tools/testing/selftests/kvm/include/kvm_util.h +1 -0
@@ -255,6 +255,7 @@ unsigned int vm_get_page_size(struct kvm_vm *vm);unsigned int vm_get_page_shift (struct kvm_vm *vm);unsigned int vm_get_max_gfn (struct kvm_vm *vm); +unsigned int vm_calc_num_guest_pages (enum vm_guest_mode mode,size_t size);unsigned int vm_num_host_pages (enum vm_guest_mode mode,unsigned int num_guest_pages);unsigned int vm_num_guest_pages (enum vm_guest_mode mode,unsigned int num_host_pages); static inline unsigned int
tools/testing/selftests/kvm/include/test_util.h +1 -0
@@ -59,5 +59,6 @@ size_t parse_size(const char *size);int64_t timespec_to_ns (struct timespec ts);struct timespec timespec_diff (struct timespec start,struct timespec end); +struct timespec timespec_add_ns (struct timespec ts,int64_t ns);#endif /* SELFTEST_KVM_TEST_UTIL_H */
tools/testing/selftests/kvm/lib/kvm_util.c +7 -0
@@ -1769,3 +1769,10 @@ vm_num_guest_pages(enum vm_guest_mode mode, unsigned int num_host_pages)return vm_calc_num_pages (num_host_pages,getpageshift (), vm_guest_mode_params[mode].page_shift, false); } + +unsigned int vm_calc_num_guest_pages (enum vm_guest_mode mode,size_t size) +{ +unsigned int n; + n =DIV_ROUND_UP (size, vm_guest_mode_params[mode].page_size); +return vm_adjust_num_guest_pages (mode, n); +}
tools/testing/selftests/kvm/lib/test_util.c +15 -0
@@ -71,6 +71,21 @@ struct timespec timespec_diff(struct timespec start, struct timespec end)return temp; } +struct timespec timespec_add_ns (struct timespec ts,int64_t ns) +{ +struct timespec res; + + res.tv_sec = ts.tv_sec; + res.tv_nsec = ts.tv_nsec + ns; + +if (res.tv_nsec >1000000000UL ) { + res.tv_sec +=1 ; + res.tv_nsec -=1000000000UL ; + } + +return res; +} +void print_skip (const char *fmt, ...) {va_list ap;
tools/testing/selftests/kvm/steal_time.c new file +352 -0
352 lines not on this page · raw message
Signature · 1 line
2.21.1
Quoted 19 lines · Andrew Jones
Test steal/stolen-time on x86 and AArch64 to make sure what gets reported to the guest is consistent with run-delay.
The first patch of this series is just kvm selftests API cleanup. The series is based on kvm/queue and some in-flight patches that are also based on kvm/queue
KVM: selftests: Share common API documentation
KVM: selftests: Enable printf format warnings forTEST_ASSERT
KVM: selftests: Use consistent message for test skipping
KVM: selftests: s390x: Provide additional num-guest-pages adjustmentThanks,
drewAndrew Jones (2):
KVM: selftests:virt_mapshould take npages, not size
KVM: selftests: Introduce steal-time test
Quoted 14 lines
tools/testing/selftests/kvm/.gitignore | 2 + tools/testing/selftests/kvm/Makefile | 12 +- .../selftests/kvm/demand_paging_test.c | 3 +- tools/testing/selftests/kvm/dirty_log_test.c | 3 +- .../testing/selftests/kvm/include/kvm_util.h | 7 +- .../testing/selftests/kvm/include/test_util.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 17 +- tools/testing/selftests/kvm/lib/test_util.c | 15 + tools/testing/selftests/kvm/steal_time.c | 352 ++++++++++++++++++ .../kvm/x86_64/set_memory_region_test.c | 2 +- .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 11 +- 11 files changed, 401 insertions(+), 24 deletions(-) create mode 100644 tools/testing/selftests/kvm/steal_time.c
Queued, thanks.
Paolo