Commit da2a2d60 authored by Thomas Huth's avatar Thomas Huth Committed by Christian Borntraeger
Browse files

KVM: selftests: Align memory region addresses to 1M on s390x 



On s390x, there is a constraint that memory regions have to be aligned
to 1M (or running the VM will fail). Introduce a new "alignment" variable
in the vm_userspace_mem_region_add() function which now can be used for
both, huge page and s390x alignment requirements.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <20190523164309.13345-6-thuth@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
[prepare for THP as outlined by Andrew Jones]
parent fe85ec86

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

+16 −5
Original line number Original line Diff line number Diff line
@@ -557,6 +557,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
	int ret;

	int ret;

	struct userspace_mem_region *region;

	struct userspace_mem_region *region;

	size_t huge_page_size = KVM_UTIL_PGS_PER_HUGEPG * vm->page_size;

	size_t huge_page_size = KVM_UTIL_PGS_PER_HUGEPG * vm->page_size;

	size_t alignment;





	TEST_ASSERT((guest_paddr % vm->page_size) == 0, "Guest physical "

	TEST_ASSERT((guest_paddr % vm->page_size) == 0, "Guest physical "

		"address not on a page boundary.\n"

		"address not on a page boundary.\n"
@@ -606,9 +607,20 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
	TEST_ASSERT(region != NULL, "Insufficient Memory");

	TEST_ASSERT(region != NULL, "Insufficient Memory");

	region->mmap_size = npages * vm->page_size;

	region->mmap_size = npages * vm->page_size;





	/* Enough memory to align up to a huge page. */

#ifdef __s390x__

	/* On s390x, the host address must be aligned to 1M (due to PGSTEs) */

	alignment = 0x100000;

#else

	alignment = 1;

#endif



	if (src_type == VM_MEM_SRC_ANONYMOUS_THP)

	if (src_type == VM_MEM_SRC_ANONYMOUS_THP)

		region->mmap_size += huge_page_size;

		alignment = max(huge_page_size, alignment);



	/* Add enough memory to align up if necessary */

	if (alignment > 1)

		region->mmap_size += alignment;



	region->mmap_start = mmap(NULL, region->mmap_size,

	region->mmap_start = mmap(NULL, region->mmap_size,

				  PROT_READ | PROT_WRITE,

				  PROT_READ | PROT_WRITE,

				  MAP_PRIVATE | MAP_ANONYMOUS

				  MAP_PRIVATE | MAP_ANONYMOUS
@@ -618,9 +630,8 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
		    "test_malloc failed, mmap_start: %p errno: %i",

		    "test_malloc failed, mmap_start: %p errno: %i",

		    region->mmap_start, errno);

		    region->mmap_start, errno);





	/* Align THP allocation up to start of a huge page. */

	/* Align host address */

	region->host_mem = align(region->mmap_start,

	region->host_mem = align(region->mmap_start, alignment);

				 src_type == VM_MEM_SRC_ANONYMOUS_THP ?  huge_page_size : 1);





	/* As needed perform madvise */

	/* As needed perform madvise */

	if (src_type == VM_MEM_SRC_ANONYMOUS || src_type == VM_MEM_SRC_ANONYMOUS_THP) {

	if (src_type == VM_MEM_SRC_ANONYMOUS || src_type == VM_MEM_SRC_ANONYMOUS_THP) {