Changeset 645d9ed2 in mainline

Timestamp:

2008-08-24T18:19:21Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

74965d2

Parents:

088ab05

Message:

Fix processing of answers to forwarded masqueraded calls.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/ipc.c (modified) (2 diffs)
• src/ipc/ipcrsc.c (modified) (2 diffs)
• src/main/kinit.c (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -261 +261 @@
         unative_t args[IPC_CALL_LEN];
         phone_t *phone;
+        /*
+         * The forward operation can masquerade the caller phone. For those
+         * cases, we must keep it aside so that the answer is processed
+         * correctly.
+         */
+        phone_t *caller_phone;
 } ipc_data_t;
 

kernel/generic/src/ipc/ipc.c

@@ -348 +348 @@
         spinlock_unlock(&oldbox->lock);
 
-        if (mode & IPC_FF_ROUTE_FROM_ME)
+        if (mode & IPC_FF_ROUTE_FROM_ME) {
+                if (!call->data.caller_phone)
+                        call->data.caller_phone = call->data.phone;
                 call->data.phone = newphone;
+        }
 
         return ipc_call(newphone, call);
@@ -393 +396 @@
                 request = list_get_instance(box->answers.next, call_t, link);
                 list_remove(&request->link);
-                atomic_dec(&request->data.phone->active_calls);
+                if (request->data.caller_phone)
+                        atomic_dec(&request->data.caller_phone->active_calls);
+                else
+                        atomic_dec(&request->data.phone->active_calls);
         } else if (!list_empty(&box->calls)) {
                 /* Handle requests */

kernel/generic/src/ipc/ipcrsc.c

@@ -171 +171 @@
 
         spinlock_lock(&TASK->lock);
-        
         for (i = 0; i < IPC_MAX_PHONES; i++) {
                 if (TASK->phones[i].state == IPC_PHONE_HUNGUP &&
@@ -184 +183 @@
         spinlock_unlock(&TASK->lock);
 
-        if (i >= IPC_MAX_PHONES)
+        if (i == IPC_MAX_PHONES)
                 return -1;
+
         return i;
 }

kernel/generic/src/main/kinit.c

@@ -178 +178 @@
                         cap_set(programs[i].task, CAP_CAP | CAP_MEM_MANAGER |
                             CAP_IO_MANAGER | CAP_PREEMPT_CONTROL | CAP_IRQ_REG);
-
                         
                         if (!ipc_phone_0)