devices: reintroduce mem in VirtioDevice activate

Instead of passing memory at device creation, bring it in
during device activation.

This enables future scenarios where devices can be created
prior to guest memory configuration.

Signed-off-by: Adrian Catangiu <acatan@amazon.com>

Author: acatangiu

src/devices/src/virtio/block/device.rs

@@ -317,7 +317,7 @@ impl VirtioDevice for Block {
         self.device_activated
     }
 
-    fn activate(&mut self) -> ActivateResult {
+    fn activate(&mut self, _: GuestMemoryMmap) -> ActivateResult {
         self.device_activated = true;
         Ok(())
     }
@@ -495,7 +495,7 @@ mod tests {
         let mem = block.mem.clone();
         let vq = VirtQueue::new(GuestAddress(0), &mem, 16);
         block.set_queue(0, vq.create_queue());
-        block.activate().unwrap();
+        block.activate(mem.clone()).unwrap();
         initialize_virtqueue(&vq);
 
         let request_type_addr = GuestAddress(vq.dtable[0].addr.get());
@@ -520,7 +520,7 @@ mod tests {
         let mem = block.mem.clone();
         let vq = VirtQueue::new(GuestAddress(0), &mem, 16);
         block.set_queue(0, vq.create_queue());
-        block.activate().unwrap();
+        block.activate(mem.clone()).unwrap();
         initialize_virtqueue(&vq);
 
         let request_type_addr = GuestAddress(vq.dtable[0].addr.get());
@@ -578,7 +578,7 @@ mod tests {
         let mem = block.mem.clone();
         let vq = VirtQueue::new(GuestAddress(0), &mem, 16);
         block.set_queue(0, vq.create_queue());
-        block.activate().unwrap();
+        block.activate(mem.clone()).unwrap();
         initialize_virtqueue(&vq);
 
         let request_type_addr = GuestAddress(vq.dtable[0].addr.get());
@@ -608,7 +608,7 @@ mod tests {
         let mem = block.mem.clone();
         let vq = VirtQueue::new(GuestAddress(0), &mem, 16);
         block.set_queue(0, vq.create_queue());
-        block.activate().unwrap();
+        block.activate(mem.clone()).unwrap();
         initialize_virtqueue(&vq);
 
         let request_type_addr = GuestAddress(vq.dtable[0].addr.get());
@@ -667,7 +667,7 @@ mod tests {
         let mem = block.mem.clone();
         let vq = VirtQueue::new(GuestAddress(0), &mem, 16);
         block.set_queue(0, vq.create_queue());
-        block.activate().unwrap();
+        block.activate(mem.clone()).unwrap();
         initialize_virtqueue(&vq);
 
         let request_type_addr = GuestAddress(vq.dtable[0].addr.get());
@@ -710,7 +710,7 @@ mod tests {
         let mem = block.mem.clone();
         let vq = VirtQueue::new(GuestAddress(0), &mem, 16);
         block.set_queue(0, vq.create_queue());
-        block.activate().unwrap();
+        block.activate(mem.clone()).unwrap();
         initialize_virtqueue(&vq);
 
         let request_type_addr = GuestAddress(vq.dtable[0].addr.get());
@@ -776,7 +776,7 @@ mod tests {
         let mem = block.mem.clone();
         let vq = VirtQueue::new(GuestAddress(0), &mem, 16);
         block.set_queue(0, vq.create_queue());
-        block.activate().unwrap();
+        block.activate(mem.clone()).unwrap();
         initialize_virtqueue(&vq);
 
         let request_type_addr = GuestAddress(vq.dtable[0].addr.get());
@@ -841,7 +841,7 @@ mod tests {
         let mem = block.mem.clone();
         let vq = VirtQueue::new(GuestAddress(0), &mem, 16);
         block.set_queue(0, vq.create_queue());
-        block.activate().unwrap();
+        block.activate(mem.clone()).unwrap();
         initialize_virtqueue(&vq);
 
         let request_type_addr = GuestAddress(vq.dtable[0].addr.get());

src/devices/src/virtio/device.rs

@@ -10,6 +10,7 @@ use std::sync::{atomic::AtomicUsize, Arc};
 use super::{ActivateResult, Queue};
 use crate::virtio::AsAny;
 use utils::eventfd::EventFd;
+use vm_memory::GuestMemoryMmap;
 
 /// Trait for virtio devices to be driven by a virtio transport.
 ///
@@ -87,7 +88,7 @@ pub trait VirtioDevice: AsAny + Send {
     fn write_config(&mut self, offset: u64, data: &[u8]);
 
     /// Performs the formal activation for a device, which can be verified also with `is_activated`.
-    fn activate(&mut self) -> ActivateResult;
+    fn activate(&mut self, mem: GuestMemoryMmap) -> ActivateResult;
 
     /// Checks if the resources of this device are activated.
     fn is_activated(&self) -> bool;

src/devices/src/virtio/mmio.rs

@@ -179,7 +179,7 @@ impl MmioTransport {
                 let device_activated = self.locked_device().is_activated();
                 if !device_activated && self.are_queues_valid() {
                     self.locked_device()
-                        .activate()
+                        .activate(self.mem.clone())
                         .expect("Failed to activate device");
                 }
             }
@@ -403,7 +403,7 @@ mod tests {
             self.acked_features = acked_features;
         }
 
-        fn activate(&mut self) -> ActivateResult {
+        fn activate(&mut self, _: GuestMemoryMmap) -> ActivateResult {
             self.device_activated = true;
             Ok(())
         }

src/devices/src/virtio/net/device.rs

@@ -679,7 +679,7 @@ impl VirtioDevice for Net {
         self.device_activated
     }
 
-    fn activate(&mut self) -> ActivateResult {
+    fn activate(&mut self, _: GuestMemoryMmap) -> ActivateResult {
         self.device_activated = true;
         Ok(())
     }
@@ -812,7 +812,7 @@ mod tests {
             self.queues.clear();
             self.queues.push(rxq);
             self.queues.push(txq);
-            self.activate().unwrap();
+            self.activate(self.mem.clone()).unwrap();
         }
     }
 

src/devices/src/virtio/vsock/device.rs

@@ -252,7 +252,7 @@ where
         );
     }
 
-    fn activate(&mut self) -> ActivateResult {
+    fn activate(&mut self, _: GuestMemoryMmap) -> ActivateResult {
         if self.queues.len() != defs::NUM_QUEUES {
             error!(
                 "Cannot perform activate. Expected {} queue(s), got {}",
@@ -351,6 +351,6 @@ mod tests {
         // }
 
         // Test a correct activation.
-        ctx.device.activate().unwrap();
+        ctx.device.activate(ctx.mem.clone()).unwrap();
     }
 }

src/vmm/src/device_manager/mmio.rs

@@ -389,7 +389,7 @@ mod tests {
             let _ = data;
         }
 
-        fn activate(&mut self) -> ActivateResult {
+        fn activate(&mut self, _: GuestMemoryMmap) -> ActivateResult {
             Ok(())
         }
 
@@ -471,7 +471,6 @@ mod tests {
         let mut dummy = DummyDevice::new();
         assert_eq!(dummy.device_type(), 0);
         assert_eq!(dummy.queues().len(), QUEUE_SIZES.len());
-        dummy.activate().unwrap();
     }
 
     #[test]