Changeset 0016674 in mainline

Timestamp:

2017-12-09T18:04:23Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

0722869

Parents:

569a51a

Message:

Properly handle errors in SYS_IPC_KBOX.

Also, merge the separate 32/64-bit versions.
There is no reason to optimize such a function this way.

Files:

• kernel/generic/include/ipc/sysipc.h (modified) (1 diff)
• kernel/generic/src/ipc/kbox.c (modified) (2 diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (2 diffs)
• uspace/lib/c/generic/ipc.c (modified) (1 diff)

kernel/generic/include/ipc/sysipc.h

@@ -59 +59 @@
 extern sysarg_t sys_ipc_irq_unsubscribe(sysarg_t);
 
-#ifdef __32_BITS__
-
-extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *, cap_handle_t *);
-
-#endif  /* __32_BITS__ */
-
-#ifdef __64_BITS__
-
-extern sysarg_t sys_ipc_connect_kbox(sysarg_t, cap_handle_t *);
-
-#endif  /* __64_BITS__ */
+extern sysarg_t sys_ipc_connect_kbox(task_id_t *, cap_handle_t *);
 
 #endif

kernel/generic/src/ipc/kbox.c

@@ -232 +232 @@
         }
         
-        if (task->kb.finished != false) {
+        if (task->kb.finished) {
                 mutex_unlock(&task->kb.cleanup_lock);
                 return EINVAL;
         }
         
+        /* Create a kbox thread if necessary. */
+        if (task->kb.thread == NULL) {
+                thread_t *kb_thread = thread_create(kbox_thread_proc, NULL, task,
+                    THREAD_FLAG_NONE, "kbox");
+                
+                if (!kb_thread) {
+                        mutex_unlock(&task->kb.cleanup_lock);
+                        return ENOMEM;
+                }
+                
+                task->kb.thread = kb_thread;
+                thread_ready(kb_thread);
+        }
+        
+        /* Allocate a new phone. */
         cap_handle_t phone_handle = phone_alloc(TASK);
         if (phone_handle < 0) {
@@ -249 +264 @@
         (void) ipc_phone_connect(phone_obj->phone, &task->kb.box);
         
-        if (task->kb.thread != NULL) {
-                mutex_unlock(&task->kb.cleanup_lock);
-                *out_phone = phone_handle;
-                return EOK;
-        }
-        
-        /* Create a kbox thread */
-        thread_t *kb_thread = thread_create(kbox_thread_proc, NULL, task,
-            THREAD_FLAG_NONE, "kbox");
-        if (!kb_thread) {
-                // FIXME: Shouldn't we clean up phone_handle?
-                mutex_unlock(&task->kb.cleanup_lock);
-                return ENOMEM;
-        }
-        
-        task->kb.thread = kb_thread;
-        thread_ready(kb_thread);
-        
         mutex_unlock(&task->kb.cleanup_lock);
-        
         *out_phone = phone_handle;
         return EOK;

kernel/generic/src/ipc/sysipc.c

@@ -897 +897 @@
 }
 
-#ifdef __32_BITS__
-
-/** Syscall connect to a task by ID (32 bits)
+/** Syscall connect to a task by ID
  *
  * @return Error code.
  *
  */
-sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid, cap_handle_t *uspace_phone)
+sysarg_t sys_ipc_connect_kbox(task_id_t *uspace_taskid, cap_handle_t *uspace_phone)
 {
 #ifdef CONFIG_UDEBUG
-        sysarg64_t taskid;
+        task_id_t taskid;
         cap_handle_t phone;
-        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(sysarg64_t));
+        
+        int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(task_id_t));
         if (rc == EOK) {
                 rc = ipc_connect_kbox((task_id_t) taskid, &phone);
         }
+        
         if (rc == EOK) {
                 rc = copy_to_uspace(uspace_phone, &phone, sizeof(cap_handle_t));
-                // FIXME: Clean up phone on failure.
+                if (rc != EOK) {
+                        // Clean up the phone on failure.
+                        sys_ipc_hangup(phone);
+                }
         }
         
@@ -924 +927 @@
 }
 
-#endif  /* __32_BITS__ */
-
-#ifdef __64_BITS__
-
-/** Syscall connect to a task by ID (64 bits)
- *
- * @return Error code.
- *
- */
-sysarg_t sys_ipc_connect_kbox(sysarg_t taskid, cap_handle_t *uspace_phone)
-{
-#ifdef CONFIG_UDEBUG
-        cap_handle_t phone;
-        int rc = ipc_connect_kbox((task_id_t) taskid, &phone);
-        if (rc == EOK) {
-                rc = copy_to_uspace(uspace_phone, &phone, sizeof(cap_handle_t));
-        }
-        return (sysarg_t) rc;
-#else
-        return (sysarg_t) ENOTSUP;
-#endif
-}
-
-#endif  /* __64_BITS__ */
-
 /** @}
  */

uspace/lib/c/generic/ipc.c

@@ -379 +379 @@
 int ipc_connect_kbox(task_id_t id, cap_handle_t *phone)
 {
-#ifdef __32_BITS__
-        sysarg64_t arg = (sysarg64_t) id;
-        return __SYSCALL2(SYS_IPC_CONNECT_KBOX, (sysarg_t) &arg, (sysarg_t) phone);
-#endif
-#ifdef __64_BITS__
-        return __SYSCALL2(SYS_IPC_CONNECT_KBOX, (sysarg_t) id, (sysarg_t) phone);
-#endif
+        return __SYSCALL2(SYS_IPC_CONNECT_KBOX, (sysarg_t) &id, (sysarg_t) phone);
 }