Changeset 9e87562 in mainline for kernel/generic/src/ipc/ipcrsc.c

Timestamp:

2017-09-18T20:52:12Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6abfd250

Parents:

e5f5ce0

Message:

Make all accesses to capabilites exclusive

This commit makes sure that all accesses to the capabilities array and other
metadata are protected by a mutex. This is necessary for future resizing of the
capabilities array.

Group task's capabilities by type so that it is possible to visit all
capabilities of the given type effectively.

Provide cap_publish() and cap_unpublish() to automate steps that make the
capability visible/invisible to userspace and insert/remove the capability from
the respective type list.

File:

• kernel/generic/src/ipc/ipcrsc.c (modified) (3 diffs)

kernel/generic/src/ipc/ipcrsc.c

@@ -175 +175 @@
 phone_t *phone_get(task_t *task, int handle)
 {
+        phone_t *phone;
+
+        caps_lock(task);
         cap_t *cap = cap_get(task, handle, CAP_TYPE_PHONE);
+        phone = (phone_t *) cap->kobject;
+        caps_unlock(task);
         if (!cap)
                 return NULL;
         
-        return (phone_t *) cap->kobject;
+        return phone;
 }
 
@@ -217 +222 @@
                 phone->state = IPC_PHONE_CONNECTING;
                 
-                irq_spinlock_lock(&task->lock, true);
+                // FIXME: phase this out eventually
+                mutex_lock(&task->cap_info->lock);
                 cap_t *cap = cap_get(task, handle, CAP_TYPE_ALLOCATED);
-                cap->type = CAP_TYPE_PHONE;
-                cap->kobject = (void *) phone;
                 cap->can_reclaim = phone_can_reclaim;
-                irq_spinlock_unlock(&task->lock, true);
+                mutex_unlock(&task->cap_info->lock);
+
+                cap_publish(task, handle, CAP_TYPE_PHONE, phone);
         }
         
@@ -237 +243 @@
 void phone_dealloc(int handle)
 {
-        irq_spinlock_lock(&TASK->lock, true);
-        cap_t *cap = cap_get_current(handle, CAP_TYPE_PHONE);
+        cap_t *cap = cap_unpublish(TASK, handle, CAP_TYPE_PHONE);
         assert(cap);
-        cap->type = CAP_TYPE_ALLOCATED;
-        irq_spinlock_unlock(&TASK->lock, true);
         
         phone_t *phone = (phone_t *) cap->kobject;