fix: 所有 wfi 循环以对抗简单的硬件

Signed-off-by: YdrMaster <[email protected]>

Author: YdrMaster

bench-kernel/src/main.rs

@@ -39,11 +39,7 @@ extern "C" fn rust_main(hartid: usize, _dtb_pa: usize) -> ! {
     rcore_console::init_console(&Console);
     rcore_console::set_log_level(option_env!("LOG"));
     rcore_console::test_log();
-    // 打开软中断
-    unsafe {
-        sie::set_ssoft();
-        sstatus::set_sie();
-    };
+
     // 测试调用延迟
     let t0 = time::read();
 
@@ -53,18 +49,22 @@ extern "C" fn rust_main(hartid: usize, _dtb_pa: usize) -> ! {
 
     let t1 = time::read();
     log::info!("marchid duration = {}", t1 - t0);
+
+    // 打开软中断
+    unsafe { sie::set_ssoft() };
     // 测试中断响应延迟
     let t0 = time::read();
-
     for _ in 0..0x20000 {
         unsafe {
+            sstatus::set_sie();
             core::arch::asm!(
                 "   la    {0}, 1f
                     csrw  stvec, {0}
                     mv    a0, a2
                     mv    a1, zero
                     ecall
-                    wfi
+                 0: wfi
+                    j 0b
                  .align 2
                  1: csrci sip, {ssip}
                 ",

rustsbi-qemu/src/main.rs

@@ -62,7 +62,7 @@ unsafe extern "C" fn _start() -> ! {
 
 #[naked]
 unsafe extern "C" fn _stop() -> ! {
-    asm!("wfi", options(noreturn))
+    asm!("0: wfi", "j 0b", options(noreturn))
 }
 
 /// rust 入口。
@@ -400,8 +400,9 @@ impl rustsbi::Hsm for Hsm {
                         csrrw  {0}, mtvec,   {0}
                         csrr   {1}, mepc
                         csrrsi {2}, mstatus, {mie}
-                        wfi
-                    1:  csrw   mstatus, {2}
+                     0: wfi
+                        j 0b
+                     1: csrw   mstatus, {2}
                         csrw   mepc,    {1}
                         csrw   mtvec,   {0}
                     ",