Changeset 5d3ed34 in mainline

Timestamp:

2012-09-03T21:39:37Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9c9bbaf

Parents:

9ef1b79b

Message:

Make sure that both dispatched and non-dispatched calls are properly
answered in ipc_cleanup_call_list().

• Define simple request_preprocess() hook for IPC_M_CONNECT_TO_ME to detect when the request_process() was not called and no resources allocated so that answer_cleanup() does not attempt to free non-existent resources.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• include/ipc/sysipc_priv.h (added)
• src/ipc/ipc.c (modified) (4 diffs)
• src/ipc/kbox.c (modified) (1 diff)
• src/ipc/ops/concttome.c (modified) (4 diffs)
• src/ipc/sysipc.c (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -179 +179 @@
 extern void ipc_backsend_err(phone_t *, call_t *, sysarg_t);
 extern void ipc_answerbox_slam_phones(answerbox_t *, bool);
-extern void ipc_cleanup_call_list(list_t *);
+extern void ipc_cleanup_call_list(answerbox_t *, list_t *);
 
 extern void ipc_print_task(task_id_t);

kernel/generic/src/ipc/ipc.c

@@ -46 +46 @@
 #include <ipc/event.h>
 #include <ipc/sysipc_ops.h>
+#include <ipc/sysipc_priv.h>
 #include <errno.h>
 #include <mm/slab.h>
@@ -475 +476 @@
 /** Answer all calls from list with EHANGUP answer.
  *
+ * @param box Answerbox with the list.
  * @param lst Head of the list to be cleaned up.
- *
- */
-void ipc_cleanup_call_list(list_t *lst)
-{
+ */
+void ipc_cleanup_call_list(answerbox_t *box, list_t *lst)
+{
+        irq_spinlock_lock(&box->lock, true);
         while (!list_empty(lst)) {
                 call_t *call = list_get_instance(list_first(lst), call_t,
@@ -485 +487 @@
                 
                 list_remove(&call->ab_link);
-                
+
+                irq_spinlock_unlock(&box->lock, true);
+
+                ipc_data_t old = call->data;
                 IPC_SET_RETVAL(call->data, EHANGUP);
+                answer_preprocess(call, &old);
                 _ipc_answer_free_call(call, true);
-        }
+
+                irq_spinlock_lock(&box->lock, true);
+        }
+        irq_spinlock_unlock(&box->lock, true);
 }
 
@@ -694 +703 @@
         
         /* Answer all messages in 'calls' and 'dispatched_calls' queues */
-        irq_spinlock_lock(&TASK->answerbox.lock, true);
-        ipc_cleanup_call_list(&TASK->answerbox.dispatched_calls);
-        ipc_cleanup_call_list(&TASK->answerbox.calls);
-        irq_spinlock_unlock(&TASK->answerbox.lock, true);
+        ipc_cleanup_call_list(&TASK->answerbox,
+            &TASK->answerbox.dispatched_calls);
+        ipc_cleanup_call_list(&TASK->answerbox, &TASK->answerbox.calls);
 
         ipc_forget_all_active_calls();

kernel/generic/src/ipc/kbox.c

@@ -88 +88 @@
         
         /* Answer all messages in 'calls' and 'dispatched_calls' queues. */
-        irq_spinlock_lock(&TASK->kb.box.lock, true);
-        ipc_cleanup_call_list(&TASK->kb.box.dispatched_calls);
-        ipc_cleanup_call_list(&TASK->kb.box.calls);
-        irq_spinlock_unlock(&TASK->kb.box.lock, true);
+        ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.dispatched_calls);
+        ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.calls);
 }
 

kernel/generic/src/ipc/ops/concttome.c

@@ -40 +40 @@
 #include <arch.h>
 
+static int request_preprocess(call_t *call, phone_t *phone)
+{
+        /* Start with the assumption that there is no allocated phoneid. */
+        IPC_SET_ARG5(call->data, -1);
+        return EOK;
+}
+
 static int request_process(call_t *call, answerbox_t *box)
 {
         int phoneid = phone_alloc(TASK);
 
-        if (phoneid < 0) {
-                IPC_SET_RETVAL(call->data, ELIMIT);
-                /*
-                 * This is a shortcut which bypasses the standard call
-                 * processing hooks. We are still playing it save here as
-                 * there is no state to be cleaned up at this stage.
-                 */
-                ipc_answer(box, call);
-                return -1;
-        }
-                
         IPC_SET_ARG5(call->data, phoneid);
         
@@ -64 +60 @@
         int phoneid = (int) IPC_GET_ARG5(*olddata);
 
-        phone_dealloc(phoneid);
+        if (phoneid >= 0)
+                phone_dealloc(phoneid);
 }
 
@@ -74 +71 @@
                 /* The connection was not accepted */
                 answer_cleanup(answer, olddata);
-        } else {
+        } else if (phoneid >= 0) {
                 /* The connection was accepted */
                 phone_connect(phoneid, &answer->sender->answerbox);
                 /* Set 'phone hash' as arg5 of response */
                 IPC_SET_ARG5(answer->data, (sysarg_t) &TASK->phones[phoneid]);
+        } else {
+                IPC_SET_RETVAL(answer->data, ELIMIT);
         }
 
@@ -86 +85 @@
 
 sysipc_ops_t ipc_m_connect_to_me_ops = {
-        .request_preprocess = null_request_preprocess,
+        .request_preprocess = request_preprocess,
         .request_forget = null_request_forget,
         .request_process = request_process,

kernel/generic/src/ipc/sysipc.c

@@ -40 +40 @@
 #include <ipc/sysipc.h>
 #include <ipc/sysipc_ops.h>
+#include <ipc/sysipc_priv.h>
 #include <ipc/irq.h>
 #include <ipc/ipcrsc.h>
@@ -157 +158 @@
  *
  */
-static int answer_preprocess(call_t *answer, ipc_data_t *olddata)
+int answer_preprocess(call_t *answer, ipc_data_t *olddata)
 {
         int rc = EOK;