Changeset 170332d in mainline

Timestamp:

2010-04-26T11:35:36Z (14 years ago)

Author:

Jakub Jermar <jermar@…>

Branches:

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

Children:

556f9892

Parents:

d69f959

Message:

Disable interrupts when taking TASK→lock.

File:

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

kernel/generic/src/ipc/ipc.c

@@ -218 +218 @@
         answerbox_t *callerbox = call->callerbox;
         bool do_lock = ((!selflocked) || callerbox != (&TASK->answerbox));
+        ipl_t ipl;
 
         /* Count sent answer */
+        ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
         TASK->ipc_info.answer_sent++;
         spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
 
         call->flags |= IPC_CALL_ANSWERED;
@@ -281 +284 @@
 static void _ipc_call(phone_t *phone, answerbox_t *box, call_t *call)
 {
+        ipl_t ipl;
+
         /* Count sent ipc call */
+        ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
         TASK->ipc_info.call_sent++;
         spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
 
         if (!(call->flags & IPC_CALL_FORWARDED)) {
@@ -386 +393 @@
 int ipc_forward(call_t *call, phone_t *newphone, answerbox_t *oldbox, int mode)
 {
+        ipl_t ipl;
+
         /* Count forwarded calls */
+        ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
         TASK->ipc_info.forwarded++;
         spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
 
         spinlock_lock(&oldbox->lock);
@@ -680 +691 @@
         call_t *call;
         link_t *tmp;
+        ipl_t ipl;
         
+        ipl = interrupts_disable();
         spinlock_lock(&tasks_lock);
         task = task_find_by_id(taskid);
@@ -686 +699 @@
                 spinlock_lock(&task->lock);
         spinlock_unlock(&tasks_lock);
-        if (!task)
+        if (!task) {
+                interrupts_restore(ipl);
                 return;
+        }
 
         /* Print opened phones & details */
@@ -770 +785 @@
         spinlock_unlock(&task->answerbox.lock);
         spinlock_unlock(&task->lock);
+        interrupts_restore(ipl);
 }