summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorZhenzhong Duan <zhenzhong.duan@intel.com>2021-05-12 12:31:06 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2021-05-27 07:45:53 -0400
commit39fe2fc96694164723846fccf6caa42c3aee6ec4 (patch)
tree56d77e22b8dc055e513bdf0fe0f84c30ddce6167 /tools
parentda6d63a0062a3ee721b84123b83ec093f25759b0 (diff)
downloadlinux-39fe2fc96694164723846fccf6caa42c3aee6ec4.tar.gz
linux-39fe2fc96694164723846fccf6caa42c3aee6ec4.tar.bz2
linux-39fe2fc96694164723846fccf6caa42c3aee6ec4.zip
selftests: kvm: make allocation of extra memory take effect
The extra memory pages is missed to be allocated during VM creating. perf_test_util and kvm_page_table_test use it to alloc extra memory currently. Fix it by adding extra_mem_pages to the total memory calculation before allocate. Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com> Message-Id: <20210512043107.30076-1-zhenzhong.duan@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/kvm/lib/kvm_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index fc83f6c5902d..159f4d62241d 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -295,7 +295,7 @@ struct kvm_vm *vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,
*/
uint64_t vcpu_pages = (DEFAULT_STACK_PGS + num_percpu_pages) * nr_vcpus;
uint64_t extra_pg_pages = (extra_mem_pages + vcpu_pages) / PTES_PER_MIN_PAGE * 2;
- uint64_t pages = DEFAULT_GUEST_PHY_PAGES + vcpu_pages + extra_pg_pages;
+ uint64_t pages = DEFAULT_GUEST_PHY_PAGES + extra_mem_pages + vcpu_pages + extra_pg_pages;
struct kvm_vm *vm;
int i;