✨ feat: 添加 RISC-V64 架构支持 (#65)

* ✨ feat: 添加 RISC-V64 架构支持

* ✨ feat(riscv64): 调整陷阱帧对齐并移除平台差异化代码

* ✨ feat(riscv64): 更新内核虚拟地址并增强内存映射功能

* ✨ feat(riscv64): 增强 RISC-V64 启动流程，添加多核支持和内存管理功能

* ✨ feat(riscv64): 添加 RISC-V64 架构支持到 CI 流程，并增强测试脚本的错误处理

* ✨ feat(riscv64): 优化代码格式，简化错误处理逻辑

* ✨ refactor(riscv64): 修正配置文件路径，简化启动流程中的错误处理

* ✨ fix(riscv64): 修正 RISC-V Linux 镜像魔术值的常量定义

* ✨ refactor(ci): 更新 CI 配置，简化系统依赖安装步骤并移除不必要的 QEMU 设置

* ✨ feat(container): 添加容器镜像发布工作流和 Dockerfile

Author: ZR233

.github/workflows/container-publish.yml

@@ -0,0 +1,51 @@
+name: Publish Container Image
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - container/**
+      - rust-toolchain.toml
+      - .github/workflows/container-publish.yml
+  workflow_dispatch:
+
+permissions: {}
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Prepare image metadata
+        id: prep
+        run: |
+          echo "image=ghcr.io/${GITHUB_REPOSITORY,,}-container" >> "$GITHUB_OUTPUT"
+          echo "sha_tag=sha-${GITHUB_SHA}" >> "$GITHUB_OUTPUT"
+          echo "rust_toolchain=$(sed -n 's/^channel = \"\\(.*\\)\"$/\\1/p' rust-toolchain.toml)" >> "$GITHUB_OUTPUT"
+
+      - name: Log in to GitHub Container Registry
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "${GITHUB_TOKEN}" | docker login ghcr.io -u "${GITHUB_ACTOR}" --password-stdin
+
+      - name: Build container image
+        run: |
+          docker build \
+            --build-arg RUST_TOOLCHAIN="${{ steps.prep.outputs.rust_toolchain }}" \
+            -t "${{ steps.prep.outputs.image }}:latest" \
+            -t "${{ steps.prep.outputs.image }}:${{ steps.prep.outputs.sha_tag }}" \
+            -f container/Dockerfile \
+            container
+
+      - name: Push container image
+        run: |
+          docker push "${{ steps.prep.outputs.image }}:latest"
+          docker push "${{ steps.prep.outputs.image }}:${{ steps.prep.outputs.sha_tag }}"

.github/workflows/test.yml

@@ -21,6 +21,8 @@ jobs:
             target: loongarch64-unknown-none-softfloat
           - arch: aarch64
             target: aarch64-unknown-none-softfloat
+          - arch: riscv64
+            target: riscv64gc-unknown-none-elf
           - arch: x86_64
             target: x86_64-unknown-none
     runs-on: ubuntu-latest
@@ -32,6 +34,7 @@ jobs:
         with:
           packages: libudev-dev
           version: 1.0
+
       - name: Install toolchain
         run: rustup show
       - name: Check rust version

Cargo.lock

@@ -0,0 +1,17 @@
+[system.Cargo]
+args = [
+  "-Z",
+  "build-std=core,alloc",
+  "--config",
+  ".cargo/config-app.toml",
+]
+features = [
+  "sparreal-rt/uspace",
+]
+package = "helloworld"
+post_build_cmds = []
+pre_build_cmds = []
+target = "riscv64gc-unknown-none-elf"
+to_bin = true
+
+[system.Cargo.env]

build-config/riscv64.toml

@@ -0,0 +1,65 @@
+FROM ubuntu:24.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG QEMU_VERSION=10.2.1
+ARG RUST_TOOLCHAIN=nightly
+
+ENV TZ=Etc/UTC \
+    RUSTUP_HOME=/opt/rustup \
+    CARGO_HOME=/opt/cargo \
+    PATH=/opt/cargo/bin:/opt/qemu-${QEMU_VERSION}/bin:${PATH}
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        build-essential \
+        clang \
+        curl \
+        git \
+        libglib2.0-dev \
+        libpixman-1-dev \
+        libslirp-dev \
+        libudev-dev \
+        make \
+        ninja-build \
+        pkg-config \
+        python3 \
+        wget \
+        xz-utils \
+        zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN set -eux; \
+    wget -O /tmp/qemu.tar.xz "https://download.qemu.org/qemu-${QEMU_VERSION}.tar.xz"; \
+    tar -xf /tmp/qemu.tar.xz -C /tmp; \
+    cd "/tmp/qemu-${QEMU_VERSION}"; \
+    ./configure \
+      --prefix="/opt/qemu-${QEMU_VERSION}" \
+      --target-list=loongarch64-softmmu,riscv64-softmmu,aarch64-softmmu,x86_64-softmmu \
+      --enable-slirp \
+      --disable-docs \
+      --disable-gtk \
+      --disable-sdl \
+      --disable-vte \
+      --disable-werror; \
+    make -j"$(nproc)"; \
+    make install; \
+    rm -rf "/tmp/qemu-${QEMU_VERSION}" /tmp/qemu.tar.xz
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
+    | sh -s -- -y --profile minimal --default-toolchain "${RUST_TOOLCHAIN}"
+
+RUN rustup component add rust-src llvm-tools rustfmt clippy cargo \
+    && rustup target add \
+      x86_64-unknown-none \
+      riscv64gc-unknown-none-elf \
+      aarch64-unknown-none-softfloat \
+      loongarch64-unknown-none-softfloat \
+    && cargo install --locked \
+      cargo-binutils \
+      cargo-hack \
+      ostool
+
+WORKDIR /workspace
+
+CMD ["/bin/bash"]

container/Dockerfile

@@ -60,6 +60,9 @@ some-serial = "0.3"
 uefi.workspace = true
 x86 = "0.52"
 
+[target.'cfg(target_arch = "riscv64")'.dependencies]
+sbi-rt = { version = "0.0.3", features = ["legacy"] }
+
 [build-dependencies]
 prettyplease = "0.2"
 quote = "1.0"

crates/someboot/Cargo.toml

@@ -32,4 +32,4 @@ rustflags = [
     "-Clink-args=-pie",
     "-Clink-args=-znostart-stop-gc",
 ]
-cargoargs = ["-Z", "build-std=core,alloc"]
+cargoargs = ["-Z", "build-std=core,alloc"]

crates/someboot/build-info.toml

@@ -156,9 +156,22 @@ impl Build {
     }
 
     fn prepare_riscv64(&mut self) {
-        self.kernel_vaddr = 0;
+        let ld_src = "src/arch/riscv64/link.ld";
+
+        if self.uspace {
+            self.kernel_vaddr = 0xffff_ffff_8000_0000;
+        } else {
+            self.kernel_vaddr = 0x8020_0000;
+        }
+
+        let kernel_load_vaddr = self.kernel_vaddr as usize;
+        let ld = include_str!("src/arch/riscv64/link.ld")
+            .replace("${kernel_load_vaddr}", &format!("{kernel_load_vaddr:#x}"));
+
+        println!("cargo:rerun-if-changed={ld_src}");
+
         let ld_dst = self.out_dir.join(Self::LD_NAME);
-        fs::write(ld_dst, "SECTIONS {}\n").unwrap();
+        fs::write(ld_dst, ld).unwrap();
     }
 
     fn gen_defines(&self) {

crates/someboot/build.rs

@@ -0,0 +1,3 @@
+pub struct Console;
+
+impl crate::console::ArchConsoleOps for Console {}

crates/someboot/src/arch/aarch64/console.rs

@@ -1,5 +1,6 @@
 #[macro_use]
 mod _macros;
+mod console;
 
 #[cfg(feature = "hv")]
 #[path = "el2/mod.rs"]
@@ -36,6 +37,7 @@ pub struct Arch;
 
 impl ArchTrait for Arch {
     type P = paging::Generic;
+    type Console = console::Console;
 
     fn _va(paddr: usize) -> *mut u8 {
         (paddr + PAGE_OFFSET) as *mut u8