[PATCH] selftests: KVM: use dirty logging to check if page stats work correctly
From: Mingwei Zhang
Date: Mon Aug 23 2021 - 01:16:38 EST
When dirty logging is enabled, KVM splits the all hugepage mapping in
NPT/EPT into the smallest 4K size. This property could be used to check if
the page stats metrics work properly in KVM mmu. At the same time, this
logic might be used the other way around: using page stats to verify if
dirty logging really splits all huge pages.
So add page stats checking in dirty logging performance selftest. In
particular, add checks in three locations:
- just after vm is created;
- after populating memory into vm but before enabling dirty logging;
- after turning off dirty logging.
Tested using commands:
- ./dirty_log_perf_test -s anonymous_hugetlb_1gb
- ./dirty_log_perf_test -s anonymous_thp
Cc: Sean Christopherson <seanjc@xxxxxxxxxx>
Cc: David Matlack <dmatlack@xxxxxxxxxx>
Cc: Jing Zhang <jingzhangos@xxxxxxxxxx>
Cc: Peter Xu <peterx@xxxxxxxxxx>
Suggested-by: Ben Gardon <bgorden@xxxxxxxxxx>
Signed-off-by: Mingwei Zhang <mizhang@xxxxxxxxxx>
---
.../selftests/kvm/dirty_log_perf_test.c | 30 +++++++++++++++++++
.../testing/selftests/kvm/include/test_util.h | 1 +
.../selftests/kvm/lib/perf_test_util.c | 3 ++
tools/testing/selftests/kvm/lib/test_util.c | 29 ++++++++++++++++++
4 files changed, 63 insertions(+)
diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c
index 3c30d0045d8d..e190f6860166 100644
--- a/tools/testing/selftests/kvm/dirty_log_perf_test.c
+++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c
@@ -19,6 +19,10 @@
#include "perf_test_util.h"
#include "guest_modes.h"
+#ifdef __x86_64__
+#include "processor.h"
+#endif
+
/* How many host loops to run by default (one KVM_GET_DIRTY_LOG for each loop)*/
#define TEST_HOST_LOOP_N 2UL
@@ -166,6 +170,14 @@ static void run_test(enum vm_guest_mode mode, void *arg)
vm = perf_test_create_vm(mode, nr_vcpus, guest_percpu_mem_size,
p->slots, p->backing_src);
+#ifdef __x86_64__
+ TEST_ASSERT(get_page_stats(X86_PAGE_SIZE_4K) == 0,
+ "4K page is non zero");
+ TEST_ASSERT(get_page_stats(X86_PAGE_SIZE_2M) == 0,
+ "2M page is non zero");
+ TEST_ASSERT(get_page_stats(X86_PAGE_SIZE_1G) == 0,
+ "1G page is non zero");
+#endif
perf_test_args.wr_fract = p->wr_fract;
guest_num_pages = (nr_vcpus * guest_percpu_mem_size) >> vm_get_page_shift(vm);
@@ -211,6 +223,16 @@ static void run_test(enum vm_guest_mode mode, void *arg)
pr_info("Populate memory time: %ld.%.9lds\n",
ts_diff.tv_sec, ts_diff.tv_nsec);
+#ifdef __x86_64__
+ TEST_ASSERT(get_page_stats(X86_PAGE_SIZE_4K) != 0,
+ "4K page is zero");
+ if (p->backing_src == VM_MEM_SRC_ANONYMOUS_THP)
+ TEST_ASSERT(get_page_stats(X86_PAGE_SIZE_2M) != 0,
+ "2M page is zero");
+ if (p->backing_src == VM_MEM_SRC_ANONYMOUS_HUGETLB_1GB)
+ TEST_ASSERT(get_page_stats(X86_PAGE_SIZE_1G) != 0,
+ "1G page is zero");
+#endif
/* Enable dirty logging */
clock_gettime(CLOCK_MONOTONIC, &start);
enable_dirty_logging(vm, p->slots);
@@ -256,6 +278,14 @@ static void run_test(enum vm_guest_mode mode, void *arg)
iteration, ts_diff.tv_sec, ts_diff.tv_nsec);
}
}
+#ifdef __x86_64__
+ TEST_ASSERT(get_page_stats(X86_PAGE_SIZE_4K) != 0,
+ "4K page is zero after dirty logging");
+ TEST_ASSERT(get_page_stats(X86_PAGE_SIZE_2M) == 0,
+ "2M page is non-zero after dirty logging");
+ TEST_ASSERT(get_page_stats(X86_PAGE_SIZE_1G) == 0,
+ "1G page is non-zero after dirty logging");
+#endif
/* Disable dirty logging */
clock_gettime(CLOCK_MONOTONIC, &start);
diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testing/selftests/kvm/include/test_util.h
index d79be15dd3d2..dca5fcf7aa87 100644
--- a/tools/testing/selftests/kvm/include/test_util.h
+++ b/tools/testing/selftests/kvm/include/test_util.h
@@ -102,6 +102,7 @@ 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);
+size_t get_page_stats(uint32_t page_level);
/*
* Whether or not the given source type is shared memory (as opposed to
diff --git a/tools/testing/selftests/kvm/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c
index 0ef80dbdc116..c2c532990fb0 100644
--- a/tools/testing/selftests/kvm/lib/perf_test_util.c
+++ b/tools/testing/selftests/kvm/lib/perf_test_util.c
@@ -96,6 +96,9 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus,
#ifdef __s390x__
/* Align to 1M (segment size) */
guest_test_phys_mem &= ~((1 << 20) - 1);
+#elif __x86_64__
+ /* Align to 1G (segment size) to allow hugepage mapping. */
+ guest_test_phys_mem &= ~((1 << 30) - 1);
#endif
pr_info("guest physical test memory offset: 0x%lx\n", guest_test_phys_mem);
diff --git a/tools/testing/selftests/kvm/lib/test_util.c b/tools/testing/selftests/kvm/lib/test_util.c
index af1031fed97f..07eb6b5c125e 100644
--- a/tools/testing/selftests/kvm/lib/test_util.c
+++ b/tools/testing/selftests/kvm/lib/test_util.c
@@ -15,6 +15,13 @@
#include "linux/kernel.h"
#include "test_util.h"
+#include "processor.h"
+
+static const char * const pagestat_filepaths[] = {
+ "/sys/kernel/debug/kvm/pages_4k",
+ "/sys/kernel/debug/kvm/pages_2m",
+ "/sys/kernel/debug/kvm/pages_1g",
+};
/*
* Parses "[0-9]+[kmgt]?".
@@ -141,6 +148,28 @@ size_t get_trans_hugepagesz(void)
return size;
}
+#ifdef __x86_64__
+size_t get_stats_from_file(const char *path)
+{
+ size_t value;
+ FILE *f;
+
+ f = fopen(path, "r");
+ TEST_ASSERT(f != NULL, "Error in opening file: %s\n", path);
+
+ fscanf(f, "%ld", &value);
+ fclose(f);
+
+ return value;
+}
+
+size_t get_page_stats(uint32_t page_level)
+{
+ TEST_ASSERT(page_level <= X86_PAGE_SIZE_1G, "page type error.");
+ return get_stats_from_file(pagestat_filepaths[page_level]);
+}
+#endif
+
size_t get_def_hugetlb_pagesz(void)
{
char buf[64];
--
2.33.0.rc2.250.ged5fa647cd-goog