Commit acaf50ad authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Drop @num_percpu_pages from __vm_create_with_vcpus() 



Drop @num_percpu_pages from __vm_create_with_vcpus(), all callers pass
'0' and there's unlikely to be a test that allocates just enough memory
that it needs a per-CPU allocation, but not so much that it won't just do
its own memory management.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3222d026

tools/testing/selftests/kvm/include/kvm_util_base.h

+2 −2
Original line number Diff line number Diff line
@@ -562,14 +562,14 @@ static inline struct kvm_vm *vm_create(uint64_t nr_pages) 
}



struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus,

				      uint64_t extra_mem_pages, uint32_t num_percpu_pages,

				      uint64_t extra_mem_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, 0, 0,

	return __vm_create_with_vcpus(VM_MODE_DEFAULT, nr_vcpus, 0,

				      guest_code, vcpus);

}

tools/testing/selftests/kvm/kvm_page_table_test.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ 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, guest_num_pages, 0,

	vm = __vm_create_with_vcpus(mode, nr_vcpus, guest_num_pages,

				    guest_code, test_args.vcpus);



	/* Align down GPA of the testing memslot */

tools/testing/selftests/kvm/lib/kvm_util.c

+3 −4
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t nr_pages) 
 *   mode - VM Mode (e.g. VM_MODE_P52V48_4K)

 *   nr_vcpus - VCPU count

 *   extra_mem_pages - Non-slot0 physical memory total size

 *   num_percpu_pages - Per-cpu physical memory pages

 *   guest_code - Guest entry point

 *   vcpuids - VCPU IDs

 *
@@ -295,7 +294,7 @@ struct kvm_vm *__vm_create(enum vm_guest_mode mode, uint64_t nr_pages) 
 * 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 extra_mem_pages, uint32_t num_percpu_pages,

				      uint64_t extra_mem_pages,

				      void *guest_code, struct kvm_vcpu *vcpus[])

{

	uint64_t vcpu_pages, extra_pg_pages, pages;
@@ -310,7 +309,7 @@ struct kvm_vm *__vm_create_with_vcpus(enum vm_guest_mode mode, uint32_t nr_vcpus 
	 * N pages) will be: N/x+N/x^2+N/x^3+... which is definitely smaller

	 * than N/x*2.

	 */

	vcpu_pages = (DEFAULT_STACK_PGS + num_percpu_pages) * nr_vcpus;

	vcpu_pages = nr_vcpus * DEFAULT_STACK_PGS;

	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;
@@ -333,7 +332,7 @@ 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, extra_mem_pages, 0,

	vm = __vm_create_with_vcpus(VM_MODE_DEFAULT, 1, extra_mem_pages,

				    guest_code, vcpus);



	*vcpu = vcpus[0];

tools/testing/selftests/kvm/lib/perf_test_util.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +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, slot0_pages + guest_num_pages, 0,

	vm = __vm_create_with_vcpus(mode, nr_vcpus, slot0_pages + guest_num_pages,

				    perf_test_guest_code, vcpus);



	pta->vm = vm;