External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-20 11:35:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Add hugetlbfs handling support

Browse Source 
The currently directory handling process to open tempfile by
OpenOptions with custom_flags(O_TMPFILE) is workable for tmp
filesystem, but not workable for hugetlbfs, add new directory
handling process which works fine for both tmpfs and hugetlbfs.

Signed-off-by: Cathy Zhang <cathy.zhang@intel.com>
This commit is contained in:
Cathy Zhang 2019-08-28 18:01:38 +08:00 committed by Rob Bradford
parent ce60ff16c4
commit 51306555e7
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vmm/src/vm.rs
View File

@ -45,7 +45,7 @@ use std::fs::{File, OpenOptions};
use std::io::{self, sink, stdout}; use std::io::{self, sink, stdout};
use std::ops::Deref; use std::ops::Deref;
use std::os::unix::fs::OpenOptionsExt; use std::os::unix::fs::OpenOptionsExt;
use std::os::unix::io::{AsRawFd, RawFd}; use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
use std::ptr::null_mut; use std::ptr::null_mut;
use std::sync::{Arc, Barrier, Mutex, RwLock}; use std::sync::{Arc, Barrier, Mutex, RwLock};
use std::{fmt, result, str, thread}; use std::{fmt, result, str, thread};
@ -1364,10 +1364,10 @@ impl<'a> Vm<'a> {
Some(file) => { Some(file) => {
let mut mem_regions = Vec::<(GuestAddress, usize, Option<FileOffset>)>::new(); let mut mem_regions = Vec::<(GuestAddress, usize, Option<FileOffset>)>::new();
for region in ram_regions.iter() { for region in ram_regions.iter() {
if file.is_file() {
let file = OpenOptions::new() let file = OpenOptions::new()
.read(true) .read(true)
.write(true) .write(true)
.custom_flags(O_TMPFILE)
.open(file) .open(file)
.map_err(Error::SharedFileCreate)?; .map_err(Error::SharedFileCreate)?;
@ -1375,6 +1375,20 @@ impl<'a> Vm<'a> {
.map_err(Error::SharedFileSetLen)?; .map_err(Error::SharedFileSetLen)?;
mem_regions.push((region.0, region.1, Some(FileOffset::new(file, 0)))); mem_regions.push((region.0, region.1, Some(FileOffset::new(file, 0))));
} else if file.is_dir() {
let fs_str = format!("{}{}", file.display(), "/tmpfile_XXXXXX");
let fs = std::ffi::CString::new(fs_str).unwrap();
let mut path = fs.as_bytes_with_nul().to_owned();
let path_ptr = path.as_mut_ptr() as *mut _;
let fd = unsafe { libc::mkstemp(path_ptr) };
unsafe { libc::unlink(path_ptr) };
let f = unsafe { File::from_raw_fd(fd) };
f.set_len(region.1 as u64)
.map_err(Error::SharedFileSetLen)?;
mem_regions.push((region.0, region.1, Some(FileOffset::new(f, 0))));
}
} }
GuestMemoryMmap::with_files(&mem_regions).map_err(Error::GuestMemory)? GuestMemoryMmap::with_files(&mem_regions).map_err(Error::GuestMemory)?