diff options
| -rw-r--r-- | devices/src/virtio/controller.rs | 102 | ||||
| -rw-r--r-- | src/linux.rs | 6 | ||||
| -rw-r--r-- | src/wl.rs | 39 |
3 files changed, 69 insertions, 78 deletions
diff --git a/devices/src/virtio/controller.rs b/devices/src/virtio/controller.rs index 83834e4..815bb46 100644 --- a/devices/src/virtio/controller.rs +++ b/devices/src/virtio/controller.rs @@ -33,25 +33,27 @@ use std::os::unix::io::{AsRawFd, RawFd}; use std::path::PathBuf; use std::thread; -use msg_socket::{MsgReceiver, MsgSender}; -use sys_util::{error, EventFd, GuestMemory, PollContext, PollToken, Result, SharedMemory}; - use super::resource_bridge::*; use super::{Interrupt, InterruptProxyEvent, Queue, VirtioDevice, TYPE_WL, VIRTIO_F_VERSION_1}; use vm_control::{MaybeOwnedFd, VmMemoryControlRequestSocket}; -use msg_socket::{MsgOnSocket, MsgSocket}; +use msg_socket::{MsgError, MsgOnSocket, MsgReceiver, MsgSender, MsgSocket}; use sys_util::net::UnixSeqpacket; +use sys_util::{error, EventFd, GuestMemory, PollContext, PollToken, SharedMemory}; #[derive(Debug, MsgOnSocket)] pub enum Request { + Create { + // wayland_paths: Map<String, PathBuf>, + vm_socket: MaybeOwnedFd<UnixSeqpacket>, + // resource_bridge: Option<ResourceRequestSocket>, + }, Activate { shm: MaybeOwnedFd<SharedMemory>, interrupt: MaybeOwnedFd<UnixSeqpacket>, interrupt_resample_evt: MaybeOwnedFd<EventFd>, in_queue: Queue, out_queue: Queue, - vm_socket: MaybeOwnedFd<UnixSeqpacket>, in_queue_evt: MaybeOwnedFd<EventFd>, out_queue_evt: MaybeOwnedFd<EventFd>, }, @@ -168,26 +170,26 @@ impl Worker { pub struct Controller { kill_evt: Option<EventFd>, worker_thread: Option<thread::JoinHandle<()>>, - wayland_paths: Map<String, PathBuf>, - vm_socket: Option<VmMemoryControlRequestSocket>, - resource_bridge: Option<ResourceRequestSocket>, use_transition_flags: bool, socket: Option<Socket>, } impl Controller { - pub fn new( + pub fn create( wayland_paths: Map<String, PathBuf>, vm_socket: VmMemoryControlRequestSocket, resource_bridge: Option<ResourceRequestSocket>, socket: Socket, - ) -> Result<Controller> { + ) -> Result<Controller, MsgError> { + socket.send(&Request::Create { + // wayland_paths, + vm_socket: MaybeOwnedFd::new_borrowed(&vm_socket), + // resource_bridge, + })?; + Ok(Controller { kill_evt: None, worker_thread: None, - wayland_paths, - vm_socket: Some(vm_socket), - resource_bridge, use_transition_flags: false, socket: Some(socket), }) @@ -211,13 +213,6 @@ impl VirtioDevice for Controller { fn keep_fds(&self) -> Vec<RawFd> { let mut keep_fds = Vec::new(); - if let Some(vm_socket) = &self.vm_socket { - keep_fds.push(vm_socket.as_raw_fd()); - } - if let Some(resource_bridge) = &self.resource_bridge { - keep_fds.push(resource_bridge.as_raw_fd()); - } - if let Some(ref kill_evt) = self.kill_evt { keep_fds.push(kill_evt.as_raw_fd()); } @@ -267,45 +262,38 @@ impl VirtioDevice for Controller { }; self.kill_evt = Some(self_kill_evt); - if let Some(vm_socket) = self.vm_socket.take() { - if let Some(socket) = self.socket.take() { - let wayland_paths = self.wayland_paths.clone(); - let use_transition_flags = self.use_transition_flags; - let resource_bridge = self.resource_bridge.take(); - - let (ours, theirs) = UnixSeqpacket::pair().expect("pair failed"); - - if let Err(e) = socket.send(&Request::Activate { - shm: MaybeOwnedFd::new_borrowed(&mem), - interrupt: MaybeOwnedFd::new_borrowed(&theirs), - interrupt_resample_evt: MaybeOwnedFd::new_borrowed( - interrupt.get_resample_evt(), - ), - in_queue: queues.remove(0), - out_queue: queues.remove(0), - vm_socket: MaybeOwnedFd::new_borrowed(&vm_socket), - in_queue_evt: MaybeOwnedFd::new_borrowed(&queue_evts[0]), - out_queue_evt: MaybeOwnedFd::new_borrowed(&queue_evts[1]), - }) { - error!("failed to send Activate: {}", e); + if let Some(socket) = self.socket.take() { + let use_transition_flags = self.use_transition_flags; + + let (ours, theirs) = UnixSeqpacket::pair().expect("pair failed"); + + if let Err(e) = socket.send(&Request::Activate { + shm: MaybeOwnedFd::new_borrowed(&mem), + interrupt: MaybeOwnedFd::new_borrowed(&theirs), + interrupt_resample_evt: MaybeOwnedFd::new_borrowed(interrupt.get_resample_evt()), + in_queue: queues.remove(0), + out_queue: queues.remove(0), + in_queue_evt: MaybeOwnedFd::new_borrowed(&queue_evts[0]), + out_queue_evt: MaybeOwnedFd::new_borrowed(&queue_evts[1]), + }) { + error!("failed to send Activate: {}", e); + return; + } + + let worker_result = + thread::Builder::new() + .name("virtio_wl".to_string()) + .spawn(move || { + Worker::new(socket, interrupt, MsgSocket::new(ours)).run(kill_evt); + }); + + match worker_result { + Err(e) => { + error!("failed to spawn virtio_wl worker: {}", e); return; } - - let worker_result = - thread::Builder::new() - .name("virtio_wl".to_string()) - .spawn(move || { - Worker::new(socket, interrupt, MsgSocket::new(ours)).run(kill_evt); - }); - - match worker_result { - Err(e) => { - error!("failed to spawn virtio_wl worker: {}", e); - return; - } - Ok(join_handle) => { - self.worker_thread = Some(join_handle); - } + Ok(join_handle) => { + self.worker_thread = Some(join_handle); } } } diff --git a/src/linux.rs b/src/linux.rs index 411d529..6f0e19b 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -85,6 +85,7 @@ pub enum Error { BuildVm(<Arch as LinuxArch>::Error), ChownTpmStorage(sys_util::Error), CloneEventFd(sys_util::Error), + ControllerCreate(MsgError), CreateAc97(devices::PciDeviceError), CreateConsole(arch::serial::Error), CreateDiskError(disk::Error), @@ -171,6 +172,7 @@ impl Display for Error { BuildVm(e) => write!(f, "The architecture failed to build the vm: {}", e), ChownTpmStorage(e) => write!(f, "failed to chown tpm storage: {}", e), CloneEventFd(e) => write!(f, "failed to clone eventfd: {}", e), + ControllerCreate(e) => write!(f, "failed to create device controller: {}", e), CreateAc97(e) => write!(f, "failed to create ac97 device: {}", e), CreateConsole(e) => write!(f, "failed to create console device: {}", e), CreateDiskError(e) => write!(f, "failed to create virtual disk: {}", e), @@ -766,13 +768,13 @@ fn create_wayland_device( path.push_str("/crosvm-wl.sock"); let seq_socket = UnixSeqpacket::connect(&path).expect("connect failed"); let msg_socket = MsgSocket::new(seq_socket); - let dev = virtio::Controller::new( + let dev = virtio::Controller::create( cfg.wayland_socket_paths.clone(), socket, resource_bridge, msg_socket, ) - .map_err(Error::WaylandDeviceNew)?; + .map_err(Error::ControllerCreate)?; let jail = match simple_jail(&cfg, "wl_device")? { Some(mut jail) => { diff --git a/src/wl.rs b/src/wl.rs index 1874929..77cf86c 100644 --- a/src/wl.rs +++ b/src/wl.rs @@ -5,7 +5,6 @@ use msg_socket::{MsgReceiver, MsgSender, MsgSocket}; use std::collections::BTreeMap; use std::fs::remove_file; use sys_util::{error, net::UnixSeqpacketListener, warn, GuestMemory}; -use vm_control::VmMemoryControlRequestSocket; #[cfg(any(target_arch = "arm", target_arch = "aarch64"))] pub use aarch64::{arch_memory_regions, MemoryParams}; @@ -28,7 +27,22 @@ fn main() { let conn = server.accept().expect("accept failed"); let msg_socket: Socket = MsgSocket::new(conn); - let mut wl = None; + let vm_socket = match msg_socket.recv() { + Ok(Request::Create { vm_socket }) => MsgSocket::new(vm_socket.owned()), + + Ok(msg) => { + panic!("received unexpected message: {:?}", msg); + } + + Err(e) => { + panic!("recv error: {}", e); + } + }; + + let mut wayland_paths = BTreeMap::new(); + wayland_paths.insert("".into(), "/run/user/1000/wayland-0".into()); + + let mut wl = Some(Wl::new(wayland_paths, vm_socket, None).unwrap()); loop { match msg_socket.recv() { @@ -52,14 +66,9 @@ fn main() { interrupt_resample_evt, in_queue, out_queue, - vm_socket, in_queue_evt, out_queue_evt, }) => { - if wl.is_some() { - panic!("Received Activate twice"); - } - let shm = shm.owned(); let regions = arch_memory_regions(MemoryParams { @@ -71,16 +80,8 @@ fn main() { let interrupt: MsgSocket<InterruptProxyEvent, ()> = MsgSocket::new(interrupt.owned()); - let vm_socket: VmMemoryControlRequestSocket = MsgSocket::new(vm_socket.owned()); - - let mut wayland_paths = BTreeMap::new(); - wayland_paths.insert("".into(), "/run/user/1000/wayland-0".into()); - - let mut wl_ = Wl::new(wayland_paths, vm_socket, None).unwrap(); - println!("constructed Wl"); - - wl_.activate( + wl.as_mut().unwrap().activate( mem, Box::new(InterruptProxy::new( interrupt, @@ -91,11 +92,11 @@ fn main() { ); println!("activated Wl"); - - wl = Some(wl_); } - Err(e) => panic!("recv failed {:?}", e), + Ok(msg) => panic!("unexpected message {:?}", msg), + + Err(e) => panic!("recv failed: {}", e), } } } |