Merge pull request #325 from YdrMaster/main

remove alphine
adjust the structure of download directory

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ env.rust_toolchain }}
-          components: rust-src, llvm-tools-preview, rustfmt, clippy
+          components: rust-src, llvm-tools-preview
 
       - name: Run unit test
         uses: actions-rs/cargo@v1
@@ -49,23 +49,6 @@ jobs:
 #          github-token: ${{ secrets.GITHUB_TOKEN }}
 #          path-to-lcov: ${{ steps.coverage.outputs.report }}
 
-  bench-test:
-    name: Bench Test
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ env.rust_toolchain }}
-          components: rust-src, llvm-tools-preview, rustfmt, clippy
-
-      - name: Run bench test
-        uses: actions-rs/cargo@v1
-        with:
-          command: bench
-
   zircon-core-test-libos:
     name: Zircon Core Test Libos
     runs-on: ubuntu-20.04
@@ -78,7 +61,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ env.rust_toolchain }}
-          components: rust-src, llvm-tools-preview, rustfmt, clippy
+          components: rust-src, llvm-tools-preview
 
       - name: Pull prebuilt images
         run: |
@@ -110,7 +93,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ env.rust_toolchain }}
-          components: rust-src, llvm-tools-preview, rustfmt, clippy
+          components: rust-src, llvm-tools-preview
 
       - name: Pull prebuilt images
         run: |
@@ -160,7 +143,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ env.rust_toolchain }}
-          components: rust-src, llvm-tools-preview, rustfmt, clippy
+          components: rust-src, llvm-tools-preview
 
       - name: Cache musl toolchain
         uses: actions/cache@v3
@@ -169,7 +152,7 @@ jobs:
           key: ${{ matrix.arch }}-linux-musl-cross
 
       - name: Prepare rootfs
-        run: make libc-test
+        run: cargo xtask libos-libc-test
 
       - name: Install python dependencies
         run: pip3 install -r tests/requirements.txt
@@ -198,13 +181,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ env.rust_toolchain }}
-          components: rust-src, llvm-tools-preview, rustfmt, clippy
-
-      - if: matrix.arch == 'riscv64'
-        uses: actions-rs/[email protected]
-        with:
-          crate: cargo-binutils
-          version: latest
+          components: rust-src, llvm-tools-preview
 
       - name: Cache QEMU
         id: cache-qemu
@@ -234,6 +211,12 @@ jobs:
       - name: Prepare rootfs
         run: make libc-test ARCH=${{ matrix.arch }} && make image ARCH=${{ matrix.arch }}
 
+      - if: matrix.arch == 'riscv64'
+        uses: actions-rs/[email protected]
+        with:
+          crate: cargo-binutils
+          version: latest
+
       - name: Install python dependencies
         run: pip3 install -r tests/requirements.txt
 
@@ -261,13 +244,7 @@ jobs:
         with:
           profile: minimal
           toolchain: ${{ env.rust_toolchain }}
-          components: rust-src, llvm-tools-preview, rustfmt, clippy
-
-      - if: matrix.arch == 'riscv64'
-        uses: actions-rs/[email protected]
-        with:
-          crate: cargo-binutils
-          version: latest
+          components: rust-src, llvm-tools-preview
 
       - name: Cache QEMU
         id: cache-qemu
@@ -297,6 +274,12 @@ jobs:
       - name: Prepare rootfs
         run: make other-test ARCH=${{ matrix.arch }} && make image ARCH=${{ matrix.arch }}
 
+      - if: matrix.arch == 'riscv64'
+        uses: actions-rs/[email protected]
+        with:
+          crate: cargo-binutils
+          version: latest
+
       - name: Install python dependencies
         run: pip3 install -r tests/requirements.txt
 

Makefile

@@ -48,7 +48,7 @@ clean:
 	rm -rf zCore/disk
 	find zCore -maxdepth 1 -name "*.img" -delete
 
-rt-test:
-	cd rootfs/x86_64 && git clone https://kernel.googlesource.com/pub/scm/linux/kernel/git/clrkwllms/rt-tests --depth 1
-	cd rootfs/x86_64/rt-tests && make
-	echo x86 gcc build rt-test,now need manual modificy.
+# rt-test:
+# 	cd rootfs/x86_64 && git clone https://kernel.googlesource.com/pub/scm/linux/kernel/git/clrkwllms/rt-tests --depth 1
+# 	cd rootfs/x86_64/rt-tests && make
+# 	echo x86 gcc build rt-test,now need manual modificy.

