Now that the allocator allocates aligned memory, remove
arch-specific code and struct fields used for alignment.
No functional change intended.
Signed-off-by: Fuad Tabba <tabba@xxxxxxxxxx>
---
arm/include/arm-common/kvm-arch.h | 7 -------
arm/kvm.c | 31 +++++++++++--------------------
riscv/include/kvm/kvm-arch.h | 7 -------
riscv/kvm.c | 21 +++++++--------------
4 files changed, 18 insertions(+), 48 deletions(-)
diff --git a/arm/include/arm-common/kvm-arch.h b/arm/include/arm-common/kvm-arch.h
index b2ae373..654abc9 100644
--- a/arm/include/arm-common/kvm-arch.h
+++ b/arm/include/arm-common/kvm-arch.h
@@ -96,13 +96,6 @@ static inline bool arm_addr_in_ioport_region(u64 phys_addr)
}
struct kvm_arch {
- /*
- * We may have to align the guest memory for virtio, so keep the
- * original pointers here for munmap.
- */
- void *ram_alloc_start;
- u64 ram_alloc_size;
-
/*
* Guest addresses for memory layout.
*/
diff --git a/arm/kvm.c b/arm/kvm.c
index 0e5bfad..770075e 100644
--- a/arm/kvm.c
+++ b/arm/kvm.c
@@ -27,7 +27,6 @@ bool kvm__arch_cpu_supports_vm(void)
void kvm__init_ram(struct kvm *kvm)
{
u64 phys_start, phys_size;
- void *host_mem;
int err;
/*
@@ -37,42 +36,34 @@ void kvm__init_ram(struct kvm *kvm)
* 2M trumps 64K, so let's go with that.
*/
kvm->ram_size = kvm->cfg.ram_size;
- kvm->arch.ram_alloc_size = kvm->ram_size;
- kvm->arch.ram_alloc_start = mmap_anon_or_hugetlbfs_align(kvm,
- kvm->cfg.hugetlbfs_path,
- kvm->arch.ram_alloc_size,
- SZ_2M);
+ kvm->ram_start = mmap_anon_or_hugetlbfs_align(kvm,
+ kvm->cfg.hugetlbfs_path,
+ kvm->ram_size, SZ_2M);
- if (kvm->arch.ram_alloc_start == MAP_FAILED)
+ if (kvm->ram_start == MAP_FAILED)
die("Failed to map %lld bytes for guest memory (%d)",
- kvm->arch.ram_alloc_size, errno);
+ kvm->ram_size, errno);
- kvm->ram_start = kvm->arch.ram_alloc_start;
-
- madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size,
- MADV_MERGEABLE);
-
- madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size,
- MADV_HUGEPAGE);
+ madvise(kvm->ram_start, kvm->ram_size, MADV_MERGEABLE);
+ madvise(kvm->ram_start, kvm->ram_size, MADV_HUGEPAGE);
phys_start = kvm->cfg.ram_addr;
phys_size = kvm->ram_size;
- host_mem = kvm->ram_start;
- err = kvm__register_ram(kvm, phys_start, phys_size, host_mem);
+ err = kvm__register_ram(kvm, phys_start, phys_size, kvm->ram_start);
if (err)
die("Failed to register %lld bytes of memory at physical "
"address 0x%llx [err %d]", phys_size, phys_start, err);
kvm->arch.memory_guest_start = phys_start;
- pr_debug("RAM created at 0x%llx - 0x%llx (host_mem 0x%llx)",
- phys_start, phys_start + phys_size - 1, (u64)host_mem);
+ pr_debug("RAM created at 0x%llx - 0x%llx (host ram_start 0x%llx)",
+ phys_start, phys_start + phys_size - 1, (u64)kvm->ram_start);
}
void kvm__arch_delete_ram(struct kvm *kvm)
{
- munmap(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size);
+ munmap(kvm->ram_start, kvm->ram_size);
}
void kvm__arch_read_term(struct kvm *kvm)
diff --git a/riscv/include/kvm/kvm-arch.h b/riscv/include/kvm/kvm-arch.h
index 1e130f5..5bb7eee 100644
--- a/riscv/include/kvm/kvm-arch.h
+++ b/riscv/include/kvm/kvm-arch.h
@@ -56,13 +56,6 @@
struct kvm;
struct kvm_arch {
- /*
- * We may have to align the guest memory for virtio, so keep the
- * original pointers here for munmap.
- */
- void *ram_alloc_start;
- u64 ram_alloc_size;
-
/*
* Guest addresses for memory layout.
*/
diff --git a/riscv/kvm.c b/riscv/kvm.c
index e26b4f0..d05b8e4 100644
--- a/riscv/kvm.c
+++ b/riscv/kvm.c
@@ -48,7 +48,7 @@ void kvm__init_ram(struct kvm *kvm)
void kvm__arch_delete_ram(struct kvm *kvm)
{
- munmap(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size);
+ munmap(kvm->ram_start, kvm->ram_size);
}
void kvm__arch_read_term(struct kvm *kvm)
@@ -70,23 +70,16 @@ void kvm__arch_init(struct kvm *kvm)
* 2M trumps 64K, so let's go with that.
*/
kvm->ram_size = min(kvm->cfg.ram_size, (u64)RISCV_MAX_MEMORY(kvm));
- kvm->arch.ram_alloc_size = kvm->ram_size;
- kvm->arch.ram_alloc_start = mmap_anon_or_hugetlbfs_align(kvm,
- kvm->cfg.hugetlbfs_path,
- kvm->arch.ram_alloc_size,
- SZ_2M);
+ kvm->ram_start = mmap_anon_or_hugetlbfs_align(kvm,
+ kvm->cfg.hugetlbfs_path,
+ kvm->ram_size, SZ_2M);
- if (kvm->arch.ram_alloc_start == MAP_FAILED)
+ if (kvm->ram_start == MAP_FAILED)
die("Failed to map %lld bytes for guest memory (%d)",
kvm->arch.ram_alloc_size, errno);
- kvm->ram_start = kvm->arch.ram_alloc_start;
-
- madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size,
- MADV_MERGEABLE);
-
- madvise(kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size,
- MADV_HUGEPAGE);
+ madvise(kvm->ram_start, kvm->ram_size, MADV_MERGEABLE);
+ madvise(kvm->ram_start, kvm->ram_size, MADV_HUGEPAGE);
}
#define FDT_ALIGN SZ_4M
--
2.38.1.431.g37b22c650d-goog
