Merge branch 'main' into vmclock

Author: bchalios

Cargo.lock

@@ -13,8 +13,8 @@ bench = false
 clap = { version = "4.5.51", features = ["derive"] }
 itertools = "0.14.0"
 proc-macro2 = { version = "1.0.103", features = ["span-locations"] }
-quote = "1.0.41"
-syn = { version = "2.0.109", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
+quote = "1.0.42"
+syn = { version = "2.0.110", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] } 
 walkdir = "2.5.0"
 
 [dev-dependencies]

src/clippy-tracing/Cargo.toml

@@ -12,8 +12,8 @@ bench = false
 
 [dependencies]
 proc-macro2 = "1.0.103"
-quote = "1.0.41"
-syn = { version = "2.0.109", features = ["full", "extra-traits"] }
+quote = "1.0.42"
+syn = { version = "2.0.110", features = ["full", "extra-traits"] }
 
 [lints]
 workspace = true

src/log-instrument-macros/Cargo.toml

@@ -112,7 +112,7 @@ pub enum StartMicrovmError {
     CreateEntropyDevice(crate::devices::virtio::rng::EntropyError),
     /// Failed to allocate guest resource: {0}
     AllocateResources(#[from] vm_allocator::Error),
-    /// Error starting GDB debug session
+    /// Error starting GDB debug session: {0}
     #[cfg(feature = "gdb")]
     GdbServer(gdb::target::GdbTargetError),
     /// Error cloning Vcpu fds
@@ -291,19 +291,12 @@ pub fn build_microvm_for_boot(
     let vmm = Arc::new(Mutex::new(vmm));
 
     #[cfg(feature = "gdb")]
-    {
-        let (gdb_tx, gdb_rx) = mpsc::channel();
-        vcpus
-            .iter_mut()
-            .for_each(|vcpu| vcpu.attach_debug_info(gdb_tx.clone()));
-
-        if let Some(gdb_socket_path) = &vm_resources.machine_config.gdb_socket_path {
-            gdb::gdb_thread(vmm.clone(), gdb_rx, entry_point.entry_addr, gdb_socket_path)
-                .map_err(StartMicrovmError::GdbServer)?;
-        } else {
-            debug!("No GDB socket provided not starting gdb server.");
-        }
-    }
+    let (gdb_tx, gdb_rx) = mpsc::channel();
+
+    #[cfg(feature = "gdb")]
+    vcpus
+        .iter_mut()
+        .for_each(|vcpu| vcpu.attach_debug_info(gdb_tx.clone()));
 
     // Move vcpus to their own threads and start their state machine in the 'Paused' state.
     vmm.lock()
@@ -317,6 +310,14 @@ pub fn build_microvm_for_boot(
         )
         .map_err(VmmError::VcpuStart)?;
 
+    #[cfg(feature = "gdb")]
+    if let Some(gdb_socket_path) = &vm_resources.machine_config.gdb_socket_path {
+        gdb::gdb_thread(vmm.clone(), gdb_rx, entry_point.entry_addr, gdb_socket_path)
+            .map_err(StartMicrovmError::GdbServer)?;
+    } else {
+        debug!("No GDB socket provided not starting gdb server.");
+    }
+
     // Load seccomp filters for the VMM thread.
     // Execution panics if filters cannot be loaded, use --no-seccomp if skipping filters
     // altogether is the desired behaviour.

src/vmm/src/builder.rs

@@ -51,11 +51,11 @@ pub fn gdb_thread(
     }
 
     let path = Path::new(socket_addr);
-    let listener = UnixListener::bind(path).map_err(|_| GdbTargetError::ServerSocketError)?;
+    let listener = UnixListener::bind(path).map_err(GdbTargetError::ServerSocketError)?;
     trace!("Waiting for GDB server connection on {}...", path.display());
     let (connection, _addr) = listener
         .accept()
-        .map_err(|_| GdbTargetError::ServerSocketError)?;
+        .map_err(GdbTargetError::ServerSocketError)?;
 
     std::thread::Builder::new()
         .name("gdb".into())

src/vmm/src/gdb/mod.rs

@@ -65,8 +65,8 @@ pub enum GdbTargetError {
     NoPausedVcpu,
     /// Error when setting Vcpu debug flags
     VcpuKvmError,
-    /// Server socket Error
-    ServerSocketError,
+    /// Server socket Error: {0}
+    ServerSocketError(std::io::Error),
     /// Error with creating GDB thread
     GdbThreadError,
     /// VMM locking error
@@ -394,8 +394,6 @@ impl MultiThreadBase for FirecrackerTarget {
         let vcpu_idx = tid_to_vcpuid(tid);
         let vcpu_fd = &vmm.vcpus_handles[vcpu_idx].vcpu_fd;
 
-        let vmm = &self.vmm.lock().expect("Error locking vmm in read addr");
-
         while !data.is_empty() {
             let gpa = arch::translate_gva(vcpu_fd, gva, &vmm).map_err(|e| {
                 error!("Error {e:?} translating gva on read address: {gva:#X}");