feat: enhance testcases

Author: yfblock

Cargo.lock

@@ -49,9 +49,9 @@ logging = { path = "crates/logging" }
 signal = { path = "crates/signal" }
 sync = { path = "crates/sync" }
 
-polyhal = { version = "0.2.1", features = ["logger", "trap"] }
-polyhal-boot = { version = "0.2.1" }
-polyhal-trap = { version = "0.2.1" }
+polyhal = { version = "0.2.3", features = ["logger", "trap"] }
+polyhal-boot = { version = "0.2.3" }
+polyhal-trap = { version = "0.2.3" }
 fdt-parser = { version = "0.4.12" }
 
 syscalls = { git = "https://github.com/jasonwhite/syscalls.git", default-features = false }

Cargo.toml

@@ -35,8 +35,10 @@ FS_IMG  := mount.img
 features:= 
 QEMU_EXEC += -m 1G\
 			-nographic \
-			-smp $(SMP) \
-			-D qemu.log -d in_asm,int,pcall,cpu_reset,guest_errors
+			-smp $(SMP)
+ifeq ($(QEMU_LOG), on)
+QEMU_EXEC += -D qemu.log -d in_asm,int,pcall,cpu_reset,guest_errors
+endif
 
 TESTCASE := testcase-$(ARCH)
 ifeq ($(NVME), on)
@@ -69,7 +71,7 @@ fs-img:
 	@echo "TESTCASE: $(TESTCASE)"
 	@echo "ROOT_FS: $(ROOT_FS)"
 	rm -f $(FS_IMG)
-	dd if=/dev/zero of=$(FS_IMG) bs=1M count=64
+	dd if=/dev/zero of=$(FS_IMG) bs=1M count=96
 	sync
 ifeq ($(ROOT_FS), fat32)
 	mkfs.vfat -F 32 $(FS_IMG)

Makefile

@@ -12,7 +12,7 @@ bin:
   riscv64-qemu:
     target: "riscv64gc-unknown-none-elf"
     configs:
-      driver: "kvirtio,kgoldfish-rtc,ns16550a,kramdisk"
+      driver: "kramdisk"
   riscv64-vf2:
     target: "riscv64imac-unknown-none-elf"
     configs:
@@ -21,15 +21,15 @@ bin:
   x86_64-qemu:
     target: "x86_64-unknown-none"
     configs:
-      driver: "kvirtio,kgoldfish-rtc,ns16550a"
+      driver: "kvirtio,kramdisk"
   x86_64-generic:
     target: "x86_64-unknown-none"
     configs:
-      driver: "kramdisk,kgoldfish-rtc,ns16550a"
+      driver: "kramdisk"
   aarch64-qemu:
     target: "aarch64-unknown-none-softfloat"
     configs:
-      driver: "kvirtio,kgoldfish-rtc,ns16550a,kramdisk"
+      driver: "kramdisk"
   loongarch64-qemu:
     target: "loongarch64-unknown-none"
     configs:

byteos.yaml

@@ -3,15 +3,15 @@ use core::future::Future;
 use alloc::{boxed::Box, sync::Arc};
 
 use crate::{
-    task::{AsyncTask, AsyncTaskItem, BlankKernelTask}, task_id_alloc, TASK_MAP, TASK_QUEUE
+    task::{AsyncTask, AsyncTaskItem, BlankKernelTask},
+    task_id_alloc, TASK_MAP, TASK_QUEUE,
 };
 
 #[inline]
-pub fn spawn(
-    task: Arc<dyn AsyncTask>,
-    future: impl Future<Output = ()> + Send + 'static,
-) {
-    TASK_MAP.lock().insert(task.get_task_id(), Arc::downgrade(&task));
+pub fn spawn(task: Arc<dyn AsyncTask>, future: impl Future<Output = ()> + Send + 'static) {
+    TASK_MAP
+        .lock()
+        .insert(task.get_task_id(), Arc::downgrade(&task));
     TASK_QUEUE.lock().push_back(AsyncTaskItem {
         future: Box::pin(future),
         task,
@@ -21,7 +21,9 @@ pub fn spawn(
 #[inline]
 pub fn spawn_blank(future: impl Future<Output = ()> + Send + 'static) {
     let task: Arc<dyn AsyncTask> = Arc::new(BlankKernelTask(task_id_alloc()));
-    TASK_MAP.lock().insert(task.get_task_id(), Arc::downgrade(&task));
+    TASK_MAP
+        .lock()
+        .insert(task.get_task_id(), Arc::downgrade(&task));
     TASK_QUEUE.lock().push_back(AsyncTaskItem {
         future: Box::pin(future),
         task,

crates/executor/src/thread.rs

@@ -33,9 +33,8 @@ impl Driver for RamDiskBlock {
 
 impl BlkDriver for RamDiskBlock {
     fn read_blocks(&self, sector_offset: usize, buf: &mut [u8]) {
-        assert_eq!(buf.len(), 0x200);
-        let rlen = buf.len();
-        if (sector_offset * 0x200 + rlen) >= self.size {
+        assert_eq!(buf.len() % 0x200, 0);
+        if (sector_offset * 0x200 + buf.len()) >= self.size {
             panic!("can't out of ramdisk range")
         };
         unsafe {
@@ -48,9 +47,8 @@ impl BlkDriver for RamDiskBlock {
     }
 
     fn write_blocks(&self, sector_idx: usize, buf: &[u8]) {
-        assert_eq!(buf.len(), 0x200);
-        let wlen = buf.len();
-        if (sector_idx * 0x200 + wlen) >= self.size {
+        assert_eq!(buf.len() % 0x200, 0);
+        if (sector_idx * 0x200 + buf.len()) >= self.size {
             panic!("can't out of ramdisk range")
         };
         unsafe {

driver/kramdisk/src/lib.rs

@@ -13,7 +13,7 @@ unsafe impl Hal for HalImpl {
         let trackers = frame_alloc_much(pages).expect("can't alloc page in virtio");
         let paddr = trackers[0].0;
         let vaddr = NonNull::new(paddr.get_mut_ptr()).unwrap();
-        trace!("alloc DMA: paddr={:#x}, pages={}", paddr.raw(), pages);
+        trace!("alloc DMA: paddr={:#x}, pages={:?}", paddr.raw(), trackers);
         VIRTIO_CONTAINER.lock().extend(trackers.into_iter());
         (paddr.raw(), vaddr)
     }