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

virtio-devices: Reset offset properly upon unmap for virtio-fs.

Browse Source 
We should reset the offset to 0, when asked to remove the whole dax
mapping.

Signed-off-by: Hao Xu <howeyxu@tencent.com>
This commit is contained in:
Hao Xu 2023-02-24 19:05:55 +08:00 committed by Bo Chen
parent 44d9c7fd42
commit 862d267302
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
virtio-devices/src/vhost_user/fs.rs
View File

@ -117,7 +117,6 @@ impl VhostUserMasterReqHandler for SlaveReqHandler {
debug!("fs_slave_unmap"); debug!("fs_slave_unmap");
for i in 0..VHOST_USER_FS_SLAVE_ENTRIES { for i in 0..VHOST_USER_FS_SLAVE_ENTRIES {
let offset = fs.cache_offset[i];
let mut len = fs.len[i]; let mut len = fs.len[i];
// Ignore if the length is 0. // Ignore if the length is 0.
@ -127,9 +126,12 @@ impl VhostUserMasterReqHandler for SlaveReqHandler {
// Need to handle a special case where the slave ask for the unmapping // Need to handle a special case where the slave ask for the unmapping
// of the entire mapping. // of the entire mapping.
if len == 0xffff_ffff_ffff_ffff { let offset = if len == 0xffff_ffff_ffff_ffff {
len = self.cache_size; len = self.cache_size;
} 0
} else {
fs.cache_offset[i]
};
if !self.is_req_valid(offset, len) { if !self.is_req_valid(offset, len) {
return Err(io::Error::from_raw_os_error(libc::EINVAL)); return Err(io::Error::from_raw_os_error(libc::EINVAL));