cargo fmt

Author: QuarkContainer

qkernel/src/interrupt/mod.rs

@@ -17,10 +17,10 @@ mod idt;
 
 use super::asm::*;
 use super::qlib::addr::*;
+use super::qlib::backtracer;
 use super::qlib::common::*;
 use super::qlib::kernel::TSC;
 use super::qlib::linux_def::*;
-use super::qlib::backtracer;
 use super::qlib::singleton::*;
 use super::qlib::vcpu_mgr::*;
 use super::task::*;
@@ -530,7 +530,13 @@ pub extern "C" fn PageFaultHandler(ptRegs: &mut PtRegs, errorCode: u64) {
             //error!("InstallPage 1, range is {:x?}, address is {:x}, vma.growsDown is {}",
             //    &range, pageAddr, vma.growsDown);
             //let startTime = TSC.Rdtsc();
-            let addr = currTask.mm.pagetable.write().pt.SwapInPage(Addr(pageAddr)).unwrap();
+            let addr = currTask
+                .mm
+                .pagetable
+                .write()
+                .pt
+                .SwapInPage(Addr(pageAddr))
+                .unwrap();
             //let endtime = TSC.Rdtsc();
             if addr > 0 {
                 //use crate::qlib::kernel::Tsc;
@@ -636,26 +642,26 @@ pub fn HandleFault(
             print!("the map 3 is {}", &map);
             panic!();
         }
-    
+
         //task.SaveFp();
-    
+
         let mut info = SignalInfo {
             Signo: signal, //Signal::SIGBUS,
             ..Default::default()
         };
-    
+
         let sigfault = info.SigFault();
         sigfault.addr = cr2;
         //let read = errorCode & (1<<1) == 0;
         let write = errorCode & (1 << 1) != 0;
         let execute = errorCode & (1 << 4) != 0;
-    
+
         if !write && !execute {
             info.Code = 1; // SEGV_MAPERR.
         } else {
             info.Code = 2; // SEGV_ACCERR.
         }
-    
+
         let thread = task.Thread();
         // Synchronous signal. Send it to ourselves. Assume the signal is
         // legitimate and force it (work around the signal being ignored or
@@ -667,7 +673,7 @@ pub fn HandleFault(
             .expect("PageFaultHandler send signal fail");
         MainRun(task, TaskRunState::RunApp);
         //task.mm.VcpuEnter();
-        
+
         task.RestoreFp();
         CPULocal::Myself().SetMode(VcpuMode::User);
         task.mm.HandleTlbShootdown();
@@ -705,7 +711,8 @@ pub extern "C" fn VirtualizationHandler(ptRegs: &mut PtRegs) {
     let currTask = Task::Current();
     //currTask.mm.VcpuLeave();
 
-    if ptRegs.cs & 0x3 == 0 { // kernel mode
+    if ptRegs.cs & 0x3 == 0 {
+        // kernel mode
         error!("VirtualizationHandler kernel ...");
         //CPULocal::Myself().SetMode(VcpuMode::User);
         currTask.mm.HandleTlbShootdown();
@@ -720,8 +727,8 @@ pub extern "C" fn VirtualizationHandler(ptRegs: &mut PtRegs) {
 
     if CPULocal::InterruptByTlbShootdown(mask) {
         // no need special operation
-    } 
-    
+    }
+
     if CPULocal::InterruptByThreadTimeout(mask) {
         /*if SHARESPACE.config.read().KernelPagetable {
             Task::SetKernelPageTable();
@@ -750,7 +757,7 @@ pub extern "C" fn VirtualizationHandler(ptRegs: &mut PtRegs) {
 
     CPULocal::SetKernelStack(currTask.GetKernelSp());
     //currTask.mm.VcpuEnter();
-    
+
     CPULocal::Myself().SetMode(VcpuMode::User);
     currTask.mm.HandleTlbShootdown();
 }

qkernel/src/kernel_def.rs

@@ -14,29 +14,29 @@
 //
 
 use core::alloc::{GlobalAlloc, Layout};
+use core::arch::asm;
 use core::sync::atomic::AtomicBool;
 use core::sync::atomic::AtomicU64;
 use core::sync::atomic::Ordering;
-use core::arch::asm;
 
 use crate::qlib::fileinfo::*;
 
 use super::qlib::kernel::asm::*;
+use super::qlib::kernel::quring::uring_async::UringAsyncMgr;
 use super::qlib::kernel::taskMgr::*;
 use super::qlib::kernel::threadmgr::task_sched::*;
+use super::qlib::kernel::vcpu::*;
 use super::qlib::kernel::SHARESPACE;
 use super::qlib::kernel::TSC;
-use super::qlib::kernel::vcpu::*;
-use super::qlib::kernel::quring::uring_async::UringAsyncMgr;
 
 use super::qlib::common::*;
 use super::qlib::kernel::memmgr::pma::*;
 use super::qlib::kernel::task::*;
 use super::qlib::kernel::taskMgr;
 use super::qlib::linux_def::*;
 use super::qlib::loader::*;
-use super::qlib::mem::list_allocator::*;
 use super::qlib::mem::bitmap_allocator::*;
+use super::qlib::mem::list_allocator::*;
 use super::qlib::mutex::*;
 use super::qlib::perf_tunning::*;
 use super::qlib::qmsg::*;
@@ -84,12 +84,7 @@ impl IoUring {
         unsafe { self.enter(len as _, want as _, flags) }
     }
 
-    pub unsafe fn enter(
-        &self,
-        to_submit: u32,
-        min_complete: u32,
-        flag: u32,
-    ) -> Result<usize> {
+    pub unsafe fn enter(&self, to_submit: u32, min_complete: u32, flag: u32) -> Result<usize> {
         return io_uring_enter(to_submit, min_complete, flag);
     }
 
@@ -223,7 +218,7 @@ pub fn switch(from: TaskId, to: TaskId) {
         toCtx.SwitchPageTable();
     }
     toCtx.SetFS();
-    
+
     fromCtx.mm.VcpuLeave();
     toCtx.mm.VcpuEnter();
 
@@ -286,7 +281,7 @@ pub fn HyperCall64(type_: u16, para1: u64, para2: u64, para3: u64, para4: u64) {
         )
     }
 }
-    
+
 impl CPULocal {
     pub fn CpuId() -> usize {
         return GetVcpuId();
@@ -384,7 +379,7 @@ impl BitmapAllocatorWrapper {
     pub const fn New() -> Self {
         return Self {
             addr: AtomicU64::new(MemoryDef::HEAP_OFFSET),
-        }
+        };
     }
 
     pub fn Init(&self) {
@@ -431,26 +426,23 @@ pub fn HugepageDontNeed(addr: u64) {
 
 impl IOMgr {
     pub fn Init() -> Result<Self> {
-        return Err(Error::Common(format!("IOMgr can't init in kernel")))
+        return Err(Error::Common(format!("IOMgr can't init in kernel")));
     }
 }
 
-
 unsafe impl GlobalAlloc for GlobalVcpuAllocator {
     unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
         if !self.init.load(Ordering::Relaxed) {
-            return GLOBAL_ALLOCATOR
-                .alloc(layout);
+            return GLOBAL_ALLOCATOR.alloc(layout);
         }
-        return CPU_LOCAL[VcpuId()].AllocatorMut().alloc(layout)
+        return CPU_LOCAL[VcpuId()].AllocatorMut().alloc(layout);
     }
 
     unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
         if !self.init.load(Ordering::Relaxed) {
-            return GLOBAL_ALLOCATOR
-                .dealloc(ptr, layout);
+            return GLOBAL_ALLOCATOR.dealloc(ptr, layout);
         }
-        return CPU_LOCAL[VcpuId()].AllocatorMut().dealloc(ptr, layout)
+        return CPU_LOCAL[VcpuId()].AllocatorMut().dealloc(ptr, layout);
     }
 }
 
@@ -463,7 +455,7 @@ impl UringAsyncMgr {
         loop {
             let id = match self.freeids.lock().pop_front() {
                 None => break,
-                Some(id) => id
+                Some(id) => id,
             };
             self.freeSlot(id as _);
         }
@@ -476,4 +468,4 @@ pub fn IsKernel() -> bool {
 
 pub fn ReapSwapIn() {
     HostSpace::SwapIn();
-}
+}

qkernel/src/lib.rs

@@ -52,9 +52,9 @@ extern crate spin;
 extern crate x86_64;
 extern crate xmas_elf;
 
-use core::{mem, ptr};
 use core::panic::PanicInfo;
 use core::sync::atomic::{AtomicI32, AtomicUsize, Ordering};
+use core::{mem, ptr};
 
 use spin::mutex::Mutex;
 
@@ -74,36 +74,36 @@ use self::kernel_def::*;
 use self::loader::vdso::*;
 //use linked_list_allocator::LockedHeap;
 //use buddy_system_allocator::LockedHeap;
-use self::qlib::{ShareSpaceRef, SysCallID};
 use self::qlib::common::*;
 use self::qlib::config::*;
 use self::qlib::control_msg::*;
 use self::qlib::cpuid::*;
-use self::qlib::kernel::*;
 use self::qlib::kernel::arch;
 use self::qlib::kernel::asm;
 use self::qlib::kernel::boot;
 use self::qlib::kernel::fd;
 use self::qlib::kernel::fs;
 use self::qlib::kernel::kernel;
-use self::qlib::kernel::Kernel;
 use self::qlib::kernel::loader;
 use self::qlib::kernel::memmgr;
 use self::qlib::kernel::perflog;
 use self::qlib::kernel::quring;
+use self::qlib::kernel::Kernel;
+use self::qlib::kernel::*;
+use self::qlib::{ShareSpaceRef, SysCallID};
 //use self::vcpu::*;
-use self::qlib::kernel::Scale;
-use self::qlib::kernel::SignalDef;
 use self::qlib::kernel::socket;
 use self::qlib::kernel::task;
 use self::qlib::kernel::taskMgr;
 use self::qlib::kernel::threadmgr;
-use self::qlib::kernel::TSC;
 use self::qlib::kernel::util;
 use self::qlib::kernel::vcpu;
 use self::qlib::kernel::vcpu::*;
-use self::qlib::kernel::VcpuFreqInit;
 use self::qlib::kernel::version;
+use self::qlib::kernel::Scale;
+use self::qlib::kernel::SignalDef;
+use self::qlib::kernel::VcpuFreqInit;
+use self::qlib::kernel::TSC;
 use self::qlib::linux::time::*;
 use self::qlib::linux_def::MemoryDef;
 use self::qlib::loader::*;
@@ -137,16 +137,14 @@ pub const HEAP_SIZE: usize = 0x1000_0000;
 //use buddy_system_allocator::*;
 //#[global_allocator]
 
-
 #[global_allocator]
 pub static VCPU_ALLOCATOR: GlobalVcpuAllocator = GlobalVcpuAllocator::New();
 
 pub static GLOBAL_ALLOCATOR: HostAllocator = HostAllocator::New();
 //pub static GLOBAL_ALLOCATOR: BitmapAllocatorWrapper = BitmapAllocatorWrapper::New();
 
-
 lazy_static! {
-    pub static ref GLOBAL_LOCK : Mutex<()> = Mutex::new(());
+    pub static ref GLOBAL_LOCK: Mutex<()> = Mutex::new(());
 }
 
 //static ALLOCATOR: QAllocator = QAllocator::New();
@@ -283,7 +281,8 @@ pub extern "C" fn syscall_handler(
         let llevel = SHARESPACE.config.read().LogLevel;
         callId = if nr < SysCallID::UnknowSyscall as u64 {
             unsafe { mem::transmute(nr as u64) }
-        } else if SysCallID::sys_socket_produce as u64 <= nr && nr < SysCallID::EXTENSION_MAX as u64 {
+        } else if SysCallID::sys_socket_produce as u64 <= nr && nr < SysCallID::EXTENSION_MAX as u64
+        {
             unsafe { mem::transmute(nr as u64) }
         } else {
             nr = SysCallID::UnknowSyscall as _;
@@ -343,7 +342,7 @@ pub extern "C" fn syscall_handler(
         currTask.SwitchPageTable();
     }*/
     //currTask.mm.VcpuEnter();
-    
+
     CPULocal::Myself().SetEnterAppTimestamp(TSC.Rdtsc());
     CPULocal::Myself().SetMode(VcpuMode::User);
     currTask.mm.HandleTlbShootdown();
@@ -404,7 +403,7 @@ pub fn MainRun(currTask: &mut Task, mut state: TaskRunState) {
                         let dummyTask = DUMMY_TASK.read();
                         currTask.blocker = dummyTask.blocker.clone();
                     }
-                    
+
                     let mm = thread.lock().memoryMgr.clone();
                     thread.lock().memoryMgr = currTask.mm.clone();
                     CPULocal::SetPendingFreeStack(currTask.taskId);
@@ -488,7 +487,7 @@ pub extern "C" fn rust_main(
         GlobalIOMgr().InitPollHostEpoll(SHARESPACE.HostHostEpollfd());
         SetVCPCount(vcpuCnt as usize);
         VDSO.Initialization(vdsoParamAddr);
-        
+
         // release other vcpus
         HyperCall64(qlib::HYPERCALL_RELEASE_VCPU, 0, 0, 0, 0);
     } else {
@@ -567,7 +566,10 @@ fn StartRootContainer(_para: *const u8) -> ! {
         let mut processArgs = LOADER.Lock(task).unwrap().Init(process);
         match LOADER.LoadRootProcess(&mut processArgs) {
             Err(e) => {
-                error!("load root process failure with error {:?}, shutting down...", e);
+                error!(
+                    "load root process failure with error {:?}, shutting down...",
+                    e
+                );
                 SHARESPACE.StoreShutdown();
                 Kernel::HostSpace::ExitVM(2);
                 panic!("exiting ...");

qkernel/src/syscalls/mod.rs

@@ -21,38 +21,38 @@ pub mod sys_file;
 pub mod sys_futex;
 pub mod sys_getdents;
 pub mod sys_identity;
+pub mod sys_inotify;
 pub mod sys_membarrier;
+pub mod sys_memfd;
 pub mod sys_mempolicy;
 pub mod sys_mmap;
+pub mod sys_mmap_socket;
+pub mod sys_msgqueue;
 pub mod sys_pipe;
 pub mod sys_poll;
 pub mod sys_prctl;
+pub mod sys_proxy;
 pub mod sys_random;
 pub mod sys_read;
 pub mod sys_rlimit;
 pub mod sys_rusage;
+pub mod sys_sched;
 pub mod sys_seccomp;
+pub mod sys_sem;
+pub mod sys_shm;
 pub mod sys_signal;
 pub mod sys_socket;
 pub mod sys_splice;
 pub mod sys_stat;
 pub mod sys_sync;
 pub mod sys_sysinfo;
+pub mod sys_syslog;
 pub mod sys_thread;
 pub mod sys_time;
 pub mod sys_timer;
 pub mod sys_timerfd;
 pub mod sys_tls;
 pub mod sys_utsname;
 pub mod sys_write;
-pub mod syscalls;
-pub mod sys_memfd;
-pub mod sys_sched;
-pub mod sys_inotify;
 pub mod sys_xattr;
-pub mod sys_sem;
-pub mod sys_shm;
-pub mod sys_msgqueue;
-pub mod sys_syslog;
-pub mod sys_mmap_socket;
-pub mod sys_proxy;
+pub mod syscalls;