From 4f1e16a5a9e2a9cf922501c74fde6de6ac4d7faf Mon Sep 17 00:00:00 2001 From: Samuka007 Date: Thu, 13 Mar 2025 08:38:53 +0000 Subject: [PATCH] feat: change default build target to riscv64 --- .devcontainer/Dockerfile | 8 ++ .devcontainer/devcontainer.json | 5 +- Makefile | 4 +- README.md | 39 ++++-- oscomp/run-qemu.sh | 233 ++++++++++++++++++++++++++++++++ 5 files changed, 275 insertions(+), 14 deletions(-) create mode 100644 .devcontainer/Dockerfile create mode 100644 oscomp/run-qemu.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000..9a0d57ff --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,8 @@ +From docker.educg.net/cg/os-contest:20250226 + +RUN apt install -y --no-install-recommends \ + bison flex libssl-dev bridge-utils dnsmasq sudo iptables + +RUN cargo install --git https://github.com/Samuka007/DADK.git --branch kpartx-docker-support + +ENTRYPOINT ["tini", "--"] \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 07ef54b4..9e8e1156 100755 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,9 @@ { "name": "OSCOMP Container", - "image": "docker.educg.net/cg/os-contest:20250226", + // "image": "docker.educg.net/cg/os-contest:20250226", + "build": { + "dockerfile": "Dockerfile" + }, "runArgs": [ "--privileged" ], diff --git a/Makefile b/Makefile index fe38c3c5..ed34bc5e 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ all: kernel user .PHONY: kernel -kernel: check_arch +kernel: check_arch update-submodules mkdir -p bin/kernel/ $(MAKE) -C ./kernel all ARCH=$(ARCH) || (sh -c "echo 内核编译失败" && exit 1) @@ -160,7 +160,7 @@ log-monitor: update-submodules: @echo "更新子模块" @git submodule update --recursive --init - @git submodule foreach git pull origin master + # @git submodule foreach git pull origin master .PHONY: update-submodules-by-mirror update-submodules-by-mirror: diff --git a/README.md b/README.md index 83de21e8..e58d31c8 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,32 @@ +# 👋 欢迎来到 2025 OSCOMP DragonOS ～ +欢迎大家使用 DragonOS 作为内核实现赛道的基座系统！ + +## OSCOMP Roadmap +目前 DragonOS 正在紧锣密鼓适配 OSCOMP 的基座需求，同时也欢迎大家围绕下列部分添加实现～ +- [ ] RISC-V + - [ ] VirtIO base TTY + - [x] Bootable Kernel +- [ ] LoongArch +- [ ] ext4 (正在实现) +- [ ] 优化启动内存序，允许qemu -kernel启动 +- [ ] busybox (DragonOS使用的是NovaShell) + +## 在 OSCOMP 下构建 riscv64 +本分支已将默认 Target 设为 riscv64 + +### Quick Start +因为使用 CI 镜像工具链，在不额外配置环境的情况下先不构建用户程序 + +打开 VS Code ，安装 devcontainer 插件并进入 devcontainer 环境 +```sh +make kernel && make write_diskimage && make qemu +``` + > [!TIP] -> # 👋 欢迎来到 2025 OSCOMP DragonOS ～ -> 欢迎大家使用 DragonOS 作为内核实现赛道的基座系统！ -> ## OSCOMP Roadmap -> 目前 DragonOS 正在紧锣密鼓适配 OSCOMP 的基座需求，同时也欢迎大家围绕下列部分添加实现～ -> - [ ] RISC-V -> - [ ] VirtIO base TTY -> - [x] Bootable Kernel -> - [ ] LoongArch -> - [ ] ext4 (正在实现) -> - [ ] 优化启动内存序，允许qemu -kernel启动 -> - [ ] busybox (DragonOS使用的是NovaShell) +> 如果没有看到提示进入 devcontainer 环境，可以 `ctrl+shift+p` 找到 `Dev Containers: Reopen in Container`。 +> 第一次构建可能时间会有些久，尤其是拉取 CI 镜像时，请耐心一些～ + +---

