refactor: migrate arceos (#317)

Author: AsakuraMizu

Cargo.lock

@@ -32,37 +32,41 @@ timer_list = "0.1"
 toml = "0.9"
 
 # System dependent modules provided by ArceOS.
-axstd = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1", features = [
+# FIXME: pin to a specific tag!
+axstd = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202", features = [
   "alloc-level-1",
   "paging",
   "irq",
   "multitask",
+  "task-ext",
   "smp", # "page-alloc-64g",
 ]}
 
-axalloc = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axconfig = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axdisplay = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axdriver = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axfs = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axhal = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axipi = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axlog = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axmm = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axnet = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
-axtask = {git = "https://github.com/arceos-hypervisor/arceos.git", tag = "hv-0.4.1"}
+axalloc = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
+axconfig = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
+axdisplay = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
+axdriver = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
+axfs = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
+axhal = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
+axipi = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
+axlog = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
+axmm = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
+axnet = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
+axtask = {git = "https://github.com/arceos-org/arceos.git", tag = "dev-251202"}
 
-axplat = {git = "https://github.com/arceos-hypervisor/axplat_crates.git", tag = "vmm-v0.3.0"}
+axcpu = {git = "https://github.com/arceos-org/axcpu.git", tag = "dev-v03"}
+axplat = {git = "https://github.com/arceos-org/axplat_crates.git", tag = "dev-v03"}
 
 # System dependent modules provided by ArceOS-Hypervisor.
 axaddrspace = "0.1.1"
 axhvc = {git = "https://github.com/arceos-hypervisor/axhvc.git"}
+axklib = {git = "https://github.com/arceos-hypervisor/axklib.git"}
 axruntime = {path = "modules/axruntime"}
 axvcpu = "0.1"
 axvm = {git = "https://github.com/arceos-hypervisor/axvm.git", branch = "next"}
 
 # System independent crates provided by ArceOS, these crates could be imported by remote url. 
-axerrno = "0.1.0"
+axerrno = "0.2"
 byte-unit = {version = "5", default-features = false, features = ["byte"]}
 crate_interface = "0.1"
 fdt-parser = "0.4"
