Changeset 63d8f43 in mainline

Timestamp:

2017-09-04T19:38:28Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fa32c9f

Parents:

30c27e9

Message:

Allocate the kobjects referenced by capabilities dynamically

Location:

kernel/generic

Files:

• include/cap/cap.h (modified) (2 diffs)
• src/cap/cap.c (modified) (1 diff)
• src/ipc/ipc.c (modified) (3 diffs)
• src/ipc/ipcrsc.c (modified) (5 diffs)
• src/ipc/irq.c (modified) (4 diffs)
• src/proc/task.c (modified) (1 diff)

kernel/generic/include/cap/cap.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <ipc/ipc.h>
-#include <ddi/irq.h>
 
 #define MAX_CAPS  64
@@ -64 +63 @@
 
         /* The underlying kernel object. */
-        union {
-                phone_t phone;
-                irq_t irq;
-        };
+        void *kobject;
 } cap_t;
 

kernel/generic/src/cap/cap.c

@@ -102 +102 @@
         assert(handle >= 0);
         assert(handle < MAX_CAPS);
-        assert(task->caps[handle].type != CAP_TYPE_INVALID);
+        assert(task->caps[handle].type == CAP_TYPE_ALLOCATED);
 
         irq_spinlock_lock(&task->lock, true);

kernel/generic/src/ipc/ipc.c

@@ -743 +743 @@
         all_clean = true;
         for_each_cap_current(cap, CAP_TYPE_PHONE) {
-                phone_t *phone = &cap->phone;
+                phone_t *phone = (phone_t *) cap->kobject;
 
                 mutex_lock(&phone->lock);
@@ -820 +820 @@
         /* Disconnect all our phones ('ipc_phone_hangup') */
         for_each_cap_current(cap, CAP_TYPE_PHONE) {
-                phone_t *phone = &cap->phone;
+                phone_t *phone = (phone_t *) cap->kobject;
                 ipc_phone_hangup(phone);
         }
@@ -913 +913 @@
         
         for_each_cap(task, cap, CAP_TYPE_PHONE) {
-                phone_t *phone = &cap->phone;
+                phone_t *phone = (phone_t *) cap->kobject;
         
                 if (SYNCH_FAILED(mutex_trylock(&phone->lock))) {

kernel/generic/src/ipc/ipcrsc.c

@@ -135 +135 @@
 #include <abi/errno.h>
 #include <cap/cap.h>
+#include <mm/slab.h>
 
 /** Find call_t * in call table according to callid.
@@ -178 +179 @@
                 return NULL;
         
-        return &cap->phone;
+        return (phone_t *) cap->kobject;
 }
 
@@ -190 +191 @@
         assert(cap->type == CAP_TYPE_PHONE);
 
-        return (cap->phone.state == IPC_PHONE_HUNGUP) &&
-            (atomic_get(&cap->phone.active_calls) == 0);
+        phone_t *phone = (phone_t *) cap->kobject;
+
+        return (phone->state == IPC_PHONE_HUNGUP) &&
+            (atomic_get(&phone->active_calls) == 0);
 }
 
@@ -205 +208 @@
         int handle = cap_alloc(task);
         if (handle >= 0) {
+                phone_t *phone = malloc(sizeof(phone_t), FRAME_ATOMIC);
+                if (!phone) {
+                        cap_free(TASK, handle);
+                        return ENOMEM;
+                }
+                
+                ipc_phone_init(phone, task);
+                phone->state = IPC_PHONE_CONNECTING;
+                
                 irq_spinlock_lock(&task->lock, true);
                 cap_t *cap = cap_get(task, handle, CAP_TYPE_ALLOCATED);
-                ipc_phone_init(&cap->phone, task);
                 cap->type = CAP_TYPE_PHONE;
+                cap->kobject = (void *) phone;
                 cap->can_reclaim = phone_can_reclaim;
-                cap->phone.state = IPC_PHONE_CONNECTING;
                 irq_spinlock_unlock(&task->lock, true);
         }
@@ -226 +237 @@
 void phone_dealloc(int handle)
 {
-        phone_t *phone = phone_get_current(handle);
+        irq_spinlock_lock(&TASK->lock, true);
+        cap_t *cap = cap_get_current(handle, CAP_TYPE_PHONE);
+        assert(cap);
+        cap->type = CAP_TYPE_ALLOCATED;
+        irq_spinlock_unlock(&TASK->lock, true);
+        
+        phone_t *phone = (phone_t *) cap->kobject;
         
         assert(phone);
         assert(phone->state == IPC_PHONE_CONNECTING);
-
+        
+        free(phone);
         cap_free(TASK, handle);
 }

kernel/generic/src/ipc/irq.c

@@ -307 +307 @@
         if (handle < 0)
                 return handle;
+        
+        irq_t *irq = (irq_t *) malloc(sizeof(irq_t), FRAME_ATOMIC);
+        if (!irq) {
+                cap_free(TASK, handle);
+                return ENOMEM;
+        }
+        
         cap_t *cap = cap_get_current(handle, CAP_TYPE_ALLOCATED);
         assert(cap);
         
-        irq_t *irq = &cap->irq;
         irq_initialize(irq);
         irq->inr = inr;
@@ -321 +327 @@
         irq->notif_cfg.counter = 0;
         
+        cap->kobject = (void *) irq;
+        
         /*
          * Insert the IRQ structure into the uspace IRQ hash table and retype
@@ -359 +367 @@
         irq_spinlock_unlock(&TASK->lock, true);
         
-        irq_t *irq = &cap->irq;
+        irq_t *irq = (irq_t *) cap->kobject;
         
         irq_spinlock_lock(&irq_uspace_hash_table_lock, true);
@@ -376 +384 @@
         
         /* Free up the IRQ capability and the underlying kernel object. */
+        free(cap->kobject);
         cap_free(TASK, handle);
         

kernel/generic/src/proc/task.c

@@ -625 +625 @@
         if (*additional) {
                 for_each_cap(task, cap, CAP_TYPE_PHONE) {
-                        phone_t *phone = &cap->phone;
+                        phone_t *phone = (void *) &cap->kobject;
                         if (phone->callee)
                                 printf(" %d:%p", cap->handle, phone->callee);