fmt

Signed-off-by: Ludvig Liljenberg <[email protected]>

Author: ludfjig

src/hyperlight_host/src/hypervisor/gdb/mod.rs

@@ -27,7 +27,6 @@ use event_loop::event_loop_thread;
 use gdbstub::conn::ConnectionExt;
 use gdbstub::stub::GdbStub;
 use gdbstub::target::TargetError;
-
 use thiserror::Error;
 use x86_64_target::HyperlightSandboxTarget;
 

src/hyperlight_host/src/hypervisor/gdb/x86_64_target.rs

@@ -29,9 +29,8 @@ use gdbstub::target::ext::section_offsets::{Offsets, SectionOffsets};
 use gdbstub::target::{Target, TargetError, TargetResult};
 use gdbstub_arch::x86::X86_64_SSE as GdbTargetArch;
 
-use crate::hypervisor::regs::CommonRegisters;
-
 use super::{DebugCommChannel, DebugMsg, DebugResponse, GdbTargetError};
+use crate::hypervisor::regs::CommonRegisters;
 
 /// Gdbstub target used by the gdbstub crate to provide GDB protocol implementation
 pub(crate) struct HyperlightSandboxTarget {

src/hyperlight_host/src/hypervisor/hyperlight_vm.rs

@@ -13,10 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-#[cfg(crashdump)]
-use crate::hypervisor::crashdump;
-use crate::sandbox::hypervisor::HypervisorType;
-use crate::HyperlightError::ExecutionCanceledByHost;
 use std::convert::TryFrom;
 use std::fmt::Debug;
 use std::sync::{Arc, Mutex};
@@ -42,12 +38,15 @@ use super::{
     HyperlightExit, HyperlightVm, CR0_AM, CR0_ET, CR0_MP, CR0_NE, CR0_PE, CR0_PG, CR0_WP,
     CR4_OSFXSR, CR4_OSXMMEXCPT, CR4_PAE, EFER_LMA, EFER_LME, EFER_NX, EFER_SCE,
 };
+#[cfg(crashdump)]
+use crate::hypervisor::crashdump;
 use crate::hypervisor::hypervisor_handler::HypervisorHandler;
 use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
 use crate::mem::ptr::{GuestPtr, RawPtr};
 use crate::metrics::METRIC_GUEST_CANCELLATION;
-use crate::HyperlightError;
-use crate::{log_then_return, new_error, Result};
+use crate::sandbox::hypervisor::HypervisorType;
+use crate::HyperlightError::ExecutionCanceledByHost;
+use crate::{log_then_return, new_error, HyperlightError, Result};
 
 #[cfg(gdb)]
 mod debug {

src/hyperlight_host/src/hypervisor/hyperv_linux.rs

@@ -30,13 +30,6 @@ use std::collections::HashMap;
 use std::fmt::Debug;
 use std::sync::LazyLock;
 
-#[cfg(gdb)]
-use super::handlers::DbgMemAccessHandlerCaller;
-use super::regs::{CommonFpu, CommonRegisters, CommonSpecialRegisters};
-use super::vm::Vm;
-use super::HyperlightExit;
-use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
-use crate::{log_then_return, new_error, Result};
 #[cfg(mshv2)]
 use mshv_bindings::hv_message;
 #[cfg(gdb)]
@@ -45,17 +38,25 @@ use mshv_bindings::hv_message_type_HVMSG_X64_EXCEPTION_INTERCEPT;
 use mshv_bindings::DebugRegisters;
 use mshv_bindings::{
     hv_message_type, hv_message_type_HVMSG_GPA_INTERCEPT, hv_message_type_HVMSG_UNMAPPED_GPA,
-    hv_message_type_HVMSG_X64_HALT, hv_message_type_HVMSG_X64_IO_PORT_INTERCEPT,
+    hv_message_type_HVMSG_X64_HALT, hv_message_type_HVMSG_X64_IO_PORT_INTERCEPT, hv_register_assoc,
+    hv_register_name_HV_X64_REGISTER_RIP, hv_register_value,
 };
 #[cfg(mshv3)]
 use mshv_bindings::{
     hv_partition_property_code_HV_PARTITION_PROPERTY_SYNTHETIC_PROC_FEATURES,
     hv_partition_synthetic_processor_features,
 };
-use mshv_bindings::{hv_register_assoc, hv_register_name_HV_X64_REGISTER_RIP, hv_register_value};
 use mshv_ioctls::{Mshv, VcpuFd, VmFd};
 use tracing::{instrument, Span};
 
+#[cfg(gdb)]
+use super::handlers::DbgMemAccessHandlerCaller;
+use super::regs::{CommonFpu, CommonRegisters, CommonSpecialRegisters};
+use super::vm::Vm;
+use super::HyperlightExit;
+use crate::mem::memory_region::{MemoryRegion, MemoryRegionFlags};
+use crate::{log_then_return, new_error, Result};
+
 /// Determine whether the HyperV for Linux hypervisor API is present
 /// and functional.
 #[instrument(skip_all, parent = Span::current(), level = "Trace")]
@@ -263,9 +264,10 @@ impl Vm for MshvVm {
 
     #[cfg(gdb)]
     fn translate_gva(&self, gva: u64) -> Result<u64> {
-        use crate::HyperlightError;
         use mshv_bindings::{HV_TRANSLATE_GVA_VALIDATE_READ, HV_TRANSLATE_GVA_VALIDATE_WRITE};
 
+        use crate::HyperlightError;
+
         let flags = (HV_TRANSLATE_GVA_VALIDATE_READ | HV_TRANSLATE_GVA_VALIDATE_WRITE) as u64;
         let (addr, _) = self
             .vcpu_fd
@@ -386,9 +388,8 @@ impl Vm for MshvVm {
         addr: u64,
         dbg_mem_access_fn: std::sync::Arc<std::sync::Mutex<dyn DbgMemAccessHandlerCaller>>,
     ) -> Result<()> {
-        use crate::hypervisor::gdb::arch::SW_BP;
-
         use super::gdb::arch::SW_BP_SIZE;
+        use crate::hypervisor::gdb::arch::SW_BP;
 
         let mut save_data = [0; SW_BP_SIZE];
         let mut mem = dbg_mem_access_fn.lock().unwrap();

src/hyperlight_host/src/hypervisor/inprocess.rs

@@ -14,18 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-use crate::hypervisor::DbgMemAccessHandlerCaller;
-use crate::hypervisor::VcpuStopReason;
-use log::LevelFilter;
 use std::fmt::Debug;
 use std::os::raw::c_void;
 use std::sync::{Arc, Mutex};
 
+use log::LevelFilter;
+
 #[cfg(gdb)]
 use super::handlers::DbgMemAccessHandlerWrapper;
 use super::handlers::{MemAccessHandlerCaller, OutBHandlerCaller};
 use super::hypervisor_handler::HypervisorHandler;
 use super::HyperlightVm;
+use crate::hypervisor::{DbgMemAccessHandlerCaller, VcpuStopReason};
 #[cfg(crashdump)]
 use crate::mem::memory_region::MemoryRegion;
 use crate::sandbox::leaked_outb::LeakedOutBWrapper;

src/hyperlight_host/src/hypervisor/kvm.rs

@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+#[cfg(gdb)]
+use std::collections::HashMap;
+use std::sync::LazyLock;
+
+#[cfg(gdb)]
+use kvm_bindings::kvm_guest_debug;
 use kvm_bindings::{kvm_userspace_memory_region, KVM_MEM_READONLY};
 use kvm_ioctls::Cap::UserMemory;
 use kvm_ioctls::{Kvm, VcpuExit, VcpuFd, VmFd};
 use tracing::{instrument, Span};
 
-#[cfg(gdb)]
-use kvm_bindings::kvm_guest_debug;
-#[cfg(gdb)]
-use std::collections::HashMap;
-use std::sync::LazyLock;
-
 use super::regs::{CommonFpu, CommonRegisters, CommonSpecialRegisters};
 use super::vm::Vm;
 use super::HyperlightExit;

src/hyperlight_host/src/hypervisor/vm.rs

@@ -4,16 +4,13 @@ use std::sync::Arc;
 #[cfg(gdb)]
 use std::sync::Mutex;
 
+use super::regs::{CommonFpu, CommonRegisters, CommonSpecialRegisters};
 #[cfg(gdb)]
 use crate::hypervisor::handlers::DbgMemAccessHandlerCaller;
 use crate::hypervisor::HyperlightExit;
 use crate::mem::memory_region::MemoryRegion;
 use crate::Result;
 
-use super::regs::CommonFpu;
-use super::regs::CommonRegisters;
-use super::regs::CommonSpecialRegisters;
-
 pub(crate) trait Vm: Send + Sync + Debug {
     /// Get the standard registers of the vCPU
     #[allow(dead_code)]