mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-24 12:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

vm_memory: Update memfd variable name

Browse source 
Update memfd -> shm to better match downstream.

BUG=b:176188689
TEST=./build_test

Change-Id: I32ba56fe89938ca58130ba02878bad2cb1f5012e
Merged-In: I7e8c91fec76babd2f6f10f9f739e1d7a181b65e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2633888
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Michael Hoyle <mikehoyle@google.com>
This commit is contained in:
Michael Hoyle 2021-01-11 21:50:28 -08:00 committed by Commit Bot
parent c7236f2cf1
commit bc94c97300
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
vm_memory/src/guest_memory.rs
View file

@ -60,9 +60,9 @@ impl Display for Error {
MemoryMappingFailed(e) => write!(f, "failed to map guest memory: {}", e),
MemoryRegionOverlap => write!(f, "memory regions overlap"),
MemoryRegionTooLarge(size) => write!(f, "memory region size {} is too large", size),
MemoryNotAligned => write!(f, "memfd regions must be page aligned"),
MemoryCreationFailed(_) => write!(f, "failed to create memfd region"),
MemoryAddSealsFailed(e) => write!(f, "failed to set seals on memfd region: {}", e),
MemoryNotAligned => write!(f, "shm regions must be page aligned"),
MemoryCreationFailed(_) => write!(f, "failed to create shm region"),
MemoryAddSealsFailed(e) => write!(f, "failed to set seals on shm region: {}", e),
ShortWrite {
expected,
completed,
@ -111,23 +111,23 @@ impl MemoryRegion {
#[derive(Clone)]
pub struct GuestMemory {
regions: Arc<[MemoryRegion]>,
memfd: Arc<SharedMemory>,
shm: Arc<SharedMemory>,
}
impl AsRawDescriptor for GuestMemory {
fn as_raw_descriptor(&self) -> RawDescriptor {
self.memfd.as_raw_descriptor()
self.shm.as_raw_descriptor()
}
}
impl AsRef<SharedMemory> for GuestMemory {
fn as_ref(&self) -> &SharedMemory {
&self.memfd
&self.shm
}
}
impl GuestMemory {
/// Creates backing memfd for GuestMemory regions
/// Creates backing shm for GuestMemory regions
fn create_memfd(ranges: &[(GuestAddress, u64)]) -> Result<SharedMemory> {
let mut aligned_size = 0;
let pg_size = pagesize();
@ -145,21 +145,19 @@ impl GuestMemory {
seals.set_grow_seal();
seals.set_seal_seal();
let mut memfd = SharedMemory::named("crosvm_guest", aligned_size)
let mut shm = SharedMemory::named("crosvm_guest", aligned_size)
.map_err(Error::MemoryCreationFailed)?;
memfd
.add_seals(seals)
.map_err(Error::MemoryAddSealsFailed)?;
shm.add_seals(seals).map_err(Error::MemoryAddSealsFailed)?;
Ok(memfd)
Ok(shm)
}
/// Creates a container for guest memory regions.
/// Valid memory regions are specified as a Vec of (Address, Size) tuples sorted by Address.
pub fn new(ranges: &[(GuestAddress, u64)]) -> Result<GuestMemory> {
// Create memfd
// Create shm
let memfd = GuestMemory::create_memfd(ranges)?;
let shm = GuestMemory::create_memfd(ranges)?;
// Create memory regions
let mut regions = Vec::<MemoryRegion>::new();
let mut offset = 0;
@ -178,7 +176,7 @@ impl GuestMemory {
let size =
usize::try_from(range.1).map_err(|_| Error::MemoryRegionTooLarge(range.1))?;
let mapping = MemoryMappingBuilder::new(size)
.from_descriptor(&memfd)
.from_descriptor(&shm)
.offset(offset)
.build()
.map_err(Error::MemoryMappingFailed)?;
@ -193,7 +191,7 @@ impl GuestMemory {
Ok(GuestMemory {
regions: Arc::from(regions),
memfd: Arc::new(memfd),
shm: Arc::new(shm),
})
}
@ -637,11 +635,11 @@ impl GuestMemory {
})
}
/// Convert a GuestAddress into an offset within self.memfd.
/// Convert a GuestAddress into an offset within self.shm.
///
/// Due to potential gaps within GuestMemory, it is helpful to know the
/// offset within the memfd where a given address is found. This offset
/// can then be passed to another process mapping the memfd to read data
/// offset within the shm where a given address is found. This offset
/// can then be passed to another process mapping the shm to read data
/// starting at that address.
///
/// # Arguments