@@ -88,6 +92,6 @@ axvmconfig = {git = "https://github.com/arceos-hypervisor/axvmconfig.git", branc
 axvcpu = {git = "https://github.com/arceos-hypervisor/axvcpu.git", branch = "next"}
 axvmconfig = {git = "https://github.com/arceos-hypervisor/axvmconfig.git", branch = "next"}
 
-[patch."https://github.com/arceos-hypervisor/arceos"]
+[patch."https://github.com/arceos-org/arceos"]
 axconfig = {path = "modules/axconfig"}
 axruntime = {path = "modules/axruntime"}

Cargo.toml

@@ -41,6 +41,7 @@ axvm.workspace = true
 axerrno.workspace = true
 byte-unit = {version = "5", default-features = false, features = ["byte"]}
 crate_interface.workspace = true
+extern-trait = "0.2"
 fdt-parser = "0.4"
 memory_addr.workspace = true
 page_table_entry = {version = "0.5", features = ["arm-el2"]}
@@ -62,7 +63,7 @@ aarch64-cpu-ext = "0.1"
 arm-gic-driver = {version = "0.15.5", features = ["rdif"]}
 
 [build-dependencies]
-axconfig = {git = "https://github.com/arceos-hypervisor/arceos.git", branch = "vmm-dev"}
+axconfig.workspace = true
 prettyplease = "0.2"
 quote = "1.0"
 syn = "2.0"

kernel/Cargo.toml

@@ -1,9 +1,6 @@
 use std::os::arceos::{
     self,
-    modules::{
-        axhal::percpu::this_cpu_id,
-        axtask::{self, TaskExtRef},
-    },
+    modules::{axhal::percpu::this_cpu_id, axtask},
 };
 
 use axerrno::{AxResult, ax_err_type};
@@ -19,7 +16,7 @@ use axvm::{AxVMHal, AxVMPerCpu};
 #[cfg_attr(target_arch = "x86_64", path = "arch/x86_64/mod.rs")]
 pub mod arch;
 
-use crate::{hal::arch::hardware_check, vmm};
+use crate::{hal::arch::hardware_check, task::AsVCpuTask, vmm};
 
 #[allow(unused)]
 #[repr(C)]
@@ -48,11 +45,11 @@ impl AxVMHal for AxVMHalImpl {
     }
 
     fn current_vm_id() -> usize {
-        axtask::current().task_ext().vm().id()
+        axtask::current().as_vcpu_task().vm().id()
     }
 
     fn current_vcpu_id() -> usize {
-        axtask::current().task_ext().vcpu.id()
+        axtask::current().as_vcpu_task().vcpu.id()
     }
 
     fn current_pcpu_id() -> usize {
@@ -64,7 +61,7 @@ impl AxVMHal for AxVMHalImpl {
             .ok_or_else(|| ax_err_type!(NotFound))
     }
 
-    fn inject_irq_to_vcpu(vm_id: usize, vcpu_id: usize, irq: usize) -> axerrno::AxResult {
+    fn inject_irq_to_vcpu(vm_id: usize, vcpu_id: usize, irq: usize) -> AxResult {
         vmm::with_vm_and_vcpu_on_pcpu(vm_id, vcpu_id, move |_, vcpu| {
             vcpu.inject_interrupt(irq).unwrap();
         })

kernel/src/hal/mod.rs

@@ -1,34 +1,45 @@
-use crate::vmm::{VCpuRef, VM, VMRef};
 use alloc::sync::{Arc, Weak};
-use std::os::arceos::modules::axtask::def_task_ext;
+use std::os::arceos::modules::axtask::{TaskExt, TaskInner};
+
+use crate::vmm::{VCpuRef, VM, VMRef};
 
 /// Task extended data for the hypervisor.
-pub struct TaskExt {
+pub struct VCpuTask {
     /// The VM (Weak reference to avoid keeping VM alive).
     pub vm: Weak<VM>,
     /// The virtual CPU.
     pub vcpu: VCpuRef,
 }
 
-impl TaskExt {
-    /// Create TaskExt with a Weak reference from a VMRef
-    pub const fn new(vm: Weak<VM>, vcpu: VCpuRef) -> Self {
-        Self { vm, vcpu }
+impl VCpuTask {
+    /// Create a new [`HvTask`].
+    pub fn new(vm: &VMRef, vcpu: VCpuRef) -> Self {
+        Self {
+            vm: Arc::downgrade(vm),
+            vcpu,
+        }
     }
 
     /// Get a strong reference to the VM if it's still alive.
     /// Returns None if the VM has been dropped.
     pub fn vm(&self) -> VMRef {
         self.vm.upgrade().expect("VM has been dropped")
     }
+}
 
-    /// Helper to create TaskExt from a VMRef by downgrading to Weak.
-    pub fn from_vm_ref(vm: VMRef, vcpu: VCpuRef) -> Self {
-        Self {
-            vm: Arc::downgrade(&vm),
-            vcpu,
+#[extern_trait::extern_trait]
+unsafe impl TaskExt for VCpuTask {}
+
+pub trait AsVCpuTask {
+    fn as_vcpu_task(&self) -> &VCpuTask;
+}
+
+impl AsVCpuTask for TaskInner {
+    fn as_vcpu_task(&self) -> &VCpuTask {
+        unsafe {
+            self.task_ext()
+                .expect("Not a VCpuTask")
+                .downcast_ref::<VCpuTask>()
         }
     }
 }
-
-def_task_ext!(TaskExt);

kernel/src/task.rs

@@ -13,12 +13,15 @@ pub mod fdt;
 use core::sync::atomic::{AtomicUsize, Ordering};
 use std::os::arceos::{
     api::task::{self, AxWaitQueueHandle},
-    modules::axtask::{self, TaskExtRef},
+    modules::axtask,
 };
 
 use axerrno::{AxResult, ax_err_type};
 
-use crate::hal::{AxVCpuHalImpl, AxVMHalImpl};
+use crate::{
+    hal::{AxVCpuHalImpl, AxVMHalImpl},
+    task::AsVCpuTask,
+};
 pub use timer::init_percpu as init_timer_percpu;
 
 /// The instantiated VM type.
@@ -107,8 +110,8 @@ pub fn with_vm_and_vcpu_on_pcpu(
     // Disables preemption and IRQs to prevent the current task from being preempted or re-scheduled.
     let guard = kernel_guard::NoPreemptIrqSave::new();
 
-    let current_vm = axtask::current().task_ext().vm().id();
-    let current_vcpu = axtask::current().task_ext().vcpu.id();
+    let current_vm = axtask::current().as_vcpu_task().vm().id();
+    let current_vcpu = axtask::current().as_vcpu_task().vcpu.id();
 
     // The target vCPU is the current task, execute the closure directly.
     if current_vm == vm_id && current_vcpu == vcpu_id {

kernel/src/vmm/mod.rs

@@ -10,16 +10,19 @@ use std::os::arceos::{
     api::task::{AxCpuMask, ax_wait_queue_wake},
     modules::{
         axhal::{self, time::busy_wait},
-        axtask,
+        axtask::{self, AxTaskExt},
     },
 };
 
 use axaddrspace::GuestPhysAddr;
-use axtask::{AxTaskRef, TaskExtRef, TaskInner, WaitQueue};
+use axtask::{AxTaskRef, TaskInner, WaitQueue};
 use axvcpu::{AxVCpuExitReason, VCpuState};
 
-use crate::vmm::{VCpuRef, VMRef, sub_running_vm_count};
-use crate::{hal::arch::inject_interrupt, task::TaskExt};
+use crate::{hal::arch::inject_interrupt, task::VCpuTask};
+use crate::{
+    task::AsVCpuTask,
+    vmm::{VCpuRef, VMRef, sub_running_vm_count},
+};
 
 const KERNEL_STACK_SIZE: usize = 0x40000; // 256 KiB
 
@@ -139,7 +142,8 @@ impl VMVCpus {
 
     #[allow(dead_code)]
     fn notify_one(&mut self) {
-        info!("Current wait queue length: {}", self.wait_queue.len());
+        // FIXME: `WaitQueue::len` is removed
+        // info!("Current wait queue length: {}", self.wait_queue.len());
         self.wait_queue.notify_one(false);
     }
 
@@ -250,12 +254,11 @@ pub(crate) fn cleanup_vm_vcpus(vm_id: usize) {
                 idx,
                 task.id_name()
             );
-            if let Some(exit_code) = task.join() {
-                debug!(
-                    "VM[{}] VCpu task[{}] exited with code: {}",
-                    vm_id, idx, exit_code
-                );
-            }
+            let exit_code = task.join();
+            debug!(
+                "VM[{}] VCpu task[{}] exited with code: {}",
+                vm_id, idx, exit_code
+            );
         }
 
         info!(
@@ -318,7 +321,7 @@ fn vcpu_on(vm: VMRef, vcpu_id: usize, entry_point: GuestPhysAddr, arg: usize) {
         vcpu.set_gpr(1, arg);
     }
 
-    let vcpu_task = alloc_vcpu_task(vm.clone(), vcpu);
+    let vcpu_task = alloc_vcpu_task(&vm, vcpu);
 
     VM_VCPU_TASK_WAIT_QUEUE
         .get_mut(&vm.id())
@@ -342,7 +345,7 @@ pub fn setup_vm_primary_vcpu(vm: VMRef) {
     let primary_vcpu_id = 0;
 
     let primary_vcpu = vm.vcpu_list()[primary_vcpu_id].clone();
-    let primary_vcpu_task = alloc_vcpu_task(vm.clone(), primary_vcpu);
+    let primary_vcpu_task = alloc_vcpu_task(&vm, primary_vcpu);
     vm_vcpus.add_vcpu_task(primary_vcpu_task);
 
     VM_VCPU_TASK_WAIT_QUEUE.insert(vm_id, vm_vcpus);
@@ -383,7 +386,7 @@ pub fn with_vcpu_task<T, F: FnOnce(&AxTaskRef) -> T>(
 /// * The task associated with the VCpu is created with a kernel stack size of 256 KiB.
 /// * The task is created in blocked state and added to the wait queue directly,
 ///   instead of being added to the ready queue. It will be woken up by notify_primary_vcpu().
-fn alloc_vcpu_task(vm: VMRef, vcpu: VCpuRef) -> AxTaskRef {
+fn alloc_vcpu_task(vm: &VMRef, vcpu: VCpuRef) -> AxTaskRef {
     info!("Spawning task for VM[{}] VCpu[{}]", vm.id(), vcpu.id());
     let mut vcpu_task = TaskInner::new(
         vcpu_run,
@@ -396,7 +399,8 @@ fn alloc_vcpu_task(vm: VMRef, vcpu: VCpuRef) -> AxTaskRef {
     }
 
     // Use Weak reference in TaskExt to avoid keeping VM alive
-    vcpu_task.init_task_ext(TaskExt::from_vm_ref(vm.clone(), vcpu));
+    let inner = VCpuTask::new(vm, vcpu);
+    *vcpu_task.task_ext_mut() = Some(unsafe { AxTaskExt::from_impl(inner) });
 
     info!(
         "VCpu task {} created {:?}",
@@ -414,8 +418,8 @@ fn alloc_vcpu_task(vm: VMRef, vcpu: VCpuRef) -> AxTaskRef {
 fn vcpu_run() {
     let curr = axtask::current();
 
-    let vm = curr.task_ext().vm();
-    let vcpu = curr.task_ext().vcpu.clone();
+    let vm = curr.as_vcpu_task().vm();
+    let vcpu = curr.as_vcpu_task().vcpu.clone();
     let vm_id = vm.id();
     let vcpu_id = vcpu.id();
 

kernel/src/vmm/vcpus.rs

@@ -53,5 +53,5 @@ chrono = {version = "0.4.38", default-features = false}
 axplat-x86-qemu-q35 = {workspace = true}
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
-axplat-aarch64-dyn = {git = "https://github.com/arceos-hypervisor/axplat-aarch64-dyn", tag = "v0.3.3", features = ["irq", "smp", "hv"]}
+axplat-aarch64-dyn = {git = "https://github.com/arceos-hypervisor/axplat-aarch64-dyn.git", branch = "v03", features = ["irq", "smp", "hv"]}
 somehal = "0.4"

modules/axruntime/Cargo.toml

@@ -112,7 +112,7 @@ fn is_init_ok() -> bool {
 #[cfg_attr(not(test), axplat::main)]
 pub fn rust_main(cpu_id: usize, arg: usize) -> ! {
     unsafe { axhal::mem::clear_bss() };
-    axhal::init_percpu(cpu_id);
+    axhal::percpu::init_primary(cpu_id);
     axhal::init_early(cpu_id, arg);
 
     ax_println!("{}", LOGO);

modules/axruntime/src/lib.rs

@@ -39,7 +39,7 @@ pub fn start_secondary_cpus(primary_cpu_id: usize) {
 /// It is called from the bootstrapping code in the specific platform crate.
 #[axplat::secondary_main]
 pub fn rust_main_secondary(cpu_id: usize) -> ! {
-    axhal::init_percpu_secondary(cpu_id);
+    axhal::percpu::init_secondary(cpu_id);
     axhal::init_early_secondary(cpu_id);
 
     ENTERED_CPUS.fetch_add(1, Ordering::Release);