swap kernel test passed on k210/qemu+rustsbi

wyfcyx · wyfcyx · commit 2153567d9397 · 2020-09-06T13:00:32.000+08:00
diff --git a/bootloader/rustsbi-k210.bin b/bootloader/rustsbi-k210.bin
diff --git a/os/Makefile b/os/Makefile
@@ -12,7 +12,7 @@ K210-SERIALPORT	= /dev/ttyUSB0
 K210-BURNER		= ../tools/kflash.py	
 
 # Disassembly
-DISASM		?= -d
+DISASM		?= -D
 
 USER_DIR    := ../user
 USER_BUILD  := $(USER_DIR)/build
@@ -44,6 +44,9 @@ $(BIN_FILE): kernel
 asm:
 	@$(OBJDUMP) $(DISASM) $(KERNEL_FILE) | less
 
+asm-save:
+	@$(OBJDUMP) $(DISASM) $(KERNEL_FILE) > asm
+
 # 清理编译出的文件
 clean:
 	@cargo clean
diff --git a/os/src/board/k210/config.rs b/os/src/board/k210/config.rs
@@ -2,8 +2,8 @@
 
 pub const BOARD_MEMORY_END_ADDRESS: usize = 0x8060_0000;
 pub const BOARD_KERNEL_HEAP_SIZE: usize = 0x30_0000;
-pub const BOARD_STACK_SIZE: usize = 0x8000;
-pub const BOARD_KERNEL_STACK_SIZE: usize = 0x8000;
+pub const BOARD_STACK_SIZE: usize = 0x8_0000;
+pub const BOARD_KERNEL_STACK_SIZE: usize = 0x8_0000;
 
 pub const MMIO_INTERVALS: &[(usize, usize)] = &[
     (0x0200_0000, 0x1000), /* CLINT     */
diff --git a/os/src/interrupt/handler.rs b/os/src/interrupt/handler.rs
@@ -52,6 +52,8 @@ pub fn handle_interrupt(context: &mut Context, scause: Scause, stval: usize) ->
             return processor.prepare_next_thread();
         }
     }
+    //println!("into intr handle!");
+    //println!("cause = {:?}", scause.cause());
     // 根据中断类型来处理，返回的 Context 必须位于放在内核栈顶
     match scause.cause() {
         // 断点中断（ebreak）
@@ -61,7 +63,10 @@ pub fn handle_interrupt(context: &mut Context, scause: Scause, stval: usize) ->
         // 缺页异常
         Trap::Exception(Exception::LoadPageFault)
         | Trap::Exception(Exception::StorePageFault)
-        | Trap::Exception(Exception::InstructionPageFault) => page_fault(context, scause, stval),
+        | Trap::Exception(Exception::InstructionPageFault)
+        | Trap::Exception(Exception::LoadFault)
+        | Trap::Exception(Exception::StoreFault)
+        | Trap::Exception(Exception::InstructionFault) => page_fault(context, scause, stval),
         // 时钟中断
         Trap::Interrupt(Interrupt::SupervisorTimer) => supervisor_timer(context),
         // 外部中断（键盘输入）
diff --git a/os/src/main.rs b/os/src/main.rs
@@ -73,11 +73,23 @@ pub extern "C" fn rust_main(_hart_id: usize, dtb_pa: PhysicalAddress) -> ! {
     crate::board::device_init(dtb_pa);
     fs::init();
 
+    {
+        let mut processor = PROCESSOR.lock();
+        println!("get processor!");
+        let kernel_process = Process::new_kernel().unwrap();
+        println!("kernel process created!");
+        let thread = create_kernel_thread(kernel_process, test_page_fault as usize, None);
+        println!("kernel thread created!");
+        processor.add_thread(thread);
+        println!("thread has been added!");
+    }
+    /*
     PROCESSOR.lock().add_thread(create_kernel_thread(
         Process::new_kernel().unwrap(),
         test_page_fault as usize,
         None,
     ));
+     */
 
     extern "C" {
         fn __restore(context: usize);
diff --git a/os/src/memory/mapping/mapping.rs b/os/src/memory/mapping/mapping.rs
@@ -112,8 +112,10 @@ impl Mapping {
                         page_data
                     };
 
+                    println!("vpn = {}", vpn);
                     // 建立映射，先检查是否有配额来分配新的物理页面
                     if !self.mapped_pairs.full() {
+                        println!("not full, alloc a new frame");
                         // 有配额，分配新的物理页面
                         let mut frame = FRAME_ALLOCATOR.lock().alloc()?;
                         // 更新页表
@@ -123,6 +125,7 @@ impl Mapping {
                         // 保存
                         self.mapped_pairs.push(vpn, frame, entry);
                     } else {
+                        println!("full!");
                         // 配额用完，改为在置换文件中分配一个页面
                         let swap_page = SwapTracker::new()?;
                         // 更新页表
diff --git a/os/src/process/process.rs b/os/src/process/process.rs
@@ -69,6 +69,7 @@ impl Process {
             range.end += alloc_size;
         }
         // 分配物理页面，建立映射
+        println!("start running stack mapping!");
         memory_set.add_segment(
             Segment {
                 map_type: MapType::Framed,
diff --git a/os/src/process/thread.rs b/os/src/process/thread.rs
@@ -62,6 +62,7 @@ impl Thread {
     ) -> MemoryResult<Arc<Thread>> {
         // 让所属进程分配并映射一段空间，作为线程的栈
         let stack = process.alloc_page_range(STACK_SIZE, Flags::READABLE | Flags::WRITABLE)?;
+        println!("stack = {}, {}", stack.start, stack.end);
 
         // 构建线程的 Context
         let context = Context::new(stack.end.into(), entry_point, arguments, process.is_user);

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ impl Process {`
`69`	`69`	`range.end += alloc_size;`
`70`	`70`	`}`
`71`	`71`	`// 分配物理页面，建立映射`
	`72`	`+ println!("start running stack mapping!");`
`72`	`73`	`memory_set.add_segment(`
`73`	`74`	`Segment {`
`74`	`75`	`map_type: MapType::Framed,`