KVM: selftests: Drop @slot0_mem_pages from __vm_create_with_vcpus()

All callers of __vm_create_with_vcpus() pass DEFAULT_GUEST_PHY_PAGES for
@slot_mem_pages; drop the param and just hardcode the "default" as the
base number of pages for slot0.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
index 45f536f993996ce947c55ae6e4a7d312b12ade9b..f84e01612c5284c922c9788f78a7c57dea539788 100644 (file)
--- a/tools/testing/selftests/kvm/include/kvm_util_base.h
+++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
@@ -561,18 +561,15 @@ static inline struct kvm_vm *vm_create(uint64_t nr_pages)
        return __vm_create(VM_MODE_DEFAULT, nr_pages);
 }
 
-/* Like vm_create_default_with_vcpus, but accepts mode and slot0 memory as a parameter */
 struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,
-                                     uint64_t slot0_mem_pages, uint64_t extra_mem_pages,
-                                     uint32_t num_percpu_pages, void *guest_code,
-                                     struct kvm_vcpu *vcpus[]);
+                                     uint64_t extra_mem_pages, uint32_t num_percpu_pages,
+                                     void *guest_code, struct kvm_vcpu *vcpus[]);
 
 static inline struct kvm_vm *vm_create_with_vcpus(uint32_t nr_vcpus,
                                                  void *guest_code,
                                                  struct kvm_vcpu *vcpus[])
 {
-       return __vm_create_with_vcpus(VM_MODE_DEFAULT, nr_vcpus,
-                                     DEFAULT_GUEST_PHY_PAGES, 0, 0,
+       return __vm_create_with_vcpus(VM_MODE_DEFAULT, nr_vcpus, 0, 0,
                                      guest_code, vcpus);
 }
 

diff --git a/tools/testing/selftests/kvm/kvm_page_table_test.c b/tools/testing/selftests/kvm/kvm_page_table_test.c
index 0f8792aa036683f976a070a1f9038a77cb6511f5..a68c57572ab4f38cf18f880cefc21b8160e685ae 100644 (file)
--- a/tools/testing/selftests/kvm/kvm_page_table_test.c
+++ b/tools/testing/selftests/kvm/kvm_page_table_test.c
@@ -254,9 +254,8 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg)
 
        /* Create a VM with enough guest pages */
        guest_num_pages = test_mem_size / guest_page_size;
-       vm = __vm_create_with_vcpus(mode, nr_vcpus, DEFAULT_GUEST_PHY_PAGES,
-                                   guest_num_pages, 0, guest_code,
-                                   test_args.vcpus);
+       vm = __vm_create_with_vcpus(mode, nr_vcpus, guest_num_pages, 0,
+                                   guest_code, test_args.vcpus);
 
        /* Align down GPA of the testing memslot */
        if (!p->phys_offset)

diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 548c3c366bf55483487e405410c8b1d2d847c238..342bcd576ad6ece74baf877932039091dda49ada 100644 (file)
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -280,7 +280,6 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t nr_pages)
  * Input Args:
  *   mode - VM Mode (e.g. VM_MODE_P52V48_4K)
  *   nr_vcpus - VCPU count
- *   slot0_mem_pages - Slot0 physical memory size
  *   extra_mem_pages - Non-slot0 physical memory total size
  *   num_percpu_pages - Per-cpu physical memory pages
  *   guest_code - Guest entry point
@@ -291,15 +290,13 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t nr_pages)
  * Return:
  *   Pointer to opaque structure that describes the created VM.
  *
- * Creates a VM with the mode specified by mode (e.g. VM_MODE_P52V48_4K),
- * with customized slot0 memory size, at least 512 pages currently.
+ * Creates a VM with the mode specified by mode (e.g. VM_MODE_P52V48_4K).
  * extra_mem_pages is only used to calculate the maximum page table size,
  * no real memory allocation for non-slot0 memory in this function.
  */
 struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,
