External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-08 12:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Add constant SGX_PAGE_SIZE in memory_manager.rs

Browse Source 
Purpose: Do not directly use 0x1000 but use predefined constant value.

Signed-off-by: Ziye Yang <ziye.yang@intel.com>
This commit is contained in:
Ziye Yang 2021-11-29 07:16:03 +00:00 committed by Rob Bradford
parent 7fc0776aac
commit b09cbb8493
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vmm/src/memory_manager.rs
View File

@ -56,6 +56,9 @@ const SNAPSHOT_FILENAME: &str = "memory-ranges";
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
const X86_64_IRQ_BASE: u32 = 5; const X86_64_IRQ_BASE: u32 = 5;
#[cfg(target_arch = "x86_64")]
const SGX_PAGE_SIZE: u64 = 1 << 12;
const HOTPLUG_COUNT: usize = 8; const HOTPLUG_COUNT: usize = 8;
// Memory policy constants // Memory policy constants
@ -1617,7 +1620,7 @@ impl MemoryManager {
if epc_section.size == 0 { if epc_section.size == 0 {
return Err(Error::EpcSectionSizeInvalid); return Err(Error::EpcSectionSizeInvalid);
} }
if epc_section.size & 0x0fff != 0 { if epc_section.size & (SGX_PAGE_SIZE - 1) != 0 {
return Err(Error::EpcSectionSizeInvalid); return Err(Error::EpcSectionSizeInvalid);
} }
@ -1625,8 +1628,10 @@ impl MemoryManager {
} }
// Place the SGX EPC region on a 4k boundary between the RAM and the device area // Place the SGX EPC region on a 4k boundary between the RAM and the device area
let epc_region_start = let epc_region_start = GuestAddress(
GuestAddress(((self.start_of_device_area.0 + 0xfff) / 0x1000) * 0x1000); ((self.start_of_device_area.0 + SGX_PAGE_SIZE - 1) / SGX_PAGE_SIZE) * SGX_PAGE_SIZE,
);
self.start_of_device_area = epc_region_start self.start_of_device_area = epc_region_start
.checked_add(epc_region_size) .checked_add(epc_region_size)
.ok_or(Error::GuestAddressOverFlow)?; .ok_or(Error::GuestAddressOverFlow)?;