Step 1: enable VMX

Author: equation314

hypervisor/Cargo.lock

@@ -14,9 +14,13 @@ bitflags = "1.3"
 buddy_system_allocator = "0.8"
 lazy_static = { version = "1.4.0", features = ["spin_no_std"] }
 bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "88e871a" }
+rvm = { path = "../rvm" }
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 x86 = "0.52"
 x86_64 = "0.14"
 x2apic = "0.4"
 raw-cpuid = "10.6"
+
+[profile.release]
+lto = true

hypervisor/Cargo.toml

@@ -25,7 +25,7 @@ GDB := gdb-multiarch
 qemu := qemu-system-$(ARCH)
 qemu_args := -nographic -m 128M
 
-qemu_args += -cpu host,+x2apic -accel kvm
+qemu_args += -cpu host,+x2apic,+vmx -accel kvm
 
 ifeq ($(ARCH), x86_64)
   qemu_args += \

hypervisor/Makefile

@@ -0,0 +1,23 @@
+use rvm::{HostPhysAddr, HostVirtAddr, RvmHal};
+
+use crate::mm::{address, frame};
+
+pub struct RvmHalImpl;
+
+impl RvmHal for RvmHalImpl {
+    fn alloc_page() -> Option<HostPhysAddr> {
+        unsafe { frame::alloc_page() }
+    }
+
+    fn dealloc_page(paddr: HostPhysAddr) {
+        unsafe { frame::dealloc_page(paddr) }
+    }
+
+    fn phys_to_virt(paddr: HostPhysAddr) -> HostVirtAddr {
+        address::phys_to_virt(paddr)
+    }
+
+    fn virt_to_phys(vaddr: HostVirtAddr) -> HostPhysAddr {
+        address::virt_to_phys(vaddr)
+    }
+}

hypervisor/src/hv/hal.rs

@@ -0,0 +1,14 @@
+mod hal;
+
+use rvm::RvmPerCpu;
+
+use self::hal::RvmHalImpl;
+
+pub fn run() {
+    println!("Starting virtualization...");
+    println!("Hardware support: {:?}", rvm::has_hardware_support());
+
+    let mut percpu = RvmPerCpu::<RvmHalImpl>::new(0);
+    let res = percpu.hardware_enable();
+    println!("Hardware enable: {:?}", res);
+}

hypervisor/src/hv/mod.rs

@@ -11,6 +11,7 @@ mod logging;
 
 mod arch;
 mod config;
+mod hv;
 mod mm;
 mod timer;
 
@@ -74,6 +75,9 @@ fn main() -> ! {
     INIT_OK.store(true, Ordering::SeqCst);
     println!("Initialization completed.\n");
 
+    hv::run();
+    println!("Run OK!");
+
     arch::instructions::enable_irqs();
     loop {
         arch::instructions::wait_for_ints();

hypervisor/src/main.rs

@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 mod heap;
 
 pub mod address;

hypervisor/src/mm/mod.rs

@@ -6,4 +6,17 @@ authors = ["Yuekai Jia <equation618@gmail.com>"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+default = ["vmx"]
+vmx = []
+
 [dependencies]
+log = "0.4"
+cfg-if = "1.0"
+bitflags = "1.3"
+bit_field = "0.10"
+
+[target.'cfg(target_arch = "x86_64")'.dependencies]
+x86 = "0.52"
+x86_64 = "0.14"
+raw-cpuid = "10.6"

rvm/Cargo.lock

@@ -0,0 +1,8 @@
+//! Architecture dependent structures.
+
+cfg_if::cfg_if! {
+    if #[cfg(target_arch = "x86_64")] {
+        mod x86_64;
+        pub use self::x86_64::*;
+    }
+}