Changeset aa028db in mainline

Timestamp:

2010-04-25T18:44:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d69f959

Parents:

37c9fc8

Message:

Fix ipc_wait_for_call() not to take the TASK spinlock while holding the
answerbox spinlock. Also disable interrutps when holding the TASK spinlock.

File:

• kernel/generic/src/ipc/ipc.c (modified) (5 diffs)

kernel/generic/src/ipc/ipc.c

@@ -422 +422 @@
         call_t *request;
         ipl_t ipl;
+        uint64_t irq_cnt = 0;
+        uint64_t answer_cnt = 0;
+        uint64_t call_cnt = 0;
         int rc;
 
@@ -431 +434 @@
         spinlock_lock(&box->lock);
         if (!list_empty(&box->irq_notifs)) {
-
                 /* Count recieved IRQ notification */
-                spinlock_lock(&TASK->lock);
-                TASK->ipc_info.irq_notif_recieved++;
-                spinlock_unlock(&TASK->lock);
+                irq_cnt++;      
 
                 ipl = interrupts_disable();
@@ -447 +447 @@
         } else if (!list_empty(&box->answers)) {
                 /* Count recieved answer */
-                spinlock_lock(&TASK->lock);
-                TASK->ipc_info.answer_recieved++;
-                spinlock_unlock(&TASK->lock);
+                answer_cnt++;
 
                 /* Handle asynchronous answers */
@@ -457 +455 @@
         } else if (!list_empty(&box->calls)) {
                 /* Count recieved call */
-                spinlock_lock(&TASK->lock);
-                TASK->ipc_info.call_recieved++;
-                spinlock_unlock(&TASK->lock);
+                call_cnt++;
 
                 /* Handle requests */
@@ -472 +468 @@
         }
         spinlock_unlock(&box->lock);
+        
+        ipl = interrupts_disable();
+        spinlock_lock(&TASK->lock);
+        TASK->ipc_info.irq_notif_recieved += irq_cnt;
+        TASK->ipc_info.answer_recieved += answer_cnt;
+        TASK->ipc_info.call_recieved += call_cnt;
+        spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
+
         return request;
 }