merge main into cyh-dev 0401

Author: cyh21

.github/workflows/docs.yml

@@ -27,7 +27,7 @@ jobs:
         arch: x86_64
     - name: Build docs
       continue-on-error: ${{ github.ref != env.default-branch && github.event_name != 'pull_request' }}
-      run: make doc_check_missing
+      run: make doc
     - name: Deploy to Github Pages
       if: ${{ github.ref == env.default-branch }}
       uses: JamesIves/github-pages-deploy-action@v4

Cargo.lock

@@ -1,50 +1,77 @@
-[package]
-name = "starry"
+[workspace]
+resolver = "2"
+members = ["api", "core"]
+exclude = [".arceos", "apps"]
+
+[workspace.package]
 version = "0.1.0"
 edition = "2024"
-authors = ["Azure-stars <Azure_stars@126.com>", "Yuekai Jia <equation618@gmail.com>"]
+authors = [
+    "Azure-stars <Azure_stars@126.com>",
+    "Yuekai Jia <equation618@gmail.com>",
+]
 homepage = "https://github.com/arceos-org/arceos"
 repository = "https://github.com/arceos-org/starry-next"
 
-[features]
-lwext4_rs = ["axstd/lwext4_rs"]
-
-[dependencies]
-log = "0.4"
-linkme = "0.3"
-axerrno = "0.1"
-memory_addr = "0.3"
-xmas-elf = "0.9"
-spin = "0.9"
-crate_interface = "0.1"
-bitflags = "2.6"
-percpu = "0.2.0"
-
-kernel-elf-parser = "0.3"
-num_enum = { version = "0.7", default-features = false }
-syscalls = { version = "0.6", default-features = false }
-numeric-enum-macro = "0.2.0"
-static_assertions = "1.1.0"
-macro_rules_attribute = "0.2.0"
+[workspace.dependencies]
+axfeat = { git = "https://github.com/oscomp/arceos.git" }
+arceos_posix_api = { git = "https://github.com/oscomp/arceos.git", features = [
+    "uspace",
+    "smp",
+    "irq",
+    "fs",
+    "multitask",
+    "net",
+    "pipe",
+    "select",
+    "epoll",
+] }
 
 axconfig = { git = "https://github.com/oscomp/arceos.git" }
 axfs = { git = "https://github.com/oscomp/arceos.git" }
-axstd = { git = "https://github.com/oscomp/arceos.git", features = ["paging"] }
 axhal = { git = "https://github.com/oscomp/arceos.git", features = ["uspace"] }
+axlog = { git = "https://github.com/oscomp/arceos.git" }
 axmm = { git = "https://github.com/oscomp/arceos.git" }
-axtask = { git = "https://github.com/oscomp/arceos.git" }
+axns = { git = "https://github.com/oscomp/arceos.git", features = [
+    "thread-local",
+] }
 axsync = { git = "https://github.com/oscomp/arceos.git" }
-axruntime = { git = "https://github.com/oscomp/arceos.git", features = ["multitask"] }
-arceos_posix_api = { git = "https://github.com/oscomp/arceos.git", features = ["uspace", "smp", "irq", "fs", "multitask", "net", "pipe", "select", "epoll"] }
-axns = { git = "https://github.com/oscomp/arceos.git", features = ["thread-local"] }
+axtask = { git = "https://github.com/oscomp/arceos.git" }
+
+axerrno = "0.1"
+bitflags = "2.6"
+linkme = "0.3"
+memory_addr = "0.3"
+
+starry-core = { path = "./core" }
+starry-api = { path = "./api" }
+
+[package]
+name = "starry"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[features]
+lwext4_rs = ["axfeat/lwext4_rs"]
+
+[dependencies]
+axfeat.workspace = true
+
+axhal.workspace = true
+axlog.workspace = true
+axtask.workspace = true
+
+axerrno.workspace = true
+linkme.workspace = true
+
+starry-core.workspace = true
+starry-api.workspace = true
+
+syscalls = { git = "https://github.com/jasonwhite/syscalls.git", rev = "92624de", default-features = false }
 
 [patch.crates-io]
-syscalls = { git = "https://github.com/jasonwhite/syscalls.git", rev = "92624de"}
 page_table_multiarch = { git = "https://github.com/Mivik/page_table_multiarch.git", rev = "19ededd" }
 page_table_entry = { git = "https://github.com/Mivik/page_table_multiarch.git", rev = "19ededd" }
-
-[target.'cfg(target_arch = "x86_64")'.dependencies]
-x86 = "0.52"
-
-[build-dependencies]
-toml_edit = "0.22"

Cargo.toml

@@ -5,6 +5,9 @@ LOG ?= off
 AX_TESTCASES_LIST=$(shell cat ./apps/$(AX_TESTCASE)/testcase_list | tr '\n' ',')
 FEATURES ?= fp_simd
 
+export NO_AXSTD := y
+export AX_LIB := axfeat
+
 RUSTDOCFLAGS := -Z unstable-options --enable-index-page -D rustdoc::broken_intra_doc_links -D missing-docs
 EXTRA_CONFIG ?= $(PWD)/configs/$(ARCH).toml
 ifneq ($(filter $(MAKECMDGOALS),doc_check_missing),) # make doc_check_missing
