External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vfio_user: Embed retry of getting region caps into 'get_region_info'

Browse Source 
Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2022-05-02 15:16:57 -07:00 committed by Sebastien Boeuf
parent 7fe399598d
commit c614dcb9f7
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
vfio_user/src/lib.rs
View File

@ -477,17 +477,7 @@ impl Client {
let num_regions = reply.num_regions; let num_regions = reply.num_regions;
let mut regions = Vec::new(); let mut regions = Vec::new();
for index in 0..num_regions { for index in 0..num_regions {
let (mut region_info, mut fd, mut sparse_areas) = self.get_region_info(index, None)?; let (region_info, fd, sparse_areas) = self.get_region_info(index)?;
if region_info.argsz > std::mem::size_of::<vfio_region_info>() as u32 {
// Note: workaround for https://github.com/rust-lang/rust/issues/71126 to compile with rust toolchian 1.56
let (_region_info, _fd, _sparse_areas) = self.get_region_info(
index,
Some(region_info.argsz - std::mem::size_of::<vfio_region_info>() as u32),
)?;
region_info = _region_info;
fd = _fd;
sparse_areas = _sparse_areas;
}
regions.push(Region { regions.push(Region {
flags: region_info.flags, flags: region_info.flags,
index: region_info.index, index: region_info.index,
@ -503,7 +493,6 @@ impl Client {
fn get_region_info( fn get_region_info(
&mut self, &mut self,
index: u32, index: u32,
cap_size: Option<u32>,
) -> Result< ) -> Result<
( (
vfio_region_info, vfio_region_info,
@ -512,7 +501,8 @@ impl Client {
), ),
Error, Error,
> { > {
let get_region_info = DeviceGetRegionInfo { // Retrieve the region info without capability
let mut get_region_info = DeviceGetRegionInfo {
header: Header { header: Header {
message_id: self.next_message_id.0, message_id: self.next_message_id.0,
command: Command::DeviceGetRegionInfo, command: Command::DeviceGetRegionInfo,
@ -521,7 +511,7 @@ impl Client {
..Default::default() ..Default::default()
}, },
region_info: vfio_region_info { region_info: vfio_region_info {
argsz: size_of::<vfio_region_info>() as u32 + cap_size.unwrap_or_default(), argsz: size_of::<vfio_region_info>() as u32,
index, index,
..Default::default() ..Default::default()
}, },
@ -540,24 +530,40 @@ impl Client {
.map_err(Error::ReceiveWithFd)?; .map_err(Error::ReceiveWithFd)?;
debug!("Reply: {:?}", reply); debug!("Reply: {:?}", reply);
let sparse_areas = match cap_size { // Retrieve the region info again with capabilities if needed
Some(cap_size) => { if reply.region_info.argsz > std::mem::size_of::<vfio_region_info>() as u32 {
assert_eq!( get_region_info.region_info.argsz = reply.region_info.argsz;
cap_size, debug!("Command: {:?}", get_region_info);
reply.header.message_size - size_of::<DeviceGetRegionInfo>() as u32 self.next_message_id += Wrapping(1);
);
let mut cap_data = Vec::with_capacity(cap_size as usize);
cap_data.resize(cap_data.capacity(), 0u8);
self.stream
.read_exact(cap_data.as_mut_slice())
.map_err(Error::StreamRead)?;
Self::parse_region_caps(&cap_data, &reply.region_info)? self.stream
} .write_all(get_region_info.as_slice())
None => Vec::new(), .map_err(Error::StreamWrite)?;
};
Ok((reply.region_info, fd, sparse_areas)) let mut reply = DeviceGetRegionInfo::default();
let (_, fd) = self
.stream
.recv_with_fd(reply.as_mut_slice())
.map_err(Error::ReceiveWithFd)?;
debug!("Reply: {:?}", reply);
let cap_size = reply.region_info.argsz - std::mem::size_of::<vfio_region_info>() as u32;
assert_eq!(
cap_size,
reply.header.message_size - size_of::<DeviceGetRegionInfo>() as u32
);
let mut cap_data = Vec::with_capacity(cap_size as usize);
cap_data.resize(cap_data.capacity(), 0u8);
self.stream
.read_exact(cap_data.as_mut_slice())
.map_err(Error::StreamRead)?;
let sparse_areas = Self::parse_region_caps(&cap_data, &reply.region_info)?;
Ok((reply.region_info, fd, sparse_areas))
} else {
Ok((reply.region_info, fd, Vec::new()))
}
} }
fn parse_region_caps( fn parse_region_caps(