-                                     uint64_t slot0_mem_pages, uint64_t extra_mem_pages,
-                                     uint32_t num_percpu_pages, void *guest_code,
-                                     struct kvm_vcpu *vcpus[])
+                                     uint64_t extra_mem_pages, uint32_t num_percpu_pages,
+                                     void *guest_code, struct kvm_vcpu *vcpus[])
 {
        uint64_t vcpu_pages, extra_pg_pages, pages;
        struct kvm_vm *vm;
@@ -307,10 +304,6 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus
 
        TEST_ASSERT(!nr_vcpus || vcpus, "Must provide vCPU array");
 
-       /* Force slot0 memory size not small than DEFAULT_GUEST_PHY_PAGES */
-       if (slot0_mem_pages < DEFAULT_GUEST_PHY_PAGES)
-               slot0_mem_pages = DEFAULT_GUEST_PHY_PAGES;
-
        /* The maximum page table size for a memory region will be when the
         * smallest pages are used. Considering each page contains x page
         * table descriptors, the total extra size for page tables (for extra
@@ -318,8 +311,8 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus
         * than N/x*2.
         */
        vcpu_pages = (DEFAULT_STACK_PGS + num_percpu_pages) * nr_vcpus;
-       extra_pg_pages = (slot0_mem_pages + extra_mem_pages + vcpu_pages) / PTES_PER_MIN_PAGE * 2;
-       pages = slot0_mem_pages + vcpu_pages + extra_pg_pages;
+       extra_pg_pages = (DEFAULT_GUEST_PHY_PAGES + extra_mem_pages + vcpu_pages) / PTES_PER_MIN_PAGE * 2;
+       pages = DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages;
 
        TEST_ASSERT(nr_vcpus <= kvm_check_cap(KVM_CAP_MAX_VCPUS),
                    "nr_vcpus = %d too large for host, max-vcpus = %d",
@@ -340,8 +333,8 @@ struct kvm_vm *__vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,
        struct kvm_vcpu *vcpus[1];
        struct kvm_vm *vm;
 
-       vm = __vm_create_with_vcpus(VM_MODE_DEFAULT, 1, DEFAULT_GUEST_PHY_PAGES,
-                                   extra_mem_pages, 0, guest_code, vcpus);
+       vm = __vm_create_with_vcpus(VM_MODE_DEFAULT, 1, extra_mem_pages, 0,
+                                   guest_code, vcpus);
 
        *vcpu = vcpus[0];
        return vm;

diff --git a/tools/testing/selftests/kvm/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c
index 2649595194ade0d5b9bfe888c357afcee8e18629..20d1b2ad75d1fa0a5b0f419ae9b183d72b4e415a 100644 (file)
--- a/tools/testing/selftests/kvm/lib/perf_test_util.c
+++ b/tools/testing/selftests/kvm/lib/perf_test_util.c
@@ -113,7 +113,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_vcpus,
 {
        struct perf_test_args *pta = &perf_test_args;
        struct kvm_vm *vm;
-       uint64_t guest_num_pages, slot0_pages = DEFAULT_GUEST_PHY_PAGES;
+       uint64_t guest_num_pages, slot0_pages = 0;
        uint64_t backing_src_pagesz = get_backing_src_pagesz(backing_src);
        uint64_t region_end_gfn;
        int i;
@@ -152,8 +152,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_vcpus,
         * The memory is also added to memslot 0, but that's a benign side
         * effect as KVM allows aliasing HVAs in meslots.
         */
-       vm = __vm_create_with_vcpus(mode, nr_vcpus, DEFAULT_GUEST_PHY_PAGES,
-                                   slot0_pages + guest_num_pages, 0,
+       vm = __vm_create_with_vcpus(mode, nr_vcpus, slot0_pages + guest_num_pages, 0,
                                    perf_test_guest_code, vcpus);
 
        pta->vm = vm;