diff --git a/oscomp/run-qemu.sh b/oscomp/run-qemu.sh new file mode 100644 index 00000000..4b9c0ea9 --- /dev/null +++ b/oscomp/run-qemu.sh @@ -0,0 +1,233 @@ +# From tools/run-qemu.sh, mainly remove the sudo for container environment +# +# REFERENCE: +# qemu-system-riscv64 -machine virt -kernel ../bin/kernel/kernel -m {mem} -nographic -smp {smp} -bios default -drive file={fs},if=none,format=raw,id=x0 \ +# -device virtio-blk-device,drive=x0,bus=virtio-mmio-bus.0 -no-reboot -device virtio-net-device,netdev=net -netdev user,id=net \ +# -rtc base=utc \ +# -drive file=disk.img,if=none,format=raw,id=x1 -device virtio-blk-device,drive=x1,bus=virtio-mmio-bus.1 + +check_dependencies() +{ + # Check if qemu is installed + if [ -z "$(which qemu-system-x86_64)" ]; then + echo "Please install qemu first!" + exit 1 + fi + + # Check if brctl is installed + if [ -z "$(which brctl)" ]; then + echo "Please install bridge-utils first!" + exit 1 + fi + + # Check if dnsmasq is installed + if [ -z "$(which dnsmasq)" ]; then + echo "Please install dnsmasq first!" + exit 1 + fi + + # Check if iptable is installed + if [ -z "$(which iptables)" ]; then + echo "Please install iptables first!" + exit 1 + fi + +} + +check_dependencies + +# 进行启动前检查 +flag_can_run=1 +ARGS=`getopt -o p -l bios:,display: -- "$@"` +eval set -- "${ARGS}" +echo "$@" +allflags= +# allflags=$(qemu-system-x86_64 -cpu help | awk '/flags/ {y=1; getline}; y {print}' | tr ' ' '\n' | grep -Ev "^$" | sed -r 's|^|+|' | tr '\n' ',' | sed -r "s|,$||") +# 设置ARCH环境变量，如果没有设置，就默认为x86_64 +export ARCH=${ARCH:=x86_64} +echo "ARCH=${ARCH}" +#ARCH="i386" +# 请根据自己的需要，在-d 后方加入所需的 trace 事件 + +# 标准的trace events +qemu_trace_std=cpu_reset,guest_errors,trace:virtio*,trace:e1000e_rx*,trace:e1000e_tx*,trace:e1000e_irq* +# 调试usb的trace +qemu_trace_usb=trace:usb_xhci_reset,trace:usb_xhci_run,trace:usb_xhci_stop,trace:usb_xhci_irq_msi,trace:usb_xhci_irq_msix,trace:usb_xhci_port_reset,trace:msix_write_config,trace:usb_xhci_irq_msix,trace:usb_xhci_irq_msix_use,trace:usb_xhci_irq_msix_unuse,trace:usb_xhci_irq_msi,trace:usb_xhci_* + +# 根据架构设置qemu的加速方式 +if [ ${ARCH} == "i386" ] || [ ${ARCH} == "x86_64" ]; then + qemu_accel="kvm" + if [ $(uname) == Darwin ]; then + qemu_accel=hvf + else + # 判断系统kvm模块是否加载 + if [ ! -e /dev/kvm ]; then + # kvm模块未加载，使用tcg加速 + qemu_accel="tcg" + fi + fi +fi + +# uboot版本 +UBOOT_VERSION="v2023.10" +RISCV64_UBOOT_PATH="arch/riscv64/u-boot-${UBOOT_VERSION}-riscv64" + + +DISK_NAME="disk-image-${ARCH}.img" + +QEMU=qemu-system-${ARCH} +QEMU_DISK_IMAGE="../bin/${DISK_NAME}" +QEMU_MEMORY="512M" +QEMU_MEMORY_BACKEND="dragonos-qemu-shm.ram" +QEMU_MEMORY_BACKEND_PATH_PREFIX="/dev/shm" +QEMU_SHM_OBJECT="-object memory-backend-file,size=${QEMU_MEMORY},id=${QEMU_MEMORY_BACKEND},mem-path=${QEMU_MEMORY_BACKEND_PATH_PREFIX}/${QEMU_MEMORY_BACKEND},share=on " +QEMU_SMP="2,cores=2,threads=1,sockets=1" +QEMU_MONITOR="-monitor stdio" +QEMU_TRACE="${qemu_trace_std}" +QEMU_CPU_FEATURES="" +QEMU_RTC_CLOCK="" +QEMU_SERIAL_LOG_FILE="../serial_opt.txt" +QEMU_SERIAL="-serial file:${QEMU_SERIAL_LOG_FILE}" +QEMU_DRIVE="id=disk,file=${QEMU_DISK_IMAGE},if=none" +QEMU_ACCELARATE="" +QEMU_ARGUMENT="" +QEMU_DEVICES="" +BIOS_TYPE="" +#这个变量为true则使用virtio磁盘 +VIRTIO_BLK_DEVICE=false +# 如果qemu_accel不为空 +if [ -n "${qemu_accel}" ]; then + QEMU_ACCELARATE=" -machine accel=${qemu_accel} " + if [ "${qemu_accel}" == "kvm" ]; then + QEMU_ACCELARATE+=" -enable-kvm " + fi +fi + +if [ ${ARCH} == "i386" ] || [ ${ARCH} == "x86_64" ]; then + QEMU_MACHINE=" -machine q35,memory-backend=${QEMU_MEMORY_BACKEND} " + QEMU_CPU_FEATURES+="-cpu IvyBridge,apic,x2apic,+fpu,check,+vmx,${allflags}" + QEMU_RTC_CLOCK+=" -rtc clock=host,base=localtime" + if [ ${VIRTIO_BLK_DEVICE} == false ]; then + QEMU_DEVICES_DISK+="-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 " + else + QEMU_DEVICES_DISK="-device virtio-blk-pci,drive=disk -device pci-bridge,chassis_nr=1,id=pci.1 -device pcie-root-port " + fi + +else + QEMU_MACHINE=" -machine virt,memory-backend=${QEMU_MEMORY_BACKEND} -cpu sifive-u54 " + QEMU_DEVICES_DISK="-device virtio-blk-device,drive=disk " + +fi + +if [ ${ARCH} == "riscv64" ]; then +# 如果是riscv64架构，就不需要图形界面 + QEMU_ARGUMENT+=" --nographic " + # 从控制台显示 + QEMU_MONITOR="" + QEMU_SERIAL="" +fi + +while true;do + case "$1" in + --bios) + case "$2" in + uefi) #uefi启动新增ovmf.fd固件 + BIOS_TYPE=uefi + ;; + legacy) + BIOS_TYPE=legacy + ;; + esac;shift 2;; + --display) + case "$2" in + vnc) + QEMU_ARGUMENT+=" -display vnc=:00 " + ;; + window) + ;; + nographic) + QEMU_SERIAL=" -serial chardev:mux -monitor chardev:mux -chardev stdio,id=mux,mux=on,signal=off,logfile=${QEMU_SERIAL_LOG_FILE} " + QEMU_MONITOR="" + QEMU_ARGUMENT+=" --nographic " + QEMU_ARGUMENT+=" -kernel ../bin/kernel/kernel.elf " + + ;; + esac;shift 2;; + *) break + esac + done + + +# ps: 下面这条使用tap的方式，无法dhcp获取到ip，暂时不知道为什么 +# QEMU_DEVICES="-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -net nic,netdev=nic0 -netdev tap,id=nic0,model=virtio-net-pci,script=qemu/ifup-nat,downscript=qemu/ifdown-nat -usb -device qemu-xhci,id=xhci,p2=8,p3=4 " +QEMU_DEVICES+="${QEMU_DEVICES_DISK} " +QEMU_DEVICES+=" -netdev user,id=hostnet0,hostfwd=tcp::12580-:12580 -device virtio-net-pci,vectors=5,netdev=hostnet0,id=net0 -usb -device qemu-xhci,id=xhci,p2=8,p3=4 " +# E1000E +# QEMU_DEVICES="-device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -netdev user,id=hostnet0,hostfwd=tcp::12580-:12580 -net nic,model=e1000e,netdev=hostnet0,id=net0 -netdev user,id=hostnet1,hostfwd=tcp::12581-:12581 -device virtio-net-pci,vectors=5,netdev=hostnet1,id=net1 -usb -device qemu-xhci,id=xhci,p2=8,p3=4 " +QEMU_ARGUMENT+="-d ${QEMU_DISK_IMAGE} -m ${QEMU_MEMORY} -smp ${QEMU_SMP} -boot order=d ${QEMU_MONITOR} -d ${qemu_trace_std} " + +QEMU_ARGUMENT+="-s ${QEMU_MACHINE} ${QEMU_CPU_FEATURES} ${QEMU_RTC_CLOCK} ${QEMU_SERIAL} -drive ${QEMU_DRIVE} ${QEMU_DEVICES} " +QEMU_ARGUMENT+=" ${QEMU_SHM_OBJECT} " +QEMU_ARGUMENT+=" ${QEMU_ACCELARATE} " + + + +# 安装riscv64的uboot +install_riscv_uboot() +{ + + if [ ! -d ${RISCV64_UBOOT_PATH} ]; then + echo "正在下载u-boot..." + uboot_tar_name="u-boot-${UBOOT_VERSION}-riscv64.tar.xz" + + uboot_parent_path=$(dirname ${RISCV64_UBOOT_PATH}) || (echo "获取riscv u-boot 版本 ${UBOOT_VERSION} 的父目录失败" && exit 1) + + if [ ! -f ${uboot_tar_name} ]; then + wget https://mirrors.dragonos.org.cn/pub/third_party/u-boot/${uboot_tar_name} || (echo "下载riscv u-boot 版本 ${UBOOT_VERSION} 失败" && exit 1) + fi + echo "下载完成" + echo "正在解压u-boot到 '$uboot_parent_path'..." + mkdir -p $uboot_parent_path + tar xvf u-boot-${UBOOT_VERSION}-riscv64.tar.xz -C ${uboot_parent_path} || (echo "解压riscv u-boot 版本 ${UBOOT_VERSION} 失败" && exit 1) + echo "解压完成" + rm -rf u-boot-${UBOOT_VERSION}-riscv64.tar.xz + fi + echo "riscv u-boot 版本 ${UBOOT_VERSION} 已经安装" +} + + +if [ $flag_can_run -eq 1 ]; then + + +# 删除共享内存 +rm -rf ${QEMU_MEMORY_BACKEND_PATH_PREFIX}/${QEMU_MEMORY_BACKEND} + +if [ ${BIOS_TYPE} == uefi ] ;then + if [ ${ARCH} == x86_64 ] ;then + ${QEMU} -bios arch/x86_64/efi/OVMF-pure-efi.fd ${QEMU_ARGUMENT} + elif [ ${ARCH} == i386 ] ;then + ${QEMU} -bios arch/i386/efi/OVMF-pure-efi.fd ${QEMU_ARGUMENT} + elif [ ${ARCH} == riscv64 ] ;then + install_riscv_uboot + ${QEMU} -kernel ${RISCV64_UBOOT_PATH}/u-boot.bin ${QEMU_ARGUMENT} + else + echo "不支持的架构: ${ARCH}" + fi +else + # 如果是i386架构或者x86_64架构，就直接启动 + if [ ${ARCH} == x86_64 ] || [ ${ARCH} == i386 ] ;then + ${QEMU} ${QEMU_ARGUMENT} + elif [ ${ARCH} == riscv64 ] ;then + # 如果是riscv64架构，就与efi启动一样 + install_riscv_uboot + ${QEMU} -kernel ${RISCV64_UBOOT_PATH}/u-boot.bin ${QEMU_ARGUMENT} + else + echo "不支持的架构: ${ARCH}" + fi +fi + +# 删除共享内存 +rm -rf ${QEMU_MEMORY_BACKEND_PATH_PREFIX}/${QEMU_MEMORY_BACKEND} +else + echo "不满足运行条件" +fi