@@ -68,7 +71,7 @@ clean: ax_root
 	done
 	@cargo clean
 
-doc_check_missing:
-	@cargo doc --no-deps --all-features --workspace
+doc: defconfig
+	@AX_CONFIG_PATH=$(PWD)/.axconfig.toml cargo doc --no-deps --all-features --workspace
 
 .PHONY: all ax_root build run justrun debug disasm clean test_build

Makefile

@@ -23,6 +23,7 @@ Create a container and build/run app:
 cd ..
 docker run --privileged --rm -it -v $(pwd):/starry -w /starry starry bash
 
+
 # Now build/run app in the container
 make user_apps
 make defconfig
@@ -168,7 +169,17 @@ To run more testcases from oscomp, you can refer to the [oscomp README](./apps/o
 
 ## How to add new testcases
 
-To allow the kernel to run user-written test cases, temporary test cases can be created. The specific steps are as follows:
+To allow the kernel to run user-written test cases, temporary test cases can be created. 
+
+
+If you want to add source codes of the testcases, you can refer to the [libc testcases](./apps/libc) and add your source codes in the [c testcase](./apps/libc/c/) folder, and append the [testcase_list](./apps/libc/testcase_list) with your testcase name. Then you can run the testcases with the following commands:
+
+```sh
+make AX_TESTCASE=libc user_apps ARCH=$(YOUR_ARCH)
+make AX_TESTCASE=libc BLK=y NET=y FEATURES=fp_simd ACCEL=n run ARCH=$(YOUR_ARCH)
+```
+
+If you want to add **executable file** directly, the specific steps are as follows:
 
    1. Create a temporary test case folder
 
@@ -189,28 +200,7 @@ To allow the kernel to run user-written test cases, temporary test cases can be
 
       The reason for creating an empty build `Makefile` is that when Starry packages test case images, it will first execute the test case's build program by default. However, since our temporary test case does not currently have a defined build program, `make all` does not need to perform any operations.
 
-   3. Copy your compiled executable file into the current directory.
-
-      Let's take a `hello_world` example. Create a `hello.c` file in the current directory and write the following content:
-
-      ```c
-      #include "syscall.h"
-      
-      int main()
-      {
-          char msg[] = "Hello, World!\n";
-          write(1, msg, sizeof(msg));
-          return 0;
-      }
-      ```
-
-      Then, run the following command to compile it:
-
-      ```sh
-      x86_64-linux-musl-gcc -static hello.c -o hello
-      ```
-
-      This generates an x86_64 executable file in the current folder. Of course, you can also complete the compilation process elsewhere and directly copy the executable file into the current directory.
+   3. Copy your **executable file** into the current directory.
 
    4. Create a `testcase_list` file in the current directory and add the relative path of the executable file that needs to be executed. Note that this path should be relative to `apps/custom` (i.e., the current directory). In our example, the content should be:
 
@@ -224,7 +214,7 @@ To allow the kernel to run user-written test cases, temporary test cases can be
       sudo ./build_img.sh -fs ext4 -file apps/custom
       cp disk.img .arceos/disk.img
       make defconfig
-      make AX_TESTCASE=custom EXTRA_CONFIG=../configs/x86_64.toml ARCH=x86_64 BLK=y NET=y FEATURES=fp_simd,lwext4_rs LOG=off ACCEL=n run
+      make AX_TESTCASE=custom ARCH=x86_64 BLK=y NET=y FEATURES=fp_simd,lwext4_rs LOG=off ACCEL=n run
       ```
 
-      This completes the execution of the custom test case.
+      This completes the execution of the custom test case.

README.md

@@ -0,0 +1,29 @@
+[package]
+name = "starry-api"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+
+[dependencies]
+axconfig.workspace = true
+axfs.workspace = true
+axhal.workspace = true
+axlog.workspace = true
+axsync.workspace = true
+axtask.workspace = true
+arceos_posix_api.workspace = true
+
+axerrno.workspace = true
+bitflags.workspace = true
+memory_addr.workspace = true
+
+starry-core.workspace = true
+
+macro_rules_attribute = "0.2"
+num_enum = { version = "0.7", default-features = false }
+static_assertions = "1.1"
+
+[target.'cfg(target_arch = "x86_64")'.dependencies]
+x86 = "0.52"

api/Cargo.toml

@@ -7,7 +7,7 @@ use macro_rules_attribute::apply;
 
 use crate::{
     ptr::{PtrWrapper, UserConstPtr, UserPtr},
-    syscall_imp::syscall_instrument,
+    syscall_instrument,
 };
 
 /// The ioctl() system call manipulates the underlying device parameters
@@ -32,7 +32,7 @@ pub fn sys_chdir(path: UserConstPtr<c_char>) -> LinuxResult<isize> {
     })
 }
 
-pub(crate) fn sys_mkdirat(dirfd: i32, path: UserConstPtr<c_char>, mode: u32) -> LinuxResult<isize> {
+pub fn sys_mkdirat(dirfd: i32, path: UserConstPtr<c_char>, mode: u32) -> LinuxResult<isize> {
     let path = path.get_as_str()?;
 
     if !path.starts_with("/") && dirfd != AT_FDCWD as i32 {