[PATCH kvmtool] arm64: THPs for systems with pages bigger than 4K

[Vincent Donnefort]

The THP support imposes an alignment of the memslot userspace address to
the size of a THP (PMD_SIZE). To do so, kvmtool overallocates the RAM
size and aligns it. However it assumes PMD_SIZE is 2MiB, which is only
true on 4KiB page systems.

Use a huge-page size, based on the system page size. This value can be
massive for a 64KiB page system, so skip the alignment if we couldn't
even install one THP.

Signed-off-by: Vincent Donnefort <vdonnefort at google.com>

diff --git a/arm64/kvm.c b/arm64/kvm.c
index 36b3284e4a92..2c01dc32fa9a 100644
--- a/arm64/kvm.c
+++ b/arm64/kvm.c
@@ -18,6 +18,8 @@
 
 #include <asm/image.h>
 
+#define HUGEPAGE_SIZE (PAGE_SIZE * (PAGE_SIZE / 8UL))
+
 static struct arm64_image_header *kernel_header;
 
 struct kvm_ext kvm_req_ext[] = {
@@ -35,20 +37,23 @@ bool kvm__arch_cpu_supports_vm(void)
 
 void kvm__init_ram(struct kvm *kvm)
 {
-	u64 phys_start, phys_size;
+	u64 phys_start, phys_size, ram_alloc_align = SZ_64K;
 	void *host_mem;
 	int err;
 
 	/*
-	 * Allocate guest memory. We must align our buffer to 64K to
-	 * correlate with the maximum guest page size for virtio-mmio.
-	 * If using THP, then our minimal alignment becomes 2M.
-	 * 2M trumps 64K, so let's go with that.
+	 * Allocate guest memory. We must align our buffer to 64K to correlate
+	 * with the maximum guest page size for virtio-mmio. If using THP, then
+	 * our minimal alignment trumps 64K, so let's go with that.
 	 */
 	kvm->ram_size = kvm->cfg.ram_size;
 	kvm->arch.ram_alloc_size = kvm->ram_size;
-	if (!kvm->cfg.hugetlbfs_path)
-		kvm->arch.ram_alloc_size += SZ_2M;
+	if (!kvm->cfg.hugetlbfs_path) {
+		if (kvm->ram_size >= HUGEPAGE_SIZE)
+			ram_alloc_align = HUGEPAGE_SIZE;
+
+		kvm->arch.ram_alloc_size += ram_alloc_align;
+	}
 
 	if (kvm->cfg.arch.guest_memfd)
 		kvm->arch.ram_alloc_start = mmap_guest_memfd(kvm,
@@ -63,7 +68,7 @@ void kvm__init_ram(struct kvm *kvm)
 		    kvm->arch.ram_alloc_size, errno);
 
 	kvm->ram_start = (void *)ALIGN((unsigned long)kvm->arch.ram_alloc_start,
-					SZ_2M);
+					ram_alloc_align);
 
 	if (!kvm->cfg.arch.guest_memfd) {
 		madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size,

base-commit: f67bc0bdae9433a9cfd05e65ea2c1bb6102566d9
-- 
2.56.0.176.g3575e65682-goog