KVM: selftests: some improvement and a new test for kvm page table
v3 cover KVM: selftests: some improvement and a new test for kvm page table
Hi,
This v3 series can mainly include two parts.
Based on kvm queue branch: https://git.kernel.org/pub/scm/virt/kvm/kvm.git/log/?h=queue
Links of v1: https://lore.kernel.org/lkml/[email protected]/
Links of v2: https://lore.kernel.org/lkml/[email protected]/
In the first part, all the known hugetlb backing src types specified with different hugepage sizes are listed, so that we can specify use of hugetlb source of the exact granularity that we want, instead of the system default ones. And as all the known hugetlb page sizes are listed, it's appropriate for all architectures. Besides, a helper that can get granularity of different backing src types(anonumous/thp/hugetlb) is added, so that we can use the accurate backing src granularity for kinds of alignment or guest memory accessing of vcpus.
In the second part, a new test is added:
This test is added to serve as a performance tester and a bug reproducer for kvm page table code (GPA->HPA mappings), it gives guidance for the people trying to make some improvement for kvm. And the following explains what we can exactly do through this test.
The function guest_code() can cover the conditions where a single vcpu or multiple vcpus access guest pages within the same memory region, in three VM stages(before dirty logging, during dirty logging, after dirty logging). Besides, the backing src memory type(ANONYMOUS/THP/HUGETLB) of the tested memory region can be specified by users, which means normal page mappings or block mappings can be chosen by users to be created in the test.
If ANONYMOUS memory is specified, kvm will create normal page mappings for the tested memory region before dirty logging, and update attributes of the page mappings from RO to RW during dirty logging. If THP/HUGETLB memory is specified, kvm will create block mappings for the tested memory region before dirty logging, and split the blcok mappings into normal page mappings during dirty logging, and coalesce the page mappings back into block mappings after dirty logging is stopped.
So in summary, as a performance tester, this test can present the performance of kvm creating/updating normal page mappings, or the performance of kvm creating/splitting/recovering block mappings, through execution time.
When we need to coalesce the page mappings back to block mappings after dirty logging is stopped, we have to firstly invalidate *all* the TLB entries for the page mappings right before installation of the block entry, because a TLB conflict abort error could occur if we can't invalidate the TLB entries fully. We have hit this TLB conflict twice on aarch64 software implementation and fixed it. As this test can imulate process from dirty logging enabled to dirty logging stopped of a VM with block mappings, so it can also reproduce this TLB conflict abort due to inadequate TLB invalidation when coalescing tables.
Links about the TLB conflict abort:
https://lore.kernel.org/lkml/[email protected]/
---
Change logs:
v2->v3:
- Add tags of Suggested-by, Reviewed-by in the patches
- Add a generic micro to get hugetlb page sizes
- Some changes for suggestions about v2 series
v1->v2:
- Add a patch to sync header files
- Add helpers to get granularity of different backing src types
- Some changes for suggestions about v1 series
---
Yanan Wang (7):
tools headers: sync headers of asm-generic/hugetlb_encode.h tools headers: Add a macro to get HUGETLB page sizes for mmap
KVM: selftests: Use flag CLOCK_MONOTONIC_RAW for timing
KVM: selftests: Make a generic helper to get vm guest mode strings
KVM: selftests: Add a helper to get system configured THP page size
KVM: selftests: List all hugetlb src types specified with page sizes
KVM: selftests: Adapt vm_userspace_mem_region_add to new helpers
KVM: selftests: Add a test for kvm page table code
include/uapi/linux/mman.h | 2 + tools/include/asm-generic/hugetlb_encode.h | 3 + tools/include/uapi/linux/mman.h | 2 + tools/testing/selftests/kvm/Makefile | 3 + .../selftests/kvm/demand_paging_test.c | 8 +- .../selftests/kvm/dirty_log_perf_test.c | 14 +- .../testing/selftests/kvm/include/kvm_util.h | 4 +- .../testing/selftests/kvm/include/test_util.h | 21 +- .../selftests/kvm/kvm_page_table_test.c | 476 ++++++++++++++++++ tools/testing/selftests/kvm/lib/kvm_util.c | 59 ++- tools/testing/selftests/kvm/lib/test_util.c | 92 +++- tools/testing/selftests/kvm/steal_time.c | 4 +- 12 files changed, 628 insertions(+), 60 deletions(-) create mode 100644 tools/testing/selftests/kvm/kvm_page_table_test.c
Signature · 1 line
2.19.1
RFC PATCH v3 1/8 tools headers: sync headers of asm-generic/hugetlb_encode.h
This patch syncs contents of tools/include/asm-generic/hugetlb_encode.h and include/uapi/asm-generic/hugetlb_encode.h. Arch powerpc supports 16KB hugepages and ARM64 supports 32MB/512MB hugepages. The corresponding mmap flags have already been added in include/uapi/asm-generic/hugetlb_encode.h, but not tools/include/asm-generic/hugetlb_encode.h.
--- tools/include/asm-generic/hugetlb_encode.h | 3 +++ 1 file changed, 3 insertions(+)
tools/include/asm-generic/hugetlb_encode.h +3 -0
@@ -20,13 +20,16 @@#define HUGETLB_FLAG_ENCODE_SHIFT 26#define HUGETLB_FLAG_ENCODE_MASK 0x3f +#define HUGETLB_FLAG_ENCODE_16KB (14 << HUGETLB_FLAG_ENCODE_SHIFT)#define HUGETLB_FLAG_ENCODE_64KB (16 << HUGETLB_FLAG_ENCODE_SHIFT)#define HUGETLB_FLAG_ENCODE_512KB (19 << HUGETLB_FLAG_ENCODE_SHIFT)#define HUGETLB_FLAG_ENCODE_1MB (20 << HUGETLB_FLAG_ENCODE_SHIFT)#define HUGETLB_FLAG_ENCODE_2MB (21 << HUGETLB_FLAG_ENCODE_SHIFT)#define HUGETLB_FLAG_ENCODE_8MB (23 << HUGETLB_FLAG_ENCODE_SHIFT)#define HUGETLB_FLAG_ENCODE_16MB (24 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_32MB (25 << HUGETLB_FLAG_ENCODE_SHIFT)#define HUGETLB_FLAG_ENCODE_256MB (28 << HUGETLB_FLAG_ENCODE_SHIFT) +#define HUGETLB_FLAG_ENCODE_512MB (29 << HUGETLB_FLAG_ENCODE_SHIFT)#define HUGETLB_FLAG_ENCODE_1GB (30 << HUGETLB_FLAG_ENCODE_SHIFT)#define HUGETLB_FLAG_ENCODE_2GB (31 << HUGETLB_FLAG_ENCODE_SHIFT)#define HUGETLB_FLAG_ENCODE_16GB (34 << HUGETLB_FLAG_ENCODE_SHIFT)
Signature · 1 line
2.23.0
RFC PATCH v3 2/8 tools headers: Add a macro to get HUGETLB page sizes for mmap
In reply to Yanan WangWe know that if a system supports multiple hugetlb page sizes, the desired hugetlb page size can be specified in bits [26:31] of the flag arguments. The value in these 6 bits will be the shift of each hugetlb page size.
So add a macro to get the page size shift and then calculate the corresponding hugetlb page size, using flag x.
--- include/uapi/linux/mman.h | 2 ++ tools/include/uapi/linux/mman.h | 2 ++ 2 files changed, 4 insertions(+)
include/uapi/linux/mman.h +2 -0
@@ -41,4 +41,6 @@#define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB#define MAP_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB +#define MAP_HUGE_PAGE_SIZE (x) (1 << ((x >> MAP_HUGE_SHIFT) & MAP_HUGE_MASK)) +#endif /* _UAPI_LINUX_MMAN_H */
tools/include/uapi/linux/mman.h +2 -0
@@ -41,4 +41,6 @@#define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB#define MAP_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB +#define MAP_HUGE_PAGE_SIZE (x) (1 << ((x >> MAP_HUGE_SHIFT) & MAP_HUGE_MASK)) +#endif /* _UAPI_LINUX_MMAN_H */
Signature · 1 line
2.23.0
RFC PATCH v3 3/8 KVM: selftests: Use flag CLOCK_MONOTONIC_RAW for timing
In reply to Yanan WangIn addition to function of CLOCK_MONOTONIC, flag CLOCK_MONOTONIC_RAW can also shield possiable impact of NTP, which can provide more robustness.
--- tools/testing/selftests/kvm/demand_paging_test.c | 8 ++++---- tools/testing/selftests/kvm/dirty_log_perf_test.c | 14 +++++++------- tools/testing/selftests/kvm/lib/test_util.c | 2 +- tools/testing/selftests/kvm/steal_time.c | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-)
tools/testing/selftests/kvm/demand_paging_test.c +4 -4
@@ -53,7 +53,7 @@ static void *vcpu_worker(void *data)vcpu_args_set (vm, vcpu_id,1 , vcpu_id); run =vcpu_state (vm, vcpu_id); -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start);/* Let the guest access its memory */ ret =_vcpu_run (vm, vcpu_id);
@@ -86,7 +86,7 @@ static int handle_uffd_page_request(int uffd, uint64_t addr) copy.len = perf_test_args.host_page_size; copy.mode =0 ; -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start); r =ioctl (uffd,UFFDIO_COPY , ©);if (r ==-1 ) {
@@ -123,7 +123,7 @@ static void *uffd_handler_thread_fn(void *arg)struct timespec start;struct timespec ts_diff; -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start);while (!quit_uffd_thread) {struct uffd_msg msg;struct pollfd pollfd[2 ];
@@ -336,7 +336,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)pr_info ("Finished creating vCPUs and starting uffd threads\n" ); -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start);for (vcpu_id =0 ; vcpu_id < nr_vcpus; vcpu_id++) { pthread_create(&vcpu_threads[vcpu_id], NULL, vcpu_worker,
tools/testing/selftests/kvm/dirty_log_perf_test.c +7 -7
@@ -50,7 +50,7 @@ static void *vcpu_worker(void *data)while (!READ_ONCE (host_quit)) {int current_iteration =READ_ONCE (iteration); -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start); ret =_vcpu_run (vm, vcpu_id); ts_diff =timespec_elapsed (start);
@@ -141,7 +141,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) iteration =0 ; host_quit = false; -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start);for (vcpu_id =0 ; vcpu_id < nr_vcpus; vcpu_id++) { vcpu_last_completed_iteration[vcpu_id] =-1 ;
@@ -162,7 +162,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) ts_diff.tv_sec, ts_diff.tv_nsec);/* Enable dirty logging */ -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start);vm_mem_region_set_flags (vm,PERF_TEST_MEM_SLOT_INDEX ,KVM_MEM_LOG_DIRTY_PAGES ); ts_diff =timespec_elapsed (start);
@@ -174,7 +174,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)* Incrementing the iteration number will start the vCPUs * dirtying memory again. */ -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start); iteration++;pr_debug ("Starting iteration %d\n" , iteration);
@@ -189,7 +189,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)pr_info ("Iteration %d dirty memory time: %ld.%.9lds\n" , iteration, ts_diff.tv_sec, ts_diff.tv_nsec); -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start);kvm_vm_get_dirty_log (vm,PERF_TEST_MEM_SLOT_INDEX , bmap); ts_diff =timespec_elapsed (start);
@@ -199,7 +199,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) iteration, ts_diff.tv_sec, ts_diff.tv_nsec);if (dirty_log_manual_caps) { -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start);kvm_vm_clear_dirty_log (vm,PERF_TEST_MEM_SLOT_INDEX , bmap,0 , host_num_pages);
@@ -212,7 +212,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) }/* Disable dirty logging */ -clock_gettime (CLOCK_MONOTONIC , &start); +clock_gettime (CLOCK_MONOTONIC_RAW , &start);vm_mem_region_set_flags (vm,PERF_TEST_MEM_SLOT_INDEX ,0 ); ts_diff =timespec_elapsed (start); pr_info("Disabling dirty logging time: %ld.%.9lds\n",
tools/testing/selftests/kvm/lib/test_util.c +1 -1
@@ -89,7 +89,7 @@ struct timespec timespec_elapsed(struct timespec start) {struct timespec end; -clock_gettime (CLOCK_MONOTONIC , &end); +clock_gettime (CLOCK_MONOTONIC_RAW , &end);return timespec_sub (end, start); }
tools/testing/selftests/kvm/steal_time.c +2 -2
@@ -237,11 +237,11 @@ static void *do_steal_time(void *arg) {struct timespec ts, stop; -clock_gettime (CLOCK_MONOTONIC , &ts); +clock_gettime (CLOCK_MONOTONIC_RAW , &ts); stop =timespec_add_ns (ts,MIN_RUN_DELAY_NS );while (1 ) { -clock_gettime (CLOCK_MONOTONIC , &ts); +clock_gettime (CLOCK_MONOTONIC_RAW , &ts);if (timespec_to_ns (timespec_sub (ts, stop)) >=0 )break ; }
Signature · 1 line
2.23.0
RFC PATCH v3 4/8 KVM: selftests: Make a generic helper to get vm guest mode strings
In reply to Yanan WangFor generality and conciseness, make an API which can be used in all kvm libs and selftests to get vm guest mode strings. And the index i is checked in the API in case of possiable faults.
--- .../testing/selftests/kvm/include/kvm_util.h | 4 +-- tools/testing/selftests/kvm/lib/kvm_util.c | 29 ++++++++++++------- 2 files changed, 19 insertions(+), 14 deletions(-)
tools/testing/selftests/kvm/include/kvm_util.h +1 -3
@@ -68,9 +68,6 @@ enum vm_guest_mode {#define MIN_PAGE_SIZE (1U << MIN_PAGE_SHIFT)#define PTES_PER_MIN_PAGE ptes_per_page(MIN_PAGE_SIZE) -#define vm_guest_mode_string (m) vm_guest_mode_string[m] -extern const char *const vm_guest_mode_string[]; -struct vm_guest_mode_params {unsigned int pa_bits;unsigned int va_bits;
@@ -84,6 +81,7 @@ int vm_enable_cap(struct kvm_vm *vm, struct kvm_enable_cap *cap);int vcpu_enable_cap (struct kvm_vm *vm,uint32_t vcpu_id,struct kvm_enable_cap *cap);void vm_enable_dirty_ring (struct kvm_vm *vm,uint32_t ring_size); +const char *vm_guest_mode_string (uint32_t i);struct kvm_vm *vm_create (enum vm_guest_mode mode,uint64_t phy_pages,int perm);void kvm_vm_free (struct kvm_vm *vmp);
tools/testing/selftests/kvm/lib/kvm_util.c +18 -11
@@ -141,17 +141,24 @@ static void vm_open(struct kvm_vm *vm, int perm) "rc: %i errno: %i", vm->fd, errno); } -const char *const vm_guest_mode_string[] = { -"PA-bits:52, VA-bits:48, 4K pages" , -"PA-bits:52, VA-bits:48, 64K pages" , -"PA-bits:48, VA-bits:48, 4K pages" , -"PA-bits:48, VA-bits:48, 64K pages" , -"PA-bits:40, VA-bits:48, 4K pages" , -"PA-bits:40, VA-bits:48, 64K pages" , -"PA-bits:ANY, VA-bits:48, 4K pages" , -}; -_Static_assert (sizeof (vm_guest_mode_string)/sizeof (char *) ==NUM_VM_MODES , -"Missing new mode strings?" ); +const char *vm_guest_mode_string (uint32_t i) +{ +static const char *const strings[] = { + [VM_MODE_P52V48_4K ] ="PA-bits:52, VA-bits:48, 4K pages" , + [VM_MODE_P52V48_64K ] ="PA-bits:52, VA-bits:48, 64K pages" , + [VM_MODE_P48V48_4K ] ="PA-bits:48, VA-bits:48, 4K pages" , + [VM_MODE_P48V48_64K ] ="PA-bits:48, VA-bits:48, 64K pages" , + [VM_MODE_P40V48_4K ] ="PA-bits:40, VA-bits:48, 4K pages" , + [VM_MODE_P40V48_64K ] ="PA-bits:40, VA-bits:48, 64K pages" , + [VM_MODE_PXXV48_4K ] ="PA-bits:ANY, VA-bits:48, 4K pages" , + }; +_Static_assert (sizeof (strings)/sizeof (char *) ==NUM_VM_MODES , +"Missing new mode strings?" ); + +TEST_ASSERT (i <NUM_VM_MODES ,"Guest mode ID %d too big" , i); + +return strings[i]; +}const struct vm_guest_mode_params vm_guest_mode_params[] = { {52 ,48 ,0x1000 ,12 },
Signature · 1 line
2.23.0
RFC PATCH v3 5/8 KVM: selftests: Add a helper to get system configured THP page size
In reply to Yanan WangIf we want to have some tests about transparent hugepages, the system configured THP hugepage size should better be known by the tests, which can be used for kinds of alignment or guest memory accessing of vcpus... So it makes sense to add a helper to get the transparent hugepage size.
With VM_MEM_SRC_ANONYMOUS_THP specified in vm_userspace_mem_region_add(), we now stat /sys/kernel/mm/transparent_hugepage to check whether THP is configured in the host kernel before madvise(). Based on this, we can also read file /sys/kernel/mm/transparent_hugepage/hpage_pmd_size to get THP hugepage size.
--- .../testing/selftests/kvm/include/test_util.h | 2 ++ tools/testing/selftests/kvm/lib/test_util.c | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+)
tools/testing/selftests/kvm/include/test_util.h +2 -0
@@ -78,6 +78,8 @@ struct vm_mem_backing_src_alias {enum vm_mem_backing_src_type type; }; +bool thp_configured (void ); +size_t get_trans_hugepagesz (void );void backing_src_help (void );enum vm_mem_backing_src_type parse_backing_src_type (const char *type_name);
tools/testing/selftests/kvm/lib/test_util.c +36 -0
@@ -10,6 +10,7 @@#include <limits.h> #include <stdlib.h> #include <time.h> +#include <sys/stat.h> #include "linux/kernel.h" #include "test_util.h"
@@ -117,6 +118,41 @@ const struct vm_mem_backing_src_alias backing_src_aliases[] = { {"anonymous_hugetlb", VM_MEM_SRC_ANONYMOUS_HUGETLB,}, }; +bool thp_configured (void ) +{ +int ret; +struct stat statbuf; + + ret =stat ("/sys/kernel/mm/transparent_hugepage" , &statbuf); +TEST_ASSERT (ret ==0 || (ret ==-1 && errno ==ENOENT ), +"Error in stating /sys/kernel/mm/transparent_hugepage: %d" , + errno); + +return ret ==0 ; +} + +size_t get_trans_hugepagesz (void ) +{ +size_t size; +char buf[16 ]; +FILE *f; + +TEST_ASSERT (thp_configured (),"THP is not configured in host kernel" ); + + f =fopen ("/sys/kernel/mm/transparent_hugepage/hpage_pmd_size" ,"r" ); +TEST_ASSERT (f !=NULL , +"Error in opening transparent_hugepage/hpage_pmd_size: %d" , + errno); + +if (fread (buf,sizeof (char ),sizeof (buf), f) ==0 ) { +fclose (f); +TEST_FAIL ("Unable to read transparent_hugepage/hpage_pmd_size" ); + } + + size =strtoull (buf,NULL ,10 ); +return size; +} +void backing_src_help (void ) {int i;
Signature · 1 line
2.23.0
RFC PATCH v3 6/8 KVM: selftests: List all hugetlb src types specified with page sizes
In reply to Yanan WangWith VM_MEM_SRC_ANONYMOUS_HUGETLB, we currently can only use system default hugetlb pages to back the testing guest memory. In order to add flexibility, now list all the known hugetlb backing src types with different page sizes, so that we can specify use of hugetlb pages of the exact granularity that we want. And as all the known hugetlb page sizes are listed, it's appropriate for all architectures.
Besides, the helper get_backing_src_pagesz() is added to get the granularity of different backing src types(anonumous, thp, hugetlb).
--- .../testing/selftests/kvm/include/test_util.h | 19 ++++++- tools/testing/selftests/kvm/lib/kvm_util.c | 2 +- tools/testing/selftests/kvm/lib/test_util.c | 56 +++++++++++++++---- 3 files changed, 63 insertions(+), 14 deletions(-)
tools/testing/selftests/kvm/include/test_util.h +17 -2
@@ -70,16 +70,31 @@ struct timespec timespec_div(struct timespec ts, int divisor);enum vm_mem_backing_src_type {VM_MEM_SRC_ANONYMOUS ,VM_MEM_SRC_ANONYMOUS_THP , -VM_MEM_SRC_ANONYMOUS_HUGETLB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_16KB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_64KB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_512KB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_1MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_2MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_8MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_16MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_32MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_256MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_512MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_1GB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_2GB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_16GB , +NUM_SRC_TYPES , };struct vm_mem_backing_src_alias {const char *name; -enum vm_mem_backing_src_type type; +uint32_t flag; };bool thp_configured (void );size_t get_trans_hugepagesz (void ); +const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias (uint32_t i); +size_t get_backing_src_pagesz (uint32_t i);void backing_src_help (void );enum vm_mem_backing_src_type parse_backing_src_type (const char *type_name);
tools/testing/selftests/kvm/lib/kvm_util.c +1 -1
@@ -757,7 +757,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, region->mmap_start =mmap (NULL , region->mmap_size,PROT_READ |PROT_WRITE ,MAP_PRIVATE |MAP_ANONYMOUS - | (src_type ==VM_MEM_SRC_ANONYMOUS_HUGETLB ?MAP_HUGETLB :0 ), + |vm_mem_backing_src_alias (src_type)->flag,-1 ,0 ); TEST_ASSERT(region->mmap_start != MAP_FAILED, "test_malloc failed, mmap_start: %p errno: %i",
tools/testing/selftests/kvm/lib/test_util.c +45 -11
85 lines not on this page · raw message
Signature · 1 line
2.23.0
Re: [RFC PATCH v3 6/8] KVM: selftests: List all hugetlb src types specified with page sizes
Quoted 24 lines · Yanan Wang
With
VM_MEM_SRC_ANONYMOUS_HUGETLB, we currently can only use system default hugetlb pages to back the testing guest memory. In order to add flexibility, now list all the known hugetlb backing src types with different page sizes, so that we can specify use of hugetlb pages of the exact granularity that we want. And as all the known hugetlb page sizes are listed, it's appropriate for all architectures.Besides, the helper
get_backing_src_pagesz()is added to get the granularity of different backing srctypes(anonumous, thp, hugetlb).Suggested-by Ben Gardon <[email protected]>Signed-off-by Yanan Wang <[email protected]>--- .../testing/selftests/kvm/include/test_util.h | 19 ++++++- tools/testing/selftests/kvm/lib/kvm_util.c | 2 +- tools/testing/selftests/kvm/lib/test_util.c | 56 +++++++++++++++---- 3 files changed, 63 insertions(+), 14 deletions(-)tools/testing/selftests/kvm/include/test_util.h +0
-0
tools/testing/selftests/kvm/include/test_util.h struct timespec timespec_div(struct timespec ts, int divisor); · line 73
Quoted 4 lines
tools/testing/selftests/kvm/include/test_util.h +0
-1@@ -70,16 +70,31 @@ struct timespec timespec_div(struct timespec ts, int divisor);enum vm_mem_backing_src_type {VM_MEM_SRC_ANONYMOUS ,VM_MEM_SRC_ANONYMOUS_THP , -VM_MEM_SRC_ANONYMOUS_HUGETLB ,
I apologize I didn't catch this in v2, but it looks like this patch removes a default hugetlb size option. I could see this being intentional if we want to force developers to think about there being multiple page sizes, but it might also be nice for folks to have an option to use the system default hugepage size.
Otherwise, this series looks good to me. Please feel free to add
Quoted 137 lines
tools/testing/selftests/kvm/include/test_util.h +17
-1+VM_MEM_SRC_ANONYMOUS_HUGETLB_16KB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_64KB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_512KB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_1MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_2MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_8MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_16MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_32MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_256MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_512MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_1GB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_2GB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_16GB , + NUM_SRC_TYPES, };struct vm_mem_backing_src_alias {const char *name; -enum vm_mem_backing_src_type type; +uint32_t flag; };bool thp_configured (void );size_t get_trans_hugepagesz (void ); +const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias (uint32_t i); +size_t get_backing_src_pagesz (uint32_t i);void backing_src_help (void );enum vm_mem_backing_src_type parse_backing_src_type (const char *type_name);tools/testing/selftests/kvm/lib/kvm_util.c +1
-1@@ -757,7 +757,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, region->mmap_start =mmap (NULL , region->mmap_size,PROT_READ |PROT_WRITE ,MAP_PRIVATE |MAP_ANONYMOUS - | (src_type ==VM_MEM_SRC_ANONYMOUS_HUGETLB ?MAP_HUGETLB :0 ), + |vm_mem_backing_src_alias (src_type)->flag,-1 ,0 ); TEST_ASSERT(region->mmap_start != MAP_FAILED, "test_malloc failed, mmap_start: %p errno: %i",tools/testing/selftests/kvm/lib/test_util.c +45
-12@@ -11,6 +11,7 @@#include <stdlib.h> #include <time.h> #include <sys/stat.h> +#include <linux/mman.h> #include "linux/kernel.h" #include "test_util.h" @@ -112,12 +113,6 @@ void print_skip(const char *fmt, ...)puts (", skipping test" ); } -const struct vm_mem_backing_src_alias backing_src_aliases[] = { - {"anonymous" ,VM_MEM_SRC_ANONYMOUS ,}, - {"anonymous_thp" ,VM_MEM_SRC_ANONYMOUS_THP ,}, - {"anonymous_hugetlb" ,VM_MEM_SRC_ANONYMOUS_HUGETLB ,}, -}; -bool thp_configured (void ) {int ret;@@ -153,22 +148,61 @@ size_t get_trans_hugepagesz(void)return size; } +const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias (uint32_t i) +{ +static const struct vm_mem_backing_src_alias aliases[] = { + {"anonymous" ,0 }, + {"anonymous_thp" ,0 }, + {"anonymous_hugetlb_16kb" ,MAP_HUGETLB |MAP_HUGE_16KB }, + {"anonymous_hugetlb_64kb" ,MAP_HUGETLB |MAP_HUGE_64KB }, + {"anonymous_hugetlb_512kb" ,MAP_HUGETLB |MAP_HUGE_512KB }, + {"anonymous_hugetlb_1mb" ,MAP_HUGETLB |MAP_HUGE_1MB }, + {"anonymous_hugetlb_2mb" ,MAP_HUGETLB |MAP_HUGE_2MB }, + {"anonymous_hugetlb_8mb" ,MAP_HUGETLB |MAP_HUGE_8MB }, + {"anonymous_hugetlb_16mb" ,MAP_HUGETLB |MAP_HUGE_16MB }, + {"anonymous_hugetlb_32mb" ,MAP_HUGETLB |MAP_HUGE_32MB }, + {"anonymous_hugetlb_256mb" ,MAP_HUGETLB |MAP_HUGE_256MB }, + {"anonymous_hugetlb_512mb" ,MAP_HUGETLB |MAP_HUGE_512MB }, + {"anonymous_hugetlb_1gb" ,MAP_HUGETLB |MAP_HUGE_1GB }, + {"anonymous_hugetlb_2gb" ,MAP_HUGETLB |MAP_HUGE_2GB }, + {"anonymous_hugetlb_16gb" ,MAP_HUGETLB |MAP_HUGE_16GB }, + }; +_Static_assert (ARRAY_SIZE (aliases) ==NUM_SRC_TYPES , +"Missing new backing src types?" ); + +TEST_ASSERT (i <NUM_SRC_TYPES ,"Backing src type ID %d too big" , i); + +return &aliases[i]; +} + +size_t get_backing_src_pagesz (uint32_t i) +{ +uint32_t flag =vm_mem_backing_src_alias (i)->flag; + +if (i ==VM_MEM_SRC_ANONYMOUS ) +return getpagesize (); +if (i ==VM_MEM_SRC_ANONYMOUS_THP ) +return get_trans_hugepagesz (); + +return MAP_HUGE_PAGE_SIZE (flag); +} +void backing_src_help (void ) {int i;printf ("Available backing src types:\n" ); -for (i =0 ; i <ARRAY_SIZE (backing_src_aliases); i++) -printf ("\t%s\n" , backing_src_aliases[i].name); +for (i =0 ; i <NUM_SRC_TYPES ; i++) +printf ("\t%s\n" ,vm_mem_backing_src_alias (i)->name); }enum vm_mem_backing_src_type parse_backing_src_type (const char *type_name) {int i; -for (i =0 ; i <ARRAY_SIZE (backing_src_aliases); i++) -if (!strcmp (type_name, backing_src_aliases[i].name)) -return backing_src_aliases[i].type; +for (i =0 ; i <NUM_SRC_TYPES ; i++) +if (!strcmp (type_name,vm_mem_backing_src_alias (i)->name)) +return i;backing_src_help ();TEST_FAIL ("Unknown backing src type: %s" , type_name); --2.23.0
Re: [RFC PATCH v3 6/8] KVM: selftests: List all hugetlb src types specified with page sizes
Hi Ben,
Quoted 19 lines · Ben Gardon
Quoted 18 lines · Yanan Wang
With
VM_MEM_SRC_ANONYMOUS_HUGETLB, we currently can only use system default hugetlb pages to back the testing guest memory. In order to add flexibility, now list all the known hugetlb backing src types with different page sizes, so that we can specify use of hugetlb pages of the exact granularity that we want. And as all the known hugetlb page sizes are listed, it's appropriate for all architectures.Besides, the helper
get_backing_src_pagesz()is added to get the granularity of different backing srctypes(anonumous, thp, hugetlb).Suggested-by Ben Gardon <[email protected]>Signed-off-by Yanan Wang <[email protected]>--- .../testing/selftests/kvm/include/test_util.h | 19 ++++++- tools/testing/selftests/kvm/lib/kvm_util.c | 2 +- tools/testing/selftests/kvm/lib/test_util.c | 56 +++++++++++++++---- 3 files changed, 63 insertions(+), 14 deletions(-)
Quoted 14 lines
tools/testing/selftests/kvm/include/test_util.h struct timespec timespec_div(struct timespec ts, int divisor); · line 73
Quoted 9 lines
tools/testing/selftests/kvm/include/test_util.h +0
-1@@ -70,16 +70,31 @@ struct timespec timespec_div(struct timespec ts, int divisor);enum vm_mem_backing_src_type {VM_MEM_SRC_ANONYMOUS ,VM_MEM_SRC_ANONYMOUS_THP , -VM_MEM_SRC_ANONYMOUS_HUGETLB ,I apologize I didn't catch this in v2, but it looks like this patch removes a default hugetlb size option. I could see this being intentional if we want to force developers to think about there being multiple page sizes, but it might also be nice for folks to have an option to use the system default hugepage size.
Thanks for pointing out this. I was trying to let developers to use the accurate page size in all cases if they want to use hugetlb pages, so I removed the default enum of VM_MEM_SRC_ANONYMOUS_HUGETLB. But maybe it's not right to do so.
It's possible that a program just wants to use hugetlb pages and doesn't really care the page size and the default option is the best in this case. Anyway, I will add VM_MEM_SRC_ANONYMOUS_HUGETLB in next version :). As for the default hugetlb page size, it can be got by reading file /proc/meminfo.
Quoted 2 lines
Otherwise, this series looks good to me. Please feel free to add
Reviewed-by Ben Gardon <[email protected]>.
Thanks for your review of this series and the good suggestions,
Yanan
Quoted 138 lines
Quoted 135 lines
tools/testing/selftests/kvm/include/test_util.h +17
-1+VM_MEM_SRC_ANONYMOUS_HUGETLB_16KB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_64KB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_512KB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_1MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_2MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_8MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_16MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_32MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_256MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_512MB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_1GB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_2GB , +VM_MEM_SRC_ANONYMOUS_HUGETLB_16GB , + NUM_SRC_TYPES, };struct vm_mem_backing_src_alias {const char *name; -enum vm_mem_backing_src_type type; +uint32_t flag; };bool thp_configured (void );size_t get_trans_hugepagesz (void ); +const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias (uint32_t i); +size_t get_backing_src_pagesz (uint32_t i);void backing_src_help (void );enum vm_mem_backing_src_type parse_backing_src_type (const char *type_name);tools/testing/selftests/kvm/lib/kvm_util.c +1
-1@@ -757,7 +757,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, region->mmap_start =mmap (NULL , region->mmap_size,PROT_READ |PROT_WRITE ,MAP_PRIVATE |MAP_ANONYMOUS - | (src_type ==VM_MEM_SRC_ANONYMOUS_HUGETLB ?MAP_HUGETLB :0 ), + |vm_mem_backing_src_alias (src_type)->flag,-1 ,0 ); TEST_ASSERT(region->mmap_start != MAP_FAILED, "test_malloc failed, mmap_start: %p errno: %i",tools/testing/selftests/kvm/lib/test_util.c +45
-12@@ -11,6 +11,7 @@#include <stdlib.h> #include <time.h> #include <sys/stat.h> +#include <linux/mman.h> #include "linux/kernel.h" #include "test_util.h" @@ -112,12 +113,6 @@ void print_skip(const char *fmt, ...)puts (", skipping test" ); } -const struct vm_mem_backing_src_alias backing_src_aliases[] = { - {"anonymous" ,VM_MEM_SRC_ANONYMOUS ,}, - {"anonymous_thp" ,VM_MEM_SRC_ANONYMOUS_THP ,}, - {"anonymous_hugetlb" ,VM_MEM_SRC_ANONYMOUS_HUGETLB ,}, -}; -bool thp_configured (void ) {int ret;@@ -153,22 +148,61 @@ size_t get_trans_hugepagesz(void)return size; } +const struct vm_mem_backing_src_alias *vm_mem_backing_src_alias (uint32_t i) +{ +static const struct vm_mem_backing_src_alias aliases[] = { + {"anonymous" ,0 }, + {"anonymous_thp" ,0 }, + {"anonymous_hugetlb_16kb" ,MAP_HUGETLB |MAP_HUGE_16KB }, + {"anonymous_hugetlb_64kb" ,MAP_HUGETLB |MAP_HUGE_64KB }, + {"anonymous_hugetlb_512kb" ,MAP_HUGETLB |MAP_HUGE_512KB }, + {"anonymous_hugetlb_1mb" ,MAP_HUGETLB |MAP_HUGE_1MB }, + {"anonymous_hugetlb_2mb" ,MAP_HUGETLB |MAP_HUGE_2MB }, + {"anonymous_hugetlb_8mb" ,MAP_HUGETLB |MAP_HUGE_8MB }, + {"anonymous_hugetlb_16mb" ,MAP_HUGETLB |MAP_HUGE_16MB }, + {"anonymous_hugetlb_32mb" ,MAP_HUGETLB |MAP_HUGE_32MB }, + {"anonymous_hugetlb_256mb" ,MAP_HUGETLB |MAP_HUGE_256MB }, + {"anonymous_hugetlb_512mb" ,MAP_HUGETLB |MAP_HUGE_512MB }, + {"anonymous_hugetlb_1gb" ,MAP_HUGETLB |MAP_HUGE_1GB }, + {"anonymous_hugetlb_2gb" ,MAP_HUGETLB |MAP_HUGE_2GB }, + {"anonymous_hugetlb_16gb" ,MAP_HUGETLB |MAP_HUGE_16GB }, + }; +_Static_assert (ARRAY_SIZE (aliases) ==NUM_SRC_TYPES , +"Missing new backing src types?" ); + +TEST_ASSERT (i <NUM_SRC_TYPES ,"Backing src type ID %d too big" , i); + +return &aliases[i]; +} + +size_t get_backing_src_pagesz (uint32_t i) +{ +uint32_t flag =vm_mem_backing_src_alias (i)->flag; + +if (i ==VM_MEM_SRC_ANONYMOUS ) +return getpagesize (); +if (i ==VM_MEM_SRC_ANONYMOUS_THP ) +return get_trans_hugepagesz (); + +return MAP_HUGE_PAGE_SIZE (flag); +} +void backing_src_help (void ) {int i;printf ("Available backing src types:\n" ); -for (i =0 ; i <ARRAY_SIZE (backing_src_aliases); i++) -printf ("\t%s\n" , backing_src_aliases[i].name); +for (i =0 ; i <NUM_SRC_TYPES ; i++) +printf ("\t%s\n" ,vm_mem_backing_src_alias (i)->name); }enum vm_mem_backing_src_type parse_backing_src_type (const char *type_name) {int i; -for (i =0 ; i <ARRAY_SIZE (backing_src_aliases); i++) -if (!strcmp (type_name, backing_src_aliases[i].name)) -return backing_src_aliases[i].type; +for (i =0 ; i <NUM_SRC_TYPES ; i++) +if (!strcmp (type_name,vm_mem_backing_src_alias (i)->name)) +return i;backing_src_help ();TEST_FAIL ("Unknown backing src type: %s" , type_name); --Quoted 2 lines
2.23.0
.
RFC PATCH v3 7/8 KVM: selftests: Adapt vm_userspace_mem_region_add to new helpers
In reply to Yanan WangWith VM_MEM_SRC_ANONYMOUS_THP specified in vm_userspace_mem_region_add(), we have to get the transparent hugepage size for HVA alignment. With the new helpers, we can use get_backing_src_pagesz() to check whether THP is configured and then get the exact configured hugepage size.
As different architectures may have different THP page sizes configured, this can get the accurate THP page sizes on any platform.
--- tools/testing/selftests/kvm/lib/kvm_util.c | 28 +++++++--------------- 1 file changed, 9 insertions(+), 19 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +9 -19
@@ -18,7 +18,6 @@#include <unistd.h> #include <linux/kernel.h> -#define KVM_UTIL_PGS_PER_HUGEPG 512#define KVM_UTIL_MIN_PFN 2/* Aligns x up to the next multiple of size. Size must be a power of 2. */
@@ -686,7 +685,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, {int ret;struct userspace_mem_region *region; -size_t huge_page_size =KVM_UTIL_PGS_PER_HUGEPG * vm->page_size; +size_t backing_src_pagesz =get_backing_src_pagesz (src_type);size_t alignment; TEST_ASSERT(vm_adjust_num_guest_pages(vm->mode, npages) == npages,
@@ -748,7 +747,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm,#endif if (src_type ==VM_MEM_SRC_ANONYMOUS_THP ) - alignment =max (huge_page_size, alignment); + alignment =max (backing_src_pagesz, alignment);/* Add enough memory to align up if necessary */ if (alignment >1 )
@@ -767,22 +766,13 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, region->host_mem =align (region->mmap_start, alignment);/* As needed perform madvise */ -if (src_type ==VM_MEM_SRC_ANONYMOUS || src_type ==VM_MEM_SRC_ANONYMOUS_THP ) { -struct stat statbuf; - - ret =stat ("/sys/kernel/mm/transparent_hugepage" , &statbuf); -TEST_ASSERT (ret ==0 || (ret ==-1 && errno ==ENOENT ), -"stat /sys/kernel/mm/transparent_hugepage" ); - -TEST_ASSERT (ret ==0 || src_type !=VM_MEM_SRC_ANONYMOUS_THP , -"VM_MEM_SRC_ANONYMOUS_THP requires THP to be configured in the host kernel" ); - -if (ret ==0 ) { - ret =madvise (region->host_mem, npages * vm->page_size, - src_type ==VM_MEM_SRC_ANONYMOUS ?MADV_NOHUGEPAGE :MADV_HUGEPAGE ); -TEST_ASSERT (ret ==0 ,"madvise failed, addr: %p length: 0x%lx src_type: %x" , - region->host_mem, npages * vm->page_size, src_type); - } +if ((src_type ==VM_MEM_SRC_ANONYMOUS || + src_type ==VM_MEM_SRC_ANONYMOUS_THP ) &&thp_configured ()) { + ret =madvise (region->host_mem, npages * vm->page_size, + src_type ==VM_MEM_SRC_ANONYMOUS ?MADV_NOHUGEPAGE :MADV_HUGEPAGE ); +TEST_ASSERT (ret ==0 ,"madvise failed, addr: %p length: 0x%lx src_type: %s" , + region->host_mem, npages * vm->page_size, +vm_mem_backing_src_alias (src_type)->name); } region->unused_phy_pages =sparsebit_alloc ();
Signature · 1 line
2.23.0
RFC PATCH v3 8/8 KVM: selftests: Add a test for kvm page table code
In reply to Yanan WangThis test serves as a performance tester and a bug reproducer for kvm page table code (GPA->HPA mappings), so it gives guidance for people trying to make some improvement for kvm.
The function guest_code() can cover the conditions where a single vcpu or multiple vcpus access guest pages within the same memory region, in three VM stages(before dirty logging, during dirty logging, after dirty logging). Besides, the backing src memory type(ANONYMOUS/THP/HUGETLB) of the tested memory region can be specified by users, which means normal page mappings or block mappings can be chosen by users to be created in the test.
If ANONYMOUS memory is specified, kvm will create normal page mappings for the tested memory region before dirty logging, and update attributes of the page mappings from RO to RW during dirty logging. If THP/HUGETLB memory is specified, kvm will create block mappings for the tested memory region before dirty logging, and split the blcok mappings into normal page mappings during dirty logging, and coalesce the page mappings back into block mappings after dirty logging is stopped.
So in summary, as a performance tester, this test can present the performance of kvm creating/updating normal page mappings, or the performance of kvm creating/splitting/recovering block mappings, through execution time.
When we need to coalesce the page mappings back to block mappings after dirty logging is stopped, we have to firstly invalidate *all* the TLB entries for the page mappings right before installation of the block entry, because a TLB conflict abort error could occur if we can't invalidate the TLB entries fully. We have hit this TLB conflict twice on aarch64 software implementation and fixed it. As this test can imulate process from dirty logging enabled to dirty logging stopped of a VM with block mappings, so it can also reproduce this TLB conflict abort due to inadequate TLB invalidation when coalescing tables.
--- tools/testing/selftests/kvm/Makefile | 3 + .../selftests/kvm/kvm_page_table_test.c | 476 ++++++++++++++++++ 2 files changed, 479 insertions(+) create mode 100644 tools/testing/selftests/kvm/kvm_page_table_test.c
tools/testing/selftests/kvm/Makefile +3 -0
@@ -67,6 +67,7 @@ TEST_GEN_PROGS_x86_64 += x86_64/xen_vmcall_test TEST_GEN_PROGS_x86_64 += demand_paging_test TEST_GEN_PROGS_x86_64 += dirty_log_test TEST_GEN_PROGS_x86_64 += dirty_log_perf_test +TEST_GEN_PROGS_x86_64 += kvm_page_table_test TEST_GEN_PROGS_x86_64 += hardware_disable_test TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus TEST_GEN_PROGS_x86_64 += memslot_modification_stress_test
@@ -78,6 +79,7 @@ TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list-sve TEST_GEN_PROGS_aarch64 += demand_paging_test TEST_GEN_PROGS_aarch64 += dirty_log_test TEST_GEN_PROGS_aarch64 += dirty_log_perf_test +TEST_GEN_PROGS_aarch64 += kvm_page_table_test TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus TEST_GEN_PROGS_aarch64 += set_memory_region_test TEST_GEN_PROGS_aarch64 += steal_time
@@ -87,6 +89,7 @@ TEST_GEN_PROGS_s390x += s390x/resets 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_page_table_test TEST_GEN_PROGS_s390x += kvm_create_max_vcpus TEST_GEN_PROGS_s390x += set_memory_region_test
tools/testing/selftests/kvm/kvm_page_table_test.c new file +476 -0
476 lines not on this page · raw message
Signature · 1 line
2.23.0