Changeset eadaeae8 in mainline for kernel/generic/include/ipc

Timestamp:

2018-03-21T20:58:49Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3be9d10

Parents:

874381a

Message:

Make capability handles type-safe

Define distinct pointer types for the handles of the supported
capability types and use them instead of integer handles. This makes it
virtually impossible to pass a non-handle or a handle of different type
instead of the proper handle. Also turn cap_handle_t into an "untyped"
capability handle that can be assigned to and from the "typed" handles.

This commit also fixes a bug in msim-con driver, which wrongly used the
IRQ number instead of the IRQ capability handle to unregister the IRQ.

This commit also fixes the wrong use of the capability handle instead
of error code in libusbhost.

Location:

kernel/generic/include/ipc

Files:

• ipc.h (modified) (1 diff)
• ipcrsc.h (modified) (1 diff)
• irq.h (modified) (1 diff)
• kbox.h (modified) (1 diff)
• sysipc.h (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -116 +116 @@
         sysarg_t label;
         /** Capability handle */
-        cap_handle_t cap_handle;
+        cap_call_handle_t cap_handle;
 } ipc_data_t;
 

kernel/generic/include/ipc/ipcrsc.h

@@ -40 +40 @@
 #include <cap/cap.h>
 
-extern errno_t phone_alloc(task_t *, bool, cap_handle_t *, kobject_t **);
-extern void phone_dealloc(cap_handle_t);
+extern errno_t phone_alloc(task_t *, bool, cap_phone_handle_t *, kobject_t **);
+extern void phone_dealloc(cap_phone_handle_t);
 
 #endif

kernel/generic/include/ipc/irq.h

@@ -52 +52 @@
 
 extern errno_t ipc_irq_subscribe(answerbox_t *, inr_t, sysarg_t, irq_code_t *,
-    cap_handle_t *);
-extern errno_t ipc_irq_unsubscribe(answerbox_t *, int);
+    cap_irq_handle_t *);
+extern errno_t ipc_irq_unsubscribe(answerbox_t *, cap_irq_handle_t);
 
 /*

kernel/generic/include/ipc/kbox.h

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

kernel/generic/include/ipc/sysipc.h

@@ -40 +40 @@
 #include <typedefs.h>
 
-extern errno_t ipc_req_internal(int, ipc_data_t *, sysarg_t);
+extern errno_t ipc_req_internal(cap_phone_handle_t, ipc_data_t *, sysarg_t);
 
-extern sys_errno_t sys_ipc_call_async_fast(sysarg_t, sysarg_t, sysarg_t,
+extern sys_errno_t sys_ipc_call_async_fast(cap_phone_handle_t, sysarg_t,
+    sysarg_t, sysarg_t, sysarg_t, sysarg_t);
+extern sys_errno_t sys_ipc_call_async_slow(cap_phone_handle_t, ipc_data_t *,
+    sysarg_t);
+extern sys_errno_t sys_ipc_answer_fast(cap_call_handle_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t);
-extern sys_errno_t sys_ipc_call_async_slow(sysarg_t, ipc_data_t *, sysarg_t);
-extern sys_errno_t sys_ipc_answer_fast(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t);
-extern sys_errno_t sys_ipc_answer_slow(sysarg_t, ipc_data_t *);
+extern sys_errno_t sys_ipc_answer_slow(cap_call_handle_t, ipc_data_t *);
 extern sys_errno_t sys_ipc_wait_for_call(ipc_data_t *, uint32_t, unsigned int);
 extern sys_errno_t sys_ipc_poke(void);
-extern sys_errno_t sys_ipc_forward_fast(sysarg_t, sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, unsigned int);
-extern sys_errno_t sys_ipc_forward_slow(sysarg_t, sysarg_t, ipc_data_t *,
-    unsigned int);
-extern sys_errno_t sys_ipc_hangup(sysarg_t);
+extern sys_errno_t sys_ipc_forward_fast(cap_call_handle_t, cap_phone_handle_t,
+    sysarg_t, sysarg_t, sysarg_t, unsigned int);
+extern sys_errno_t sys_ipc_forward_slow(cap_call_handle_t, cap_phone_handle_t,
+    ipc_data_t *, unsigned int);
+extern sys_errno_t sys_ipc_hangup(cap_phone_handle_t);
 
-extern sys_errno_t sys_ipc_irq_subscribe(inr_t, sysarg_t, irq_code_t *, cap_handle_t *);
-extern sys_errno_t sys_ipc_irq_unsubscribe(sysarg_t);
+extern sys_errno_t sys_ipc_irq_subscribe(inr_t, sysarg_t, irq_code_t *,
+    cap_irq_handle_t *);
+extern sys_errno_t sys_ipc_irq_unsubscribe(cap_irq_handle_t);
 
-extern sys_errno_t sys_ipc_connect_kbox(task_id_t *, cap_handle_t *);
+extern sys_errno_t sys_ipc_connect_kbox(task_id_t *, cap_phone_handle_t *);
 
 #endif