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

devices: block: protect disk_size with a mutex

Browse source 
This will allow the disk size to be changed from the worker thread
during resize operations.

BUG=chromium:858815
TEST=build_test

Change-Id: I0b2e1a057831856b44f19c2ba30b4dd1ffdeafc3
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1394151
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
This commit is contained in:
Daniel Verkamp 2019-01-03 09:40:01 -08:00 committed by chrome-bot
parent 2f0318fc81
commit 70eb15dbb7
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
devices/src/virtio/block.rs
View file

@ -13,6 +13,7 @@ use std::thread;
use std::time::Duration;
use std::u32;
use sync::Mutex;
use sys_util::Error as SysError;
use sys_util::Result as SysResult;
use sys_util::{
@ -618,7 +619,7 @@ impl<T: DiskFile> Worker<T> {
pub struct Block<T: DiskFile> {
kill_evt: Option<EventFd>,
disk_image: Option<T>,
disk_size: u64,
disk_size: Arc<Mutex<u64>>,
avail_features: u64,
read_only: bool,
}
@ -664,7 +665,7 @@ impl<T: DiskFile> Block<T> {
Ok(Block {
kill_evt: None,
disk_image: Some(disk_image),
disk_size,
disk_size: Arc::new(Mutex::new(disk_size)),
avail_features,
read_only,
})
@ -704,7 +705,10 @@ impl<T: 'static + AsRawFd + DiskFile + Send> VirtioDevice for Block<T> {
}
fn read_config(&self, offset: u64, mut data: &mut [u8]) {
let config_space = build_config_space(self.disk_size);
let config_space = {
let disk_size = self.disk_size.lock();
build_config_space(*disk_size)
};
let config_len = size_of_val(&config_space) as u64;
if offset >= config_len {
return;