fix(vmm): propagate errors in secret freedom

Return errors up the stack instead of panicking.

Signed-off-by: Nikita Kalyazin <[email protected]>

Author: kalyazin

src/vmm/src/builder.rs

@@ -57,7 +57,7 @@ use crate::vmm_config::instance_info::InstanceInfo;
 use crate::vmm_config::machine_config::MachineConfigError;
 use crate::vmm_config::snapshot::{LoadSnapshotParams, MemBackendType};
 use crate::vstate::kvm::{Kvm, KvmError};
-use crate::vstate::memory::{MaybeBounce, create_memfd};
+use crate::vstate::memory::{MaybeBounce, create_memfd, MemoryError};
 #[cfg(target_arch = "aarch64")]
 use crate::vstate::resources::ResourceAllocator;
 use crate::vstate::vcpu::VcpuError;
@@ -478,10 +478,10 @@ pub enum BuildMicrovmFromSnapshotError {
     /// Failed to load guest memory: {0}
     GuestMemory(#[from] BuildMicrovmFromSnapshotErrorGuestMemoryError),
     /// Userfault bitmap memfd error: {0}
-    UserfaultBitmapMemfd(#[from] crate::vstate::memory::MemoryError),
+    UserfaultBitmapMemfd(#[from] MemoryError),
 }
 
-fn memfd_to_slice(memfd: &mut Option<File>) -> Option<&mut [u8]> {
+fn memfd_to_slice(memfd: &mut Option<File>) -> Result<Option<&mut [u8]>, MemoryError> {
     if let Some(bitmap_file) = memfd {
         let len = u64_to_usize(
             bitmap_file
@@ -503,16 +503,15 @@ fn memfd_to_slice(memfd: &mut Option<File>) -> Option<&mut [u8]> {
         };
 
         if bitmap_addr == libc::MAP_FAILED {
-            panic!(
-                "Failed to mmap userfault bitmap file: {}",
-                std::io::Error::last_os_error()
-            );
+            return Err(MemoryError::Mmap(std::io::Error::last_os_error()));
         }
 
         // SAFETY: `bitmap_addr` is a valid memory address returned by `mmap`.
-        Some(unsafe { std::slice::from_raw_parts_mut(bitmap_addr.cast(), len) })
+        Ok(Some(unsafe {
+            std::slice::from_raw_parts_mut(bitmap_addr.cast(), len)
+        }))
     } else {
-        None
+        Ok(None)
     }
 }
 // TODO: take it from kvm-bindings when userfault support is merged upstream
@@ -610,7 +609,7 @@ pub fn build_microvm_from_snapshot(
         }
     };
 
-    let mut userfault_bitmap = memfd_to_slice(&mut userfault_bitmap_memfd);
+    let mut userfault_bitmap = memfd_to_slice(&mut userfault_bitmap_memfd)?;
     if let Some(ref mut slice) = userfault_bitmap {
         // Set all bits so a fault on any page will cause a VM exit
         slice.fill(0xffu8);

src/vmm/src/lib.rs

@@ -868,7 +868,7 @@ impl MutEventSubscriber for Vmm {
         if let Some(uffd_socket) = self.uffd_socket.as_ref()
             && let Err(err) = ops.add(Events::new(uffd_socket, EventSet::IN))
         {
-            panic!("Failed to register UFFD socket: {}", err);
+            error!("Failed to register UFFD socket: {}", err);
         }
     }
 }

src/vmm/src/persist.rs

@@ -594,9 +594,7 @@ fn send_uffd_handshake(
     let backend_mappings = serde_json::to_string(backend_mappings).unwrap();
 
     let socket = UnixStream::connect(mem_uds_path)?;
-    socket
-        .set_nonblocking(true)
-        .expect("Cannot set non-blocking");
+    socket.set_nonblocking(true)?;
 
     socket.send_with_fds(
         &[backend_mappings.as_bytes()],