Vmm inject interrupt

.gitignore

@@ -10,3 +10,4 @@ qemu.log
 rusty-tags.vi
 /.project*
 /.axconfig.*
+zignore-*

Cargo.toml

@@ -16,6 +16,7 @@ members = [
     "modules/axruntime",
     "modules/axsync",
     "modules/axtask",
+    "modules/axipi",
 
     "api/axfeat",
     "api/arceos_api",
@@ -29,6 +30,8 @@ members = [
     "examples/httpserver",
     "examples/httpserver",
     "examples/shell",
+
+    "examples/ticker",
 ]
 
 [workspace.package]
@@ -64,6 +67,7 @@ axruntime = { path = "modules/axruntime" }
 axsync = { path = "modules/axsync" }
 axtask = { path = "modules/axtask" }
 axdma = { path = "modules/axdma" }
+axipi = { path = "modules/axipi" }
 
 allocator = { git = "https://github.com/arceos-org/allocator.git", tag = "v0.1.1" }
 

api/arceos_api/Cargo.toml

@@ -13,6 +13,7 @@ documentation = "https://arceos-org.github.io/arceos/arceos_api/index.html"
 default = []
 
 irq = ["axfeat/irq"]
+ipi = ["dep:axipi", "axfeat/ipi"]
 alloc = ["dep:axalloc", "axfeat/alloc"]
 paging = ["dep:axmm", "axfeat/paging"]
 dma = ["dep:axdma", "axfeat/dma"]
@@ -43,3 +44,4 @@ axdriver = { workspace = true, optional = true }
 axfs = { workspace = true, optional = true }
 axnet = { workspace = true, optional = true }
 axdisplay = { workspace = true, optional = true }
+axipi = { workspace = true, optional = true }

api/arceos_api/src/lib.rs

@@ -402,6 +402,8 @@ pub mod modules {
     pub use axdriver;
     #[cfg(feature = "fs")]
     pub use axfs;
+    #[cfg(feature = "ipi")]
+    pub use axipi;
     #[cfg(feature = "paging")]
     pub use axmm;
     #[cfg(feature = "net")]

api/arceos_posix_api/build.rs

@@ -76,18 +76,23 @@ typedef struct {{
         impl bindgen::callbacks::ParseCallbacks for MyCallbacks {
             fn include_file(&self, fname: &str) {
                 if !fname.contains("ax_pthread_mutex.h") {
-                    println!("cargo:rerun-if-changed={}", fname);
+                    println!("cargo:rerun-if-changed={fname}");
                 }
             }
         }
 
+        let target = std::env::var("TARGET").unwrap();
         let mut builder = bindgen::Builder::default()
             .header(in_file)
             .clang_arg("-I./../../ulib/axlibc/include")
             .parse_callbacks(Box::new(MyCallbacks))
             .derive_default(true)
             .size_t_is_usize(false)
             .use_core();
+        if let Some(llvm_target) = target.strip_suffix("-softfloat") {
+            // remove "-softfloat" suffix for some targets
+            builder = builder.clang_arg(format!("--target={llvm_target}"));
+        }
         for ty in allow_types {
             builder = builder.allowlist_type(ty);
         }

api/axfeat/Cargo.toml

@@ -20,6 +20,7 @@ fp_simd = ["axhal/fp_simd"]
 
 # Interrupts
 irq = ["axhal/irq", "axruntime/irq", "axtask?/irq"]
+ipi = ["irq", "dep:axipi", "axhal/ipi", "axruntime/ipi"]
 gicv3 = ["axhal/gicv3"]
 
 # Memory
@@ -61,7 +62,7 @@ driver-fxmac = ["axdriver?/fxmac"] # fxmac ethernet driver for PhytiumPi
 driver-bcm2835-sdhci = ["axdriver?/bcm2835-sdhci"]
 
 #Hypervisor support 
-hv = ["axhal/hv"]
+hv = ["axhal/hv", "ipi"]
 
 # Logging
 log-level-off = ["axlog/log-level-off"]
@@ -82,4 +83,5 @@ axnet = { workspace = true, optional = true }
 axdisplay = { workspace = true, optional = true }
 axsync = { workspace = true, optional = true }
 axtask = { workspace = true, optional = true }
+axipi = { workspace = true, optional = true }
 kspin = { version = "0.1", optional = true }

api/axfeat/src/lib.rs

@@ -7,6 +7,7 @@
 //!     - `fp_simd`: Enable floating point and SIMD support.
 //! - Interrupts:
 //!     - `irq`: Enable interrupt handling support.
+//!     - `ipi`: Enable Inter-Processor Interrupts (IPIs).
 //! - Memory
 //!     - `alloc`: Enable dynamic memory allocation.
 //!     - `alloc-tlsf`: Use the TLSF allocator.

configs/platforms/aarch64-qemu-virt.toml

@@ -97,7 +97,7 @@ uart-irq = 1                    # uint
 gicc-paddr = 0x0801_0000        # uint
 # GIC Distributor base address
 gicd-paddr = 0x0800_0000        # uint
-# GIC Rdistributor base address
+# GIC Redistributor base address
 gicr-paddr = 0x080a_0000 
 
 # PSCI

configs/platforms/aarch64-rk3588j.toml

@@ -72,4 +72,5 @@ psci-method = "smc"
 #     compatible = "arm,pl031\0arm,primecell";
 # };
 # RTC (PL031) Address
-# rtc-paddr = "0x901_0000"
+# rtc-paddr = "0x901_0000"
+nothing = "nothing" # str

examples/helloworld/Cargo.toml

@@ -7,4 +7,4 @@ authors = ["Yuekai Jia <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-axstd = { workspace = true, optional = true }
+axstd = { workspace = true, features = ["irq"], optional = true }

examples/ticker/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "arceos-ticker"
+version = "0.1.0"
+edition.workspace = true
+authors = ["aarkegz <[email protected]>"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+axstd = { workspace = true, features = ["irq", "multitask", "paging"], optional = true }

examples/ticker/src/main.rs

@@ -0,0 +1,26 @@
+#![cfg_attr(feature = "axstd", no_std)]
+#![cfg_attr(feature = "axstd", no_main)]
+
+use core::time::Duration;
+
+#[cfg(feature = "axstd")]
+use axstd::os::arceos::api::time::ax_monotonic_time;
+#[cfg(feature = "axstd")]
+use axstd::os::arceos::modules;
+#[cfg(feature = "axstd")]
+use axstd::println;
+
+#[cfg_attr(feature = "axstd", unsafe(no_mangle))]
+fn main() {
+    #[cfg(feature = "axstd")]
+    {
+        println!("Ticking!");
+
+        println!("Current monotonic time: {:?}", ax_monotonic_time());
+
+        loop {
+            modules::axtask::sleep(Duration::from_millis(500));
+            println!("Current monotonic time: {:?}", ax_monotonic_time());
+        }
+    }
+}

modules/axalloc/Cargo.toml

@@ -21,6 +21,6 @@ page-alloc-4g = ["allocator/page-alloc-4g"] # Support up to 4G memory capacity
 log = "=0.4.21"
 cfg-if = "1.0"
 kspin = "0.1"
-memory_addr = "0.3"
+memory_addr = "0.4"
 axerrno = "0.1"
 allocator = { git = "https://github.com/arceos-org/allocator.git", tag ="v0.1.1", features = ["bitmap"] }

modules/axdma/Cargo.toml

@@ -13,7 +13,7 @@ documentation = "https://arceos-org.github.io/arceos/axdma/index.html"
 [dependencies]
 log = "=0.4.21"
 kspin = "0.1"
-memory_addr = "0.3"
+memory_addr = "0.4"
 axerrno = "0.1"
 allocator = { git = "https://github.com/arceos-org/allocator.git", tag = "v0.1.1" }
 axalloc = { workspace = true }