fix task_stack_size

Author: ZR233

Cargo.toml

@@ -13,11 +13,11 @@ vmx = []
 [dependencies]
 anyhow = {version = "1.0", default-features = false}
 cfg-if = "1.0"
+fdt-parser = "0.5"
+lazyinit = "0.2"
 log = "0.4"
 spin = "0.10"
 timer_list = "0.1"
-fdt-parser = "0.5"
-lazyinit = "0.2"
 
 # System independent crates provided by ArceOS.
 axerrno = "0.1.0"
@@ -34,13 +34,11 @@ axaddrspace = "0.2"
 # axdevice_base = "0.1"
 # axvcpu = "0.1"
 axvmconfig = {version = "0.1", default-features = false}
-
+axconfig = {workspace = true}
 axhal.workspace = true
 axruntime.workspace = true
 axtask.workspace = true
 
-
-
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 # x86_vcpu = "0.1"
 
@@ -54,6 +52,6 @@ arm_vcpu = "0.1"
 # arm_vgic = {version = "0.1", features = ["vgicv3"]}
 
 [patch.crates-io]
+arm_vcpu = {git = "https://github.com/arceos-hypervisor/arm_vcpu", branch = "next"}
 axvcpu = {git = "https://github.com/arceos-hypervisor/axvcpu.git", branch = "next"}
 axvmconfig = {git = "https://github.com/arceos-hypervisor/axvmconfig.git", branch = "next"}
-arm_vcpu = {git = "https://github.com/arceos-hypervisor/arm_vcpu", branch = "next"}

src/arch/aarch64/cpu.rs

@@ -71,4 +71,4 @@ impl arm_vcpu::CpuHal for VCpuHal {
     fn inject_interrupt(&self, irq: usize) {
         todo!()
     }
-}
+}

src/lib.rs

@@ -16,7 +16,7 @@ extern crate log;
 #[macro_use]
 extern crate anyhow;
 
-const TASK_STACK_SIZE: usize = 0x4000; // 16KB
+const TASK_STACK_SIZE: usize = 0x40000; // 16KB
 
 #[cfg_attr(target_arch = "aarch64", path = "arch/aarch64/mod.rs")]
 #[cfg_attr(target_arch = "x86_64", path = "arch/x86_64/mod.rs")]

src/vcpu.rs

@@ -21,8 +21,8 @@
 //     } else if #[cfg(target_arch = "aarch64")] {
 //         pub use arm_vcpu::Aarch64VCpu as AxArchVCpuImpl;
 //         pub use arm_vcpu::Aarch64PerCpu as AxVMArchPerCpuImpl;
-//   
-    //   pub use arm_vcpu::Aarch64VCpuCreateConfig as AxVCpuCreateConfig;
+//
+//   pub use arm_vcpu::Aarch64VCpuCreateConfig as AxVCpuCreateConfig;
 //         pub use arm_vcpu::Aarch64VCpuSetupConfig as AxVCpuSetupConfig;
 //         pub use arm_vcpu::has_hardware_support;
 

src/vhal/mod.rs

@@ -6,9 +6,9 @@ use core::{
 };
 
 use axtask::AxCpuMask;
-
+use axconfig::TASK_STACK_SIZE;
 use crate::{
-    TASK_STACK_SIZE,
+    
     arch::{CpuData, Hal},
     vhal::precpu::PreCpuSet,
 };
@@ -27,7 +27,6 @@ pub fn init() -> anyhow::Result<()> {
 
     info!("Initializing VHal for {cpu_count} CPUs...");
     PRE_CPU.init();
-
     for cpu_id in 0..cpu_count {
         let id = CpuId::new(cpu_id);
         let _handle = axtask::spawn_raw(
@@ -48,7 +47,7 @@ pub fn init() -> anyhow::Result<()> {
             format!("init-cpu-{}", cpu_id),
             TASK_STACK_SIZE,
         );
-        // _handle.join();
+        // handles.push(_handle);
     }
     info!("Waiting for all cores to enable hardware virtualization...");
 
@@ -57,7 +56,9 @@ pub fn init() -> anyhow::Result<()> {
         // Use `yield_now` instead of `core::hint::spin_loop` to avoid deadlock.
         axtask::yield_now();
     }
-
+    // for handle in handles {
+    //     handle.join();
+    // }
     info!("All cores have enabled hardware virtualization support.");
     Ok(())
 }