Changeset 569a51a in mainline

Timestamp:

2017-12-08T21:17:27Z (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:

0016674

Parents:

071a1ddb

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 16:35:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:17:27)

Message:

Return phone handle in SYS_IPC_CONNECT_KBOX separately from error code.

Files:

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

kernel/generic/include/ipc/kbox.h

@@ -50 +50 @@
 } kbox_t;
 
-extern int ipc_connect_kbox(task_id_t);
+extern int ipc_connect_kbox(task_id_t, cap_handle_t *);
 extern void ipc_kbox_cleanup(void);
 

kernel/generic/include/ipc/sysipc.h

@@ -61 +61 @@
 #ifdef __32_BITS__
 
-extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *);
+extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *, cap_handle_t *);
 
 #endif  /* __32_BITS__ */
@@ -67 +67 @@
 #ifdef __64_BITS__
 
-extern sysarg_t sys_ipc_connect_kbox(sysarg_t);
+extern sysarg_t sys_ipc_connect_kbox(sysarg_t, cap_handle_t *);
 
 #endif  /* __64_BITS__ */

kernel/generic/src/ipc/kbox.c

@@ -206 +206 @@
  * cleanup code.
  *
- * @return Phone capability handle on success, or negative error code.
- *
- */
-int ipc_connect_kbox(task_id_t taskid)
+ * @param[out] out_phone  Phone capability handle on success.
+ * @return Error code.
+ *
+ */
+int ipc_connect_kbox(task_id_t taskid, cap_handle_t *out_phone)
 {
         irq_spinlock_lock(&tasks_lock, true);
@@ -250 +251 @@
         if (task->kb.thread != NULL) {
                 mutex_unlock(&task->kb.cleanup_lock);
-                return phone_handle;
+                *out_phone = phone_handle;
+                return EOK;
         }
         
@@ -257 +259 @@
             THREAD_FLAG_NONE, "kbox");
         if (!kb_thread) {
+                // FIXME: Shouldn't we clean up phone_handle?
                 mutex_unlock(&task->kb.cleanup_lock);
                 return ENOMEM;
@@ -266 +269 @@
         mutex_unlock(&task->kb.cleanup_lock);
         
-        return phone_handle;
+        *out_phone = phone_handle;
+        return EOK;
 }
 

kernel/generic/src/ipc/sysipc.c

@@ -901 +901 @@
 /** Syscall connect to a task by ID (32 bits)
  *
- * @return Phone id on success, or negative error code.
- *
- */
-sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid)
+ * @return Error code.
+ *
+ */
+sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid, cap_handle_t *uspace_phone)
 {
 #ifdef CONFIG_UDEBUG
         sysarg64_t taskid;
+        cap_handle_t phone;
         int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(sysarg64_t));
-        if (rc != 0)
-                return (sysarg_t) rc;
-        
-        return ipc_connect_kbox((task_id_t) taskid);
+        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.
+        }
+        
+        return (sysarg_t) rc;
 #else
         return (sysarg_t) ENOTSUP;
@@ -924 +930 @@
 /** Syscall connect to a task by ID (64 bits)
  *
- * @return Phone id on success, or negative error code.
- *
- */
-sysarg_t sys_ipc_connect_kbox(sysarg_t taskid)
+ * @return Error code.
+ *
+ */
+sysarg_t sys_ipc_connect_kbox(sysarg_t taskid, cap_handle_t *uspace_phone)
 {
 #ifdef CONFIG_UDEBUG
-        return ipc_connect_kbox((task_id_t) taskid);
+        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;

uspace/lib/c/generic/async.c

@@ -2398 +2398 @@
         }
         
-        int phone = ipc_connect_kbox(id);
-        if (phone < 0) {
-                errno = phone;
+        cap_handle_t phone;
+        int rc = ipc_connect_kbox(id, &phone);
+        if (rc != EOK) {
+                errno = rc;
                 free(sess);
                 return NULL;

uspace/lib/c/generic/ipc.c

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

uspace/lib/c/include/ipc/ipc.h

@@ -122 +122 @@
     sysarg_t, sysarg_t, sysarg_t, sysarg_t, unsigned int);
 
-extern int ipc_connect_kbox(task_id_t);
+extern int ipc_connect_kbox(task_id_t, cap_handle_t *);
 
 #endif