Fix: trace irq context for is_in_irq make correct decision

Author: zhanghe-vivo

kernel/src/boards/gd32e507_eval/mod.rs

@@ -16,13 +16,8 @@ mod config;
 mod handler;
 
 use crate::{
-    arch,
-    arch::irq::IrqNumber,
-    boot,
-    boot::INIT_BSS_DONE,
-    devices::clock::{systick, Clock},
-    sync::SpinLock,
-    time,
+    arch, arch::irq::IrqNumber, boot, boot::INIT_BSS_DONE, devices::clock::systick, irq::IrqTrace,
+    sync::SpinLock, time,
 };
 use alloc::sync::Arc;
 use blueos_driver::pinctrl::gd32_afio::*;
@@ -129,6 +124,7 @@ crate::define_pin_states! {
 
 #[no_mangle]
 pub unsafe extern "C" fn uart0_handler() {
+    let _trace = IrqTrace::new(config::USBFS_IRQn);
     use blueos_hal::HasInterruptReg;
     let uart = get_device!(console_uart);
     if let Some(handler) = unsafe {

kernel/src/boards/qemu_mps2_an385/mod.rs

@@ -22,6 +22,7 @@ use crate::{
     boot,
     devices::clock::{systick, Clock},
     error::Error,
+    irq::IrqTrace,
     time,
 };
 use blueos_hal::HasInterruptReg;
@@ -102,6 +103,7 @@ crate::define_peripheral! {
 
 #[no_mangle]
 pub unsafe extern "C" fn uart0rx_handler() {
+    let _trace = IrqTrace::new(UART0RX_IRQn);
     let uart = get_device!(console_uart);
     if let Some(handler) = unsafe {
         let intr_handler_cell = &*uart.intr_handler.get();
@@ -115,6 +117,7 @@ pub unsafe extern "C" fn uart0rx_handler() {
 
 #[no_mangle]
 pub unsafe extern "C" fn uart0tx_handler() {
+    let _trace = IrqTrace::new(UART0TX_IRQn);
     let uart = get_device!(console_uart);
     if let Some(handler) = unsafe {
         let intr_handler_cell = &*uart.intr_handler.get();

kernel/src/boards/qemu_mps3_an547/mod.rs

@@ -23,6 +23,7 @@ use crate::{
     boot,
     devices::clock::{systick, Clock},
     error::Error,
+    irq::IrqTrace,
     time,
 };
 use blueos_hal::HasInterruptReg;
@@ -114,6 +115,7 @@ crate::define_pin_states!(None);
 
 #[no_mangle]
 pub unsafe extern "C" fn uart0rx_handler() {
+    let _trace = IrqTrace::new(UART0RX_IRQn);
     let uart = get_device!(console_uart);
     if let Some(handler) = unsafe {
         let intr_handler_cell = &*uart.intr_handler.get();
@@ -126,6 +128,7 @@ pub unsafe extern "C" fn uart0rx_handler() {
 }
 #[no_mangle]
 pub unsafe extern "C" fn uart0tx_handler() {
+    let _trace = IrqTrace::new(UART0TX_IRQn);
     let uart = get_device!(console_uart);
     if let Some(handler) = unsafe {
         let intr_handler_cell = &*uart.intr_handler.get();

kernel/src/boards/qemu_virt64_aarch64/init.rs

@@ -21,6 +21,7 @@ use crate::{
         registers::cntfrq_el0::CNTFRQ_EL0,
     },
     error::Error,
+    irq::IrqTrace,
     scheduler,
     support::SmpStagedInit,
     time,
@@ -85,6 +86,7 @@ crate::define_pin_states!(None);
 pub struct Serial0Irq {}
 impl IrqHandler for Serial0Irq {
     fn handle(&mut self) {
+        let _trace = IrqTrace::new(config::PL011_UART0_IRQNUM);
         let uart = get_device!(console_uart);
         if let Some(handler) = unsafe {
             let intr_handler_cell = &*uart.intr_handler.get();

kernel/src/boards/raspberry_pico2_cortexm/mod.rs

@@ -26,6 +26,9 @@ use blueos_hal::clock_control::ClockControl;
 use core::ptr::addr_of;
 use spin::Once;
 
+// const definitions
+pub const UART0_IRQn: IrqNumber = IrqNumber::new(33);
+
 #[link_section = ".start_block"]
 #[used]
 pub static IMAGE_DEF: block::ImageDef = block::ImageDef::secure_exe();
@@ -95,7 +98,7 @@ pub(crate) fn init() {
 
     unsafe { boot::init_heap() };
     arch::irq::init();
-    arch::irq::enable_irq_with_priority(IrqNumber::new(33), arch::irq::Priority::Normal);
+    arch::irq::enable_irq_with_priority(UART0_IRQn, arch::irq::Priority::Normal);
     ClockImpl::init();
 }
 
@@ -140,6 +143,7 @@ crate::define_bus! {
 #[no_mangle]
 pub unsafe extern "C" fn uart0_handler() {
     use blueos_hal::HasInterruptReg;
+    let _trace = IrqTrace::new(UART0_IRQn);
     let uart = get_device!(console_uart);
     let intr = uart.get_interrupt();
     if let Some(handler) = unsafe {