[feat] Use ctor to init resources manually before entering main func

arceos-org · Nov 20, 2024 · 5ccc2bf · 5ccc2bf
1 parent ea19a87
commit 5ccc2bf
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/arceos_posix_api/Cargo.toml b/api/arceos_posix_api/Cargo.toml
@@ -53,7 +53,7 @@ static_assertions = "1.1.0"
 spin = { version = "0.9" }
 lazy_static = { version = "1.5", features = ["spin_no_std"] }
 crate_interface = "0.1"
-linkme = "0.3"
+ctor_bare = "0.1"
 
 [build-dependencies]
 bindgen ={ version = "0.69" }
diff --git a/api/arceos_posix_api/src/imp/mod.rs b/api/arceos_posix_api/src/imp/mod.rs
@@ -19,8 +19,8 @@ pub mod pipe;
 #[cfg(feature = "multitask")]
 pub mod pthread;
 
+#[ctor_bare::register_ctor]
 #[cfg(feature = "fd")]
-#[linkme::distributed_slice(axns::INIT_RESOURCE)]
 fn init_stdio() {
     use crate::imp::fd_ops::FD_TABLE;
     use alloc::sync::Arc;

diff --git a/modules/axhal/linker.lds.S b/modules/axhal/linker.lds.S
@@ -25,6 +25,15 @@ SECTIONS
         _erodata = .;
     }
 
+    .init_array : ALIGN(4K) {
+        _sinit_array = .;
+        __init_array_start = .;
+        *(.init_array .init_array.*)
+        __init_array_end = .;
+        . = ALIGN(4K);
+        _einit_array = .;
+    }
+
     .data : ALIGN(4K) {
         _sdata = .;
         *(.data.boot_page_table)

diff --git a/modules/axhal/src/mem.rs b/modules/axhal/src/mem.rs
@@ -90,6 +90,12 @@ fn kernel_image_regions() -> impl Iterator<Item = MemRegion> {
             flags: MemRegionFlags::RESERVED | MemRegionFlags::READ,
             name: ".rodata",
         },
+        MemRegion {
+            paddr: virt_to_phys((_sinit_array as usize).into()),
+            size: _einit_array as usize - _sinit_array as usize,
+            flags: MemRegionFlags::RESERVED | MemRegionFlags::READ,
+            name: ".init_array",
+        },
         MemRegion {
             paddr: virt_to_phys((_sdata as usize).into()),
             size: _edata as usize - _sdata as usize,
@@ -153,6 +159,8 @@ extern "C" {
     fn _etext();
     fn _srodata();
     fn _erodata();
+    fn _sinit_array();
+    fn _einit_array();
     fn _sdata();
     fn _edata();
     fn _sbss();

diff --git a/modules/axmm/src/lib.rs b/modules/axmm/src/lib.rs
@@ -37,6 +37,9 @@ pub fn new_kernel_aspace() -> AxResult<AddrSpace> {
         axconfig::KERNEL_ASPACE_SIZE,
     )?;
     for r in axhal::mem::memory_regions() {
+        if r.size == 0 {
+            continue;
+        }
         aspace.map_linear(phys_to_virt(r.paddr), r.paddr, r.size, r.flags.into())?;
     }
     Ok(aspace)

diff --git a/modules/axns/Cargo.toml b/modules/axns/Cargo.toml
@@ -17,10 +17,8 @@ default = []
 thread-local = []
 
 [dependencies]
-log = "0.4.21"
 lazyinit = "0.2"
 crate_interface = "0.1"
-linkme = "0.3"
 
 [dev-dependencies]
 axns = { workspace = true, features = ["thread-local"] }
diff --git a/modules/axns/src/lib.rs b/modules/axns/src/lib.rs
@@ -23,7 +23,6 @@ extern crate alloc;
 
 use alloc::sync::Arc;
 use core::{alloc::Layout, fmt, ops::Deref};
-use linkme::distributed_slice;
 
 use lazyinit::LazyInit;
 
@@ -32,10 +31,6 @@ extern "C" {
     fn __stop_axns_resource();
 }
 
-/// A distributed slice that contains all method to initialize user-defined resources.
-#[distributed_slice]
-pub static INIT_RESOURCE: [fn()];
-
 /// A namespace that contains all user-defined resources.
 ///
 /// There are two types of namespaces:

diff --git a/modules/axruntime/Cargo.toml b/modules/axruntime/Cargo.toml
@@ -40,5 +40,6 @@ axns = { workspace = true, optional = true }
 crate_interface = "0.1"
 percpu = { version = "0.1", optional = true }
 kernel_guard = { version = "0.1", optional = true }
+ctor_bare = "0.1"
 
 chrono = { version = "0.4.38", default-features = false }
diff --git a/modules/axruntime/src/lib.rs b/modules/axruntime/src/lib.rs
@@ -186,10 +186,7 @@ pub extern "C" fn rust_main(cpu_id: usize, dtb: usize) -> ! {
     info!("Primary CPU {} init OK.", cpu_id);
     INITED_CPUS.fetch_add(1, Ordering::Relaxed);
 
-    #[cfg(feature = "alloc")]
-    for init in axns::INIT_RESOURCE.iter() {
-        init();
-    }
+    ctor_bare::call_ctors();
 
     while !is_init_ok() {
         core::hint::spin_loop();