On Wed, Nov 11, 2020 at 4:27 AM Andrew Jones <drjones@xxxxxxxxxx> wrote:
>
> Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
Reviewed-by: Ben Gardon <bgardon@xxxxxxxxxx>
> ---
> .../selftests/kvm/demand_paging_test.c | 2 +-
> .../selftests/kvm/dirty_log_perf_test.c | 2 -
> .../testing/selftests/kvm/include/kvm_util.h | 8 ++++
> .../selftests/kvm/include/perf_test_util.h | 47 +++++--------------
> tools/testing/selftests/kvm/lib/kvm_util.c | 9 +---
> 5 files changed, 21 insertions(+), 47 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/demand_paging_test.c b/tools/testing/selftests/kvm/demand_paging_test.c
> index 946161a9ce2d..b0c41de32e9b 100644
> --- a/tools/testing/selftests/kvm/demand_paging_test.c
> +++ b/tools/testing/selftests/kvm/demand_paging_test.c
> @@ -7,7 +7,7 @@
> * Copyright (C) 2019, Google, Inc.
> */
>
> -#define _GNU_SOURCE /* for program_invocation_name and pipe2 */
> +#define _GNU_SOURCE /* for pipe2 */
>
> #include <stdio.h>
> #include <stdlib.h>
> diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c
> index b448c17bd7aa..c606dbb36244 100644
> --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c
> +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c
> @@ -8,8 +8,6 @@
> * Copyright (C) 2020, Google, Inc.
> */
>
> -#define _GNU_SOURCE /* for program_invocation_name */
> -
> #include <stdio.h>
> #include <stdlib.h>
> #include <time.h>
> diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
> index bc8db80309f5..011e8c6b4600 100644
> --- a/tools/testing/selftests/kvm/include/kvm_util.h
> +++ b/tools/testing/selftests/kvm/include/kvm_util.h
> @@ -70,6 +70,14 @@ enum vm_guest_mode {
> #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;
> + unsigned int page_size;
> + unsigned int page_shift;
> +};
> +extern const struct vm_guest_mode_params vm_guest_mode_params[];
> +
> enum vm_mem_backing_src_type {
> VM_MEM_SRC_ANONYMOUS,
> VM_MEM_SRC_ANONYMOUS_THP,
> diff --git a/tools/testing/selftests/kvm/include/perf_test_util.h b/tools/testing/selftests/kvm/include/perf_test_util.h
> index 2618052057b1..5f0719629a4e 100644
> --- a/tools/testing/selftests/kvm/include/perf_test_util.h
> +++ b/tools/testing/selftests/kvm/include/perf_test_util.h
> @@ -13,9 +13,6 @@
>
> #define MAX_VCPUS 512
>
> -#define PAGE_SHIFT_4K 12
> -#define PTES_PER_4K_PT 512
> -
> #define TEST_MEM_SLOT_INDEX 1
>
> /* Default guest test virtual memory offset */
> @@ -94,41 +91,26 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, int vcpus,
> uint64_t vcpu_memory_bytes)
> {
> struct kvm_vm *vm;
> - uint64_t pages = DEFAULT_GUEST_PHY_PAGES;
> uint64_t guest_num_pages;
>
> - /* Account for a few pages per-vCPU for stacks */
> - pages += DEFAULT_STACK_PGS * vcpus;
> -
> - /*
> - * Reserve twice the ammount of memory needed to map the test region and
> - * the page table / stacks region, at 4k, for page tables. Do the
> - * calculation with 4K page size: the smallest of all archs. (e.g., 64K
> - * page size guest will need even less memory for page tables).
> - */
> - pages += (2 * pages) / PTES_PER_4K_PT;
> - pages += ((2 * vcpus * vcpu_memory_bytes) >> PAGE_SHIFT_4K) /
> - PTES_PER_4K_PT;
> - pages = vm_adjust_num_guest_pages(mode, pages);
> -
> pr_info("Testing guest mode: %s\n", vm_guest_mode_string(mode));
>
> - vm = vm_create(mode, pages, O_RDWR);
> - kvm_vm_elf_load(vm, program_invocation_name, 0, 0);
> -#ifdef __x86_64__
> - vm_create_irqchip(vm);
> -#endif
> -
> - perf_test_args.vm = vm;
> - perf_test_args.guest_page_size = vm_get_page_size(vm);
> perf_test_args.host_page_size = getpagesize();
> + perf_test_args.guest_page_size = vm_guest_mode_params[mode].page_size;
> +
> + guest_num_pages = vm_adjust_num_guest_pages(mode,
> + (vcpus * vcpu_memory_bytes) / perf_test_args.guest_page_size);
>
> + TEST_ASSERT(vcpu_memory_bytes % perf_test_args.host_page_size == 0,
> + "Guest memory size is not host page size aligned.");
> TEST_ASSERT(vcpu_memory_bytes % perf_test_args.guest_page_size == 0,
> "Guest memory size is not guest page size aligned.");
>
> - guest_num_pages = (vcpus * vcpu_memory_bytes) /
> - perf_test_args.guest_page_size;
> - guest_num_pages = vm_adjust_num_guest_pages(mode, guest_num_pages);
> + vm = vm_create_with_vcpus(mode, vcpus,
> + (vcpus * vcpu_memory_bytes) / perf_test_args.guest_page_size,
> + 0, guest_code, NULL);
> +
> + perf_test_args.vm = vm;
>
> /*
> * If there should be more memory in the guest test region than there
> @@ -140,18 +122,13 @@ static struct kvm_vm *create_vm(enum vm_guest_mode mode, int vcpus,
> guest_num_pages, vm_get_max_gfn(vm), vcpus,
> vcpu_memory_bytes);
>
> - TEST_ASSERT(vcpu_memory_bytes % perf_test_args.host_page_size == 0,
> - "Guest memory size is not host page size aligned.");
> -
> guest_test_phys_mem = (vm_get_max_gfn(vm) - guest_num_pages) *
> perf_test_args.guest_page_size;
> guest_test_phys_mem &= ~(perf_test_args.host_page_size - 1);
> -
> #ifdef __s390x__
> /* Align to 1M (segment size) */
> guest_test_phys_mem &= ~((1 << 20) - 1);
> #endif
> -
> pr_info("guest physical test memory offset: 0x%lx\n", guest_test_phys_mem);
>
> /* Add an extra memory slot for testing */
> @@ -177,8 +154,6 @@ static void add_vcpus(struct kvm_vm *vm, int vcpus, uint64_t vcpu_memory_bytes)
> for (vcpu_id = 0; vcpu_id < vcpus; vcpu_id++) {
> vcpu_args = &perf_test_args.vcpu_args[vcpu_id];
>
> - vm_vcpu_add_default(vm, vcpu_id, guest_code);
> -
> #ifdef __x86_64__
> vcpu_set_cpuid(vm, vcpu_id, kvm_get_supported_cpuid());
> #endif
> diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
> index b31a4e988a5d..ff4a0310c420 100644
> --- a/tools/testing/selftests/kvm/lib/kvm_util.c
> +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
> @@ -143,14 +143,7 @@ const char * const vm_guest_mode_string[] = {
> _Static_assert(sizeof(vm_guest_mode_string)/sizeof(char *) == NUM_VM_MODES,
> "Missing new mode strings?");
>
> -struct vm_guest_mode_params {
> - unsigned int pa_bits;
> - unsigned int va_bits;
> - unsigned int page_size;
> - unsigned int page_shift;
> -};
> -
> -static const struct vm_guest_mode_params vm_guest_mode_params[] = {
> +const struct vm_guest_mode_params vm_guest_mode_params[] = {
> { 52, 48, 0x1000, 12 },
> { 52, 48, 0x10000, 16 },
> { 48, 48, 0x1000, 12 },
> --
> 2.26.2
>
