Add lock in condvar in wait_queue.rs

.github/workflows/test.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 env:
   qemu-version: 8.2.0
   rust-toolchain: nightly-2024-05-02
-  arceos-apps: '68054e8'
+  arceos-apps: 'b25b7e2'
 
 jobs:
   unit-test:

modules/axtask/src/run_queue.rs

@@ -268,9 +268,6 @@ impl AxRunQueue {
     where
         F: FnOnce(AxTaskRef),
     {
-        // We do not own an `SpinNoIrq` lock here, so we need to disable IRQ and preempt manually.
-        let _kernel_guard = kernel_guard::NoPreemptIrqSave::new();
-
         let curr = crate::current();
         debug!("task block: {}", curr.id_name());
         assert!(curr.is_running());
@@ -482,13 +479,6 @@ pub(crate) fn init_secondary() {
         i.init_once(idle_task.clone());
     });
     unsafe { CurrentTask::init_current(idle_task) }
-
-    info!(
-        "Initialize secondary RUN_QUEUES {}/{}",
-        cpu_id,
-        axconfig::SMP
-    );
-
     RUN_QUEUE.with_current(|rq| {
         rq.init_once(AxRunQueue::new(cpu_id));
     });

modules/axtask/src/wait_queue.rs

@@ -64,10 +64,11 @@ impl WaitQueue {
     /// Blocks the current task and put it into the wait queue, until other task
     /// notifies it.
     pub fn wait(&self) {
-        debug!("task wait: {}", crate::current().id_name());
+        let mut wq_locked = self.queue.lock();
         current_run_queue().block_current(|task| {
             task.set_in_wait_queue(true);
-            self.queue.lock().push_back(task)
+            wq_locked.push_back(task);
+            drop(wq_locked)
         });
         self.cancel_events(crate::current());
     }
@@ -83,12 +84,14 @@ impl WaitQueue {
     {
         loop {
             // let mut rq_locked = .scheduler().lock();
+            let mut wq_locked = self.queue.lock();
             if condition() {
                 break;
             }
             current_run_queue().block_current(|task| {
                 task.set_in_wait_queue(true);
-                self.queue.lock().push_back(task);
+                wq_locked.push_back(task);
+                drop(wq_locked)
             });
         }
         self.cancel_events(crate::current());
@@ -98,6 +101,7 @@ impl WaitQueue {
     /// notify it, or the given duration has elapsed.
     #[cfg(feature = "irq")]
     pub fn wait_timeout(&self, dur: core::time::Duration) -> bool {
+        let mut wq_locked = self.queue.lock();
         let curr = crate::current();
         let deadline = axhal::time::wall_time() + dur;
         debug!(
@@ -109,7 +113,8 @@ impl WaitQueue {
 
         current_run_queue().block_current(|task| {
             task.set_in_wait_queue(true);
-            self.queue.lock().push_back(task)
+            wq_locked.push_back(task);
+            drop(wq_locked)
         });
         let timeout = curr.in_wait_queue(); // still in the wait queue, must have timed out
         self.cancel_events(curr);
@@ -137,13 +142,15 @@ impl WaitQueue {
 
         let mut timeout = true;
         while axhal::time::wall_time() < deadline {
+            let mut wq_locked = self.queue.lock();
             if condition() {
                 timeout = false;
                 break;
             }
             current_run_queue().block_current(|task| {
                 task.set_in_wait_queue(true);
-                self.queue.lock().push_back(task);
+                wq_locked.push_back(task);
+                drop(wq_locked)
             });
         }
         self.cancel_events(curr);