selftests: KVM: Add a test for eager page splitting
v3 cover selftests: KVM: Add a test for eager page splitting
David Matlack recently added a feature known as eager page splitting to x86 KVM. This feature improves vCPU performance during dirty logging because the splitting operation is moved out of the page fault path, avoiding EPT/NPT violations or allowing the vCPU threads to resolve the violation in the fast path.
While this feature is a great performance improvement, it does not have adequate testing in KVM selftests. Add a test to provide coverage of eager page splitting.
Patch 1 is a quick refactor to be able to re-use some code from dirty_log_perf_test.
Patch 2 adds the actual test.
V1->V2:
Run test in multiple modes, as suggested by David and Ricardo Cleanups from shameful copy-pasta, as suggested by DavidV2->V3:
Removed copyright notice from the top of dirty_log_page_splitting.c
Adopted ASSERT_EQ for test assertions
Now skipping testing with MANUAL_PROTECT if unsupported
Ben Gardon (2):
selftests: KVM: Move dirty logging functions to memstress.(c|h)
selftests: KVM: Add dirty logging page splitting test
tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/dirty_log_perf_test.c | 84 +----- .../selftests/kvm/include/kvm_util_base.h | 1 + .../testing/selftests/kvm/include/memstress.h | 8 + tools/testing/selftests/kvm/lib/kvm_util.c | 5 + tools/testing/selftests/kvm/lib/memstress.c | 72 +++++ .../x86_64/dirty_log_page_splitting_test.c | 254 ++++++++++++++++++ 7 files changed, 348 insertions(+), 77 deletions(-) create mode 100644 tools/testing/selftests/kvm/x86_64/dirty_log_page_splitting_test.c
Signature · 1 line
2.39.1.456.gfc5497dd1b-goog
PATCH v3 1/2 selftests: KVM: Move dirty logging functions to memstress.(c|h)
Move some helper functions from dirty_log_perf_test.c to the memstress library so that they can be used in a future commit which tests page splitting during dirty logging.
--- .../selftests/kvm/dirty_log_perf_test.c | 84 ++----------------- .../testing/selftests/kvm/include/memstress.h | 8 ++ tools/testing/selftests/kvm/lib/memstress.c | 72 ++++++++++++++++ 3 files changed, 87 insertions(+), 77 deletions(-)
tools/testing/selftests/kvm/dirty_log_perf_test.c +7 -77
@@ -136,77 +136,6 @@ struct test_params {bool random_access; }; -static void toggle_dirty_logging (struct kvm_vm *vm,int slots,bool enable) -{ -int i; - -for (i =0 ; i < slots; i++) { -int slot =MEMSTRESS_MEM_SLOT_INDEX + i; -int flags = enable ?KVM_MEM_LOG_DIRTY_PAGES :0 ; - -vm_mem_region_set_flags (vm, slot, flags); - } -} - -static inline void enable_dirty_logging (struct kvm_vm *vm,int slots) -{ -toggle_dirty_logging (vm, slots, true); -} - -static inline void disable_dirty_logging (struct kvm_vm *vm,int slots) -{ -toggle_dirty_logging (vm, slots, false); -} - -static void get_dirty_log (struct kvm_vm *vm,unsigned long *bitmaps[],int slots) -{ -int i; - -for (i =0 ; i < slots; i++) { -int slot =MEMSTRESS_MEM_SLOT_INDEX + i; - -kvm_vm_get_dirty_log (vm, slot, bitmaps[i]); - } -} - -static void clear_dirty_log (struct kvm_vm *vm,unsigned long *bitmaps[], -int slots,uint64_t pages_per_slot) -{ -int i; - -for (i =0 ; i < slots; i++) { -int slot =MEMSTRESS_MEM_SLOT_INDEX + i; - -kvm_vm_clear_dirty_log (vm, slot, bitmaps[i],0 , pages_per_slot); - } -} - -static unsigned long **alloc_bitmaps (int slots,uint64_t pages_per_slot) -{ -unsigned long **bitmaps; -int i; - - bitmaps =malloc (slots *sizeof (bitmaps[0 ])); -TEST_ASSERT (bitmaps,"Failed to allocate bitmaps array." ); - -for (i =0 ; i < slots; i++) { - bitmaps[i] =bitmap_zalloc (pages_per_slot); -TEST_ASSERT (bitmaps[i],"Failed to allocate slot bitmap." ); - } - -return bitmaps; -} - -static void free_bitmaps (unsigned long *bitmaps[],int slots) -{ -int i; - -for (i =0 ; i < slots; i++) -free (bitmaps[i]); - -free (bitmaps); -} -static void run_test (enum vm_guest_mode mode,void *arg) {struct test_params *p = arg;
@@ -236,7 +165,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) host_num_pages =vm_num_host_pages (mode, guest_num_pages); pages_per_slot = host_num_pages / p->slots; - bitmaps =alloc_bitmaps (p->slots, pages_per_slot); + bitmaps =memstress_alloc_bitmaps (p->slots, pages_per_slot);if (dirty_log_manual_caps) vm_enable_cap(vm, KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2,
@@ -277,7 +206,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)/* Enable dirty logging */ clock_gettime (CLOCK_MONOTONIC , &start); -enable_dirty_logging (vm, p->slots); +memstress_enable_dirty_logging (vm, p->slots); ts_diff =timespec_elapsed (start);pr_info ("Enabling dirty logging time: %ld.%.9lds\n\n" , ts_diff.tv_sec, ts_diff.tv_nsec);
@@ -306,7 +235,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) iteration, ts_diff.tv_sec, ts_diff.tv_nsec);clock_gettime (CLOCK_MONOTONIC , &start); -get_dirty_log (vm, bitmaps, p->slots); +memstress_get_dirty_log (vm, bitmaps, p->slots); ts_diff =timespec_elapsed (start); get_dirty_log_total =timespec_add (get_dirty_log_total, ts_diff);
@@ -315,7 +244,8 @@ static void run_test(enum vm_guest_mode mode, void *arg)if (dirty_log_manual_caps) {clock_gettime (CLOCK_MONOTONIC , &start); -clear_dirty_log (vm, bitmaps, p->slots, pages_per_slot); +memstress_clear_dirty_log (vm, bitmaps, p->slots, + pages_per_slot); ts_diff =timespec_elapsed (start); clear_dirty_log_total =timespec_add (clear_dirty_log_total, ts_diff);
@@ -334,7 +264,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)/* Disable dirty logging */ clock_gettime (CLOCK_MONOTONIC , &start); -disable_dirty_logging (vm, p->slots); +memstress_disable_dirty_logging (vm, p->slots); ts_diff =timespec_elapsed (start);pr_info ("Disabling dirty logging time: %ld.%.9lds\n" , ts_diff.tv_sec, ts_diff.tv_nsec);
@@ -359,7 +289,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) clear_dirty_log_total.tv_nsec, avg.tv_sec, avg.tv_nsec); } -free_bitmaps (bitmaps, p->slots); +memstress_free_bitmaps (bitmaps, p->slots);arch_cleanup_vm (vm);memstress_destroy_vm (vm); }
tools/testing/selftests/kvm/include/memstress.h +8 -0
@@ -72,4 +72,12 @@ void memstress_guest_code(uint32_t vcpu_id);uint64_t memstress_nested_pages (int nr_vcpus);void memstress_setup_nested (struct kvm_vm *vm,int nr_vcpus,struct kvm_vcpu *vcpus[]); +void memstress_enable_dirty_logging (struct kvm_vm *vm,int slots); +void memstress_disable_dirty_logging (struct kvm_vm *vm,int slots); +void memstress_get_dirty_log (struct kvm_vm *vm,unsigned long *bitmaps[],int slots); +void memstress_clear_dirty_log (struct kvm_vm *vm,unsigned long *bitmaps[], +int slots,uint64_t pages_per_slot); +unsigned long **memstress_alloc_bitmaps (int slots,uint64_t pages_per_slot); +void memstress_free_bitmaps (unsigned long *bitmaps[],int slots); +#endif /* SELFTEST_KVM_MEMSTRESS_H */
tools/testing/selftests/kvm/lib/memstress.c +72 -0
81 lines not on this page · raw message
Signature · 1 line
2.39.1.456.gfc5497dd1b-goog
PATCH v3 2/2 selftests: KVM: Add dirty logging page splitting test
In reply to Ben GardonAdd a test for page splitting during dirty logging and for hugepage recovery after dirty logging.
Page splitting represents non-trivial behavior, which is complicated by MANUAL_PROTECT mode, which causes pages to be split on the first clear, instead of when dirty logging is enabled.
Add a test which makes assertions about page counts to help define the expected behavior of page splitting and to provide needed coverage of the behavior. This also helps ensure that a failure in eager page splitting is not covered up by splitting in the vCPU path.
Tested by running the test on an Intel Haswell machine w/wo MANUAL_PROTECT.
--- tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/include/kvm_util_base.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 5 + .../x86_64/dirty_log_page_splitting_test.c | 254 ++++++++++++++++++ 4 files changed, 261 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86_64/dirty_log_page_splitting_test.c
tools/testing/selftests/kvm/Makefile +1 -0
@@ -61,6 +61,7 @@ TEST_PROGS_x86_64 += x86_64/nx_huge_pages_test.sh # Compiled test targets TEST_GEN_PROGS_x86_64 = x86_64/cpuid_test TEST_GEN_PROGS_x86_64 += x86_64/cr4_cpuid_sync_test +TEST_GEN_PROGS_x86_64 += x86_64/dirty_log_page_splitting_test TEST_GEN_PROGS_x86_64 += x86_64/get_msr_index_features TEST_GEN_PROGS_x86_64 += x86_64/exit_on_emulation_failure_test TEST_GEN_PROGS_x86_64 += x86_64/fix_hypercall_test
tools/testing/selftests/kvm/include/kvm_util_base.h +1 -0
@@ -213,6 +213,7 @@ extern const struct vm_guest_mode_params vm_guest_mode_params[];int open_path_or_exit (const char *path,int flags);int open_kvm_dev_path_or_exit (void ); +bool get_kvm_param_bool (const char *param);bool get_kvm_intel_param_bool (const char *param);bool get_kvm_amd_param_bool (const char *param);
tools/testing/selftests/kvm/lib/kvm_util.c +5 -0
@@ -80,6 +80,11 @@ static bool get_module_param_bool(const char *module_name, const char *param)TEST_FAIL ("Unrecognized value '%c' for boolean module param" , value); } +bool get_kvm_param_bool (const char *param) +{ +return get_module_param_bool ("kvm" , param); +} +bool get_kvm_intel_param_bool (const char *param) {return get_module_param_bool ("kvm_intel" , param);
tools/testing/selftests/kvm/x86_64/dirty_log_page_splitting_test.c new file +254 -0
254 lines not on this page · raw message
Signature · 1 line
2.39.1.456.gfc5497dd1b-goog