mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-10-23 04:46:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm64: Align RAM region with the block size

Browse source 
The arm64 KVM implementation requires userspace address block alignment
to enable transparent huge-pages.

BUG=b:278011447
Change-Id: I8b5c579dabb8397a7a6341bb80425ea515306157
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5272439
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Vincent Donnefort 2024-02-07 17:32:00 +00:00 committed by crosvm LUCI
parent 190cb45e6f
commit 88174c360b
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aarch64/src/lib.rs
View file

@ -364,6 +364,16 @@ fn load_kernel(
pub struct AArch64;
fn get_block_size() -> u64 {
let page_size = base::pagesize();
// Each PTE entry being 8 bytes long, we can fit in one page (page_size / 8)
// entries.
let ptes_per_page = page_size / 8;
let block_size = page_size * ptes_per_page;
block_size as u64
}
impl arch::LinuxArch for AArch64 {
type Error = Error;
@ -376,7 +386,7 @@ impl arch::LinuxArch for AArch64 {
let mut memory_regions = vec![(
GuestAddress(AARCH64_PHYS_MEM_START),
components.memory_size,
Default::default(),
MemoryRegionOptions::new().align(get_block_size()),
)];
// Allocate memory for the pVM firmware.

10
vm_memory/src/guest_memory.rs
View file

@ -130,6 +130,10 @@ pub struct MemoryRegionOptions {
/// which memory region is used for protected firwmare, static swiotlb,
/// or general purpose guest memory.
pub purpose: MemoryRegionPurpose,
/// Alignment for the mapping of this region. This intends to be used for
/// arm64 KVM support where a block alignment is required for transparent
/// huge-pages support
pub align: u64,
}
impl MemoryRegionOptions {
@ -141,6 +145,11 @@ impl MemoryRegionOptions {
self.purpose = purpose;
self
}
pub fn align(mut self, alignment: u64) -> Self {
self.align = alignment;
self
}
}
/// A regions of memory mapped memory.
@ -286,6 +295,7 @@ impl GuestMemory {
let mapping = MemoryMappingBuilder::new(size)
.from_shared_memory(shm.as_ref())
.offset(offset)
.align(range.2.align)
.build()
.map_err(Error::MemoryMappingFailed)?;