loader/examples/linux-libos.rs

@@ -13,7 +13,7 @@ async fn main() {
     }
 
     let envs = vec!["PATH=/usr/sbin:/usr/bin:/sbin:/bin".into()];
-    let rootfs_path = Path::new(&env::var("CARGO_MANIFEST_DIR").unwrap()).join("../rootfs/x86_64");
+    let rootfs_path = Path::new(&env::var("CARGO_MANIFEST_DIR").unwrap()).join("../rootfs/libos");
     let hostfs = rcore_fs_hostfs::HostFS::new(rootfs_path);
 
     let proc = zcore_loader::linux::run(args[1..].to_vec(), envs, hostfs);

loader/tests/linux.rs

@@ -1,7 +1,7 @@
 use rcore_fs_hostfs::HostFS;
 use std::fs;
 
-const LIBOS_ROOTFS: &str = "../rootfs/x86_64";
+const LIBOS_ROOTFS: &str = "../rootfs/libos";
 
 /// test with cmd line
 async fn test(cmdline: &str) -> i64 {

xtask/src/arch.rs

@@ -2,7 +2,7 @@
 
 use crate::{
     command::{dir, download::wget, CommandExt, Tar},
-    LinuxRootfs, XError, ORIGIN, TARGET,
+    LinuxRootfs, XError, ARCHS, TARGET,
 };
 use std::{path::PathBuf, str::FromStr};
 
@@ -28,16 +28,16 @@ impl Arch {
     /// Returns the path to store arch-dependent files from network.
     #[inline]
     pub fn origin(&self) -> PathBuf {
-        PathBuf::from(ORIGIN).join(self.name())
+        ARCHS.join(self.name())
     }
 
     /// Returns the path to cache arch-dependent generated files durning processes.
     #[inline]
     pub fn target(&self) -> PathBuf {
-        PathBuf::from(TARGET).join(self.name())
+        TARGET.join(self.name())
     }
 
-    /// 下载 musl 工具链，返回工具链路径。
+    /// Downloads linux musl toolchain, and returns its path.
     pub fn linux_musl_cross(&self) -> PathBuf {
         let name = format!("{}-linux-musl-cross", self.name().to_lowercase());
 
@@ -47,6 +47,7 @@ impl Arch {
         let tgz = origin.join(format!("{name}.tgz"));
         let dir = target.join(&name);
 
+        dir::create_parent(&dir).unwrap();
         dir::rm(&dir).unwrap();
         wget(format!("https://musl.cc/{name}.tgz"), &tgz);
         Tar::xf(&tgz, Some(target)).invoke();

xtask/src/build.rs

@@ -1,6 +1,6 @@
 use crate::{
-    command::{Cargo, CommandExt, Ext, Qemu},
-    Arch, ArchArg,
+    command::{BinUtil, Cargo, CommandExt, Ext, Qemu},
+    Arch, ArchArg, PROJECT_DIR,
 };
 use std::{fs, path::PathBuf};
 
@@ -42,6 +42,10 @@ pub(crate) struct GdbArgs {
     port: u16,
 }
 
+lazy_static::lazy_static! {
+    static ref INNER: PathBuf = PROJECT_DIR.join("zCore");
+}
+
 impl BuildArgs {
     #[inline]
     fn arch(&self) -> Arch {
@@ -50,7 +54,8 @@ impl BuildArgs {
 
     fn dir(&self) -> String {
         format!(
-            "target/{arch}/{mode}",
+            "{target}/{arch}/{mode}",
+            target = PROJECT_DIR.join("target").display(),
             arch = self.arch().name(),
             mode = if self.debug { "debug" } else { "release" }
         )
@@ -61,7 +66,7 @@ impl BuildArgs {
         cargo
             .package("zcore")
             .features(false, &["linux", "board-qemu"])
-            .target(format!("zCore/{arch}.json", arch = self.arch().name()))
+            .target(INNER.join(format!("{}.json", self.arch().name())))
             .args(&["-Z", "build-std=core,alloc"])
             .args(&["-Z", "build-std-features=compiler-builtins-mem"]);
         if !self.debug {
@@ -76,7 +81,7 @@ impl AsmArgs {
     pub fn asm(&self) {
         // 递归 build
         self.build.build();
-        let out = Ext::new("rust-objdump")
+        let out = BinUtil::objdump()
             .arg(format!("{dir}/zcore", dir = self.build.dir()))
             .arg("-d")
             .output()
@@ -99,7 +104,7 @@ impl QemuArgs {
         let obj = format!("{dir}/zcore");
         let bin = format!("{dir}/zcore.bin");
         // 裁剪内核二进制文件
-        Ext::new("rust-objcopy")
+        BinUtil::objcopy()
             .arg(format!("--binary-architecture={arch_str}"))
             .arg(obj.clone())
             .arg("--strip-all")
@@ -109,7 +114,8 @@ impl QemuArgs {
         let mut qemu = Qemu::system(arch);
         qemu.args(&["-m", "512M"])
             .args(&["-kernel", &bin])
-            .args(&["-initrd", &format!("zCore/{arch_str}.img")])
+            .arg("-initrd")
+            .arg(INNER.join(format!("{arch_str}.img")))
             .args(&["-append", "\"LOG=warn\""])
             .args(&["-display", "none"])
             .arg("-no-reboot")
@@ -126,13 +132,20 @@ impl QemuArgs {
             }
             Arch::X86_64 => todo!(),
             Arch::Aarch64 => {
-                fs::copy(obj, "zCore/disk/os").unwrap();
+                fs::copy(obj, INNER.join("disk").join("os")).unwrap();
                 qemu.args(&["-machine", "virt"])
                     .args(&["-cpu", "cortex-a72"])
                     .args(&["-m", "1G"])
-                    .args(&["-bios", "ignored/target/aarch64/firmware/QEMU_EFI.fd"])
-                    .args(&["-hda", "fat:rw:zCore/disk"])
-                    .args(&["-drive", "file=zCore/aarch64.img,if=none,format=raw,id=x0"])
+                    .arg("-bios")
+                    .arg(arch.target().join("firmware").join("QEMU_EFI.fd"))
+                    .args(&["-hda", &format!("fat:rw:{}/disk", INNER.display())])
+                    .args(&[
+                        "-drive",
+                        &format!(
+                            "file={}/aarch64.img,if=none,format=raw,id=x0",
+                            INNER.display()
+                        ),
+                    ])
                     .args(&[
                         "-device",
                         "virtio-blk-device,drive=x0,bus=virtio-mmio-bus.0",

xtask/src/command/binutils.rs

@@ -0,0 +1,26 @@
+use super::{ext, Cargo, CommandExt};
+use std::{ffi::OsStr, process::Command};
+
+ext!(def; BinUtil);
+
+impl BinUtil {
+    fn new(which: impl AsRef<OsStr>) -> Self {
+        let which = which.as_ref();
+        let check = std::str::from_utf8(&Cargo::install().arg("--list").output().stdout)
+            .unwrap()
+            .lines()
+            .any(|line| OsStr::new(line) == which);
+        if !check {
+            Cargo::install().arg("cargo-binutils").invoke();
+        }
+        Self(Command::new(which))
+    }
+
+    pub fn objcopy() -> Self {
+        Self::new("rust-objcopy")
+    }
+
+    pub fn objdump() -> Self {
+        Self::new("rust-objdump")
+    }
+}

xtask/src/command/cargo.rs

@@ -1,13 +1,11 @@
 use super::{ext, CommandExt};
 use std::{ffi::OsStr, process::Command};
 
-pub(crate) struct Cargo(Command);
-
-ext!(Cargo);
+ext!(def; Cargo);
 
 impl Cargo {
     #[inline]
-    fn new(sub: &(impl AsRef<OsStr> + ?Sized)) -> Self {
+    fn new(sub: impl AsRef<OsStr>) -> Self {
         let mut git = Self(Command::new("cargo"));
         git.arg(sub);
         git
@@ -43,6 +41,11 @@ impl Cargo {
         Self::new("run")
     }
 
+    #[inline]
+    pub fn install() -> Self {
+        Self::new("install")
+    }
+
     #[inline]
     pub fn all_features(&mut self) -> &mut Self {
         self.arg("--all-features");

xtask/src/command/git.rs

@@ -3,9 +3,7 @@
 use super::{ext, CommandExt};
 use std::{ffi::OsStr, path::PathBuf, process::Command};
 
-pub(crate) struct Git(Command);
-
-ext!(Git);
+ext!(def; Git);
 
 impl Git {
     fn new(sub: impl AsRef<OsStr>) -> Self {

xtask/src/command/make.rs

@@ -1,9 +1,7 @@
 use super::{ext, CommandExt};
 use std::process::Command;
 
-pub(crate) struct Make(Command);
-
-ext!(Make);
+ext!(def; Make);
 
 impl Make {
     pub fn new() -> Self {