Changeset 91b60499 in mainline for kernel/generic/include/ipc

Timestamp:

2017-09-30T06:29:42Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

300f4c4

Parents:

d076f16 (diff), 6636fb19 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge support for capabilities from lp:~jakub/helenos/caps

This commit introduces capabilities as task-local names for references to kernel
objects. Kernel objects are reference-counted wrappers for a select group of
objects allocated in and by the kernel that can be made accessible to userspace
in a controlled way via integer handles.

So far, a kernel object encapsulates either an irq_t or a phone_t.

Support for the former lead to the removal of kernel-assigned devnos and
unsecure deregistration of IRQs in which a random task was able to unregister
some other task's IRQ.

Location:

kernel/generic/include/ipc

Files:

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

kernel/generic/include/ipc/ipc.h

@@ -42 +42 @@
 #include <abi/proc/task.h>
 #include <typedefs.h>
-
-#define IPC_MAX_PHONES  64
+#include <mm/slab.h>
+#include <cap/cap.h>
 
 struct answerbox;
@@ -62 +62 @@
 
 /** Structure identifying phone (in TASK structure) */
-typedef struct {
+typedef struct phone {
         mutex_t lock;
         link_t link;
@@ -69 +69 @@
         ipc_phone_state_t state;
         atomic_t active_calls;
+        kobject_t *kobject;
 } phone_t;
 
@@ -94 +95 @@
         /** Notifications from IRQ handlers. */
         list_t irq_notifs;
-        /** IRQs with notifications to this answerbox. */
-        list_t irq_list;
 } answerbox_t;
 
@@ -170 +169 @@
 } call_t;
 
+extern slab_cache_t *phone_slab;
+
 extern answerbox_t *ipc_phone_0;
 

kernel/generic/include/ipc/ipcrsc.h

@@ -38 +38 @@
 #include <proc/task.h>
 #include <ipc/ipc.h>
+#include <cap/cap.h>
 
 extern call_t *get_call(sysarg_t);
-extern int phone_get(sysarg_t, phone_t **);
-extern int phone_alloc(task_t *);
-extern bool phone_connect(int, answerbox_t *);
-extern void phone_dealloc(int);
+extern cap_handle_t phone_alloc(task_t *);
+extern bool phone_connect(cap_handle_t, answerbox_t *);
+extern void phone_dealloc(cap_handle_t);
 
 #endif

kernel/generic/include/ipc/irq.h

@@ -47 +47 @@
 #include <adt/list.h>
 
-extern int ipc_irq_subscribe(answerbox_t *, inr_t, devno_t, sysarg_t,
-    irq_code_t *);
 
 extern irq_ownership_t ipc_irq_top_half_claim(irq_t *);
 extern void ipc_irq_top_half_handler(irq_t *);
 
-extern int ipc_irq_unsubscribe(answerbox_t *, inr_t, devno_t);
-extern void ipc_irq_cleanup(answerbox_t *);
+extern int ipc_irq_subscribe(answerbox_t *, inr_t, sysarg_t, irq_code_t *);
+extern int ipc_irq_unsubscribe(answerbox_t *, int);
 
 /*

kernel/generic/include/ipc/sysipc.h

@@ -56 +56 @@
 extern sysarg_t sys_ipc_hangup(sysarg_t);
 
-extern sysarg_t sys_ipc_irq_subscribe(inr_t, devno_t, sysarg_t, irq_code_t *);
-extern sysarg_t sys_ipc_irq_unsubscribe(inr_t, devno_t);
+extern sysarg_t sys_ipc_irq_subscribe(inr_t, sysarg_t, irq_code_t *);
+extern sysarg_t sys_ipc_irq_unsubscribe(sysarg_t);
 
 #ifdef __32_BITS__