ch5

Author: lythesia

os/Makefile

@@ -26,6 +26,9 @@ OBJCOPY := rust-objcopy --binary-architecture=riscv64
 # Disassembly
 DISASM ?= -x
 
+# Run usertests or usershell
+TEST ?=
+
 build: env $(KERNEL_BIN)
 
 env:
@@ -38,6 +41,7 @@ $(KERNEL_BIN): kernel
 	@$(OBJCOPY) $(KERNEL_ELF) $(OBJCOPY_ARG) -O binary $@
 
 kernel:
+	@cd ../user && make build TEST=$(TEST)
 	@echo Platform: $(BOARD)
 	@cp src/linker-$(BOARD).ld src/linker.ld
 	@cargo build $(MODE_ARG)

os/build.rs

@@ -45,6 +45,15 @@ _num_app:
     }
     writeln!(f, "    .quad app_{}_end", apps.len() - 1)?;
 
+    writeln!(
+        f,
+        r#"    .globl _app_names
+_app_names:"#,
+    )?;
+    for app in &apps {
+        writeln!(f, r#"    .string "{}""#, app)?;
+    }
+
     for (i, app) in apps.iter().enumerate() {
         println!("+app_{}: {}", i, app);
         writeln!(
@@ -53,6 +62,7 @@ _num_app:
     .section .data
     .globl app_{0}_start
     .globl app_{0}_end
+    .align 3
 app_{0}_start:
     .incbin "{1}/{2}.elf"
 app_{0}_end:"#,

os/src/config.rs

@@ -12,12 +12,3 @@ pub const PAGE_SIZE: usize = 0x1000;
 pub const PAGE_SIZE_BITS: usize = 12;
 pub const TRAMPOLINE: usize = usize::MAX - PAGE_SIZE + 1;
 pub const TRAP_CONTEXT: usize = TRAMPOLINE - PAGE_SIZE;
-
-/// Return (bottom, top) of a kernel stack in kernel space.
-pub fn kernel_stack_position(app_id: usize) -> (usize, usize) {
-    // 每个app的kernel stack大小固定, 且从高到低依次排列
-    // 每个app间使用一个guard page来分隔, 即这里为什么要+ PAGE_SIZE
-    let top = TRAMPOLINE - app_id * (KERNEL_STACK_SIZE + PAGE_SIZE);
-    let bottom = top - KERNEL_STACK_SIZE;
-    (bottom, top)
-}

os/src/lang_item.rs

@@ -1,6 +1,6 @@
 use core::panic::PanicInfo;
 
-use crate::{sbi::shutdown, stack_trace::print_stack_trace};
+use crate::sbi::shutdown;
 
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
@@ -14,10 +14,5 @@ fn panic(info: &PanicInfo) -> ! {
     } else {
         log::error!("Panicked: {}", info.message());
     }
-
-    unsafe {
-        print_stack_trace();
-    }
-
     shutdown(true)
 }

os/src/loader.rs

@@ -1,5 +1,30 @@
+use alloc::vec::Vec;
+use lazy_static::lazy_static;
+
 extern "C" {
     fn _num_app();
+    fn _app_names();
+}
+
+lazy_static! {
+    static ref APP_NAMES: Vec<&'static str> = {
+        let num_app = get_num_app();
+        let mut start = _app_names as usize as *const u8;
+        let mut vs = Vec::new();
+        unsafe {
+            for _ in 0..num_app {
+                let mut end = start;
+                while end.read_volatile() != '\0' as u8 {
+                    end = end.add(1);
+                }
+                let slice = core::slice::from_raw_parts(start, end as usize - start as usize);
+                let str = core::str::from_utf8(slice).unwrap();
+                vs.push(str);
+                start = end.add(1);
+            }
+        }
+        vs
+    };
 }
 
 /// Get the total number of applications.
@@ -18,3 +43,20 @@ pub fn get_app_data(i: usize) -> &'static [u8] {
         core::slice::from_raw_parts(app_start[i] as *const u8, app_start[i + 1] - app_start[i])
     }
 }
+
+/// Get app data(in elf) by name
+pub fn get_app_data_by_name(name: &str) -> Option<&'static [u8]> {
+    let num_app = get_num_app();
+    (0..num_app)
+        .find(|&i| APP_NAMES[i] == name)
+        .map(get_app_data)
+}
+
+/// List loaded apps
+pub fn list_apps() {
+    println!("/**** APPS ****");
+    for app in APP_NAMES.iter() {
+        println!("{}", app);
+    }
+    println!("**************/");
+}

os/src/logging.rs

@@ -14,7 +14,13 @@ impl Log for NaiveLogger {
             return;
         }
         print_color(
-            format_args!("[{:>5}] {}\n", record.level(), record.args()),
+            format_args!(
+                "[{} {}:{}] {}\n",
+                record.level(),
+                record.file().unwrap_or("??.rs"),
+                record.line().unwrap_or(0),
+                record.args()
+            ),
             color_code_for_level(&record.level()),
         );
     }

os/src/main.rs

@@ -2,6 +2,7 @@
 #![no_std]
 #![feature(array_windows)]
 #![feature(alloc_error_handler)]
+#![feature(slice_split_once)]
 
 extern crate alloc;
 extern crate bitflags;
@@ -16,7 +17,6 @@ mod loader;
 mod logging;
 mod mm;
 mod sbi;
-mod stack_trace;
 mod sync;
 mod syscall;
 mod task;
@@ -89,16 +89,17 @@ pub fn rust_main() -> ! {
         config::MEMORY_END,
     );
 
-    log::info!("[kernel] hello!");
     mm::init();
-    log::info!("[kernel] back to world!");
     mm::remap_test();
 
+    task::add_initproc();
+
     trap::init();
     trap::enable_timer_interrupt();
     timer::set_next_trigger();
 
-    task::run_first_task();
+    loader::list_apps();
+    task::run_tasks();
     panic!("Unreachable in rust_main!");
 }
 

os/src/mm/address.rs

@@ -78,6 +78,10 @@ impl PhysAddr {
     pub fn ceil(&self) -> PhysPageNum {
         PhysPageNum((self.0 + PAGE_SIZE - 1) / PAGE_SIZE)
     }
+
+    pub fn get_mut<T>(&self) -> &'static mut T {
+        unsafe { (self.0 as *mut T).as_mut().unwrap() }
+    }
 }
 
 // usize <-> PhysPageNum

os/src/mm/frame_allocator.rs

@@ -98,12 +98,6 @@ pub struct StackFrameAllocator {
 
 impl StackFrameAllocator {
     pub fn init(&mut self, l: PhysPageNum, r: PhysPageNum) {
-        // log::debug!(
-        //     "[kernel] phys_frames: [{:?}, {:?}) (total = {})",
-        //     l,
-        //     r,
-        //     r.0 - l.0
-        // );
         self.current = l.0;
         self.end = r.0;
     }

os/src/mm/heap_allocator.rs

@@ -15,12 +15,6 @@ pub fn handle_alloc_error(layout: core::alloc::Layout) -> ! {
 
 pub fn init_heap() {
     let start = unsafe { HEAP_SPACE.as_ptr() as usize };
-    log::info!(
-        "[kernel] {:<10} [{:#x}, {:#x})",
-        "heap",
-        start,
-        start + KERNEL_HEAP_SIZE
-    );
     unsafe {
         HEAP_ALLOCATOR.lock().init(start, KERNEL_HEAP_SIZE);
     }