Changeset 91b60499 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2017-09-30T06:29:42Z (7 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.

File:

• kernel/generic/src/proc/task.c (modified) (9 diffs)

kernel/generic/src/proc/task.c

@@ -50 +50 @@
 #include <adt/btree.h>
 #include <adt/list.h>
+#include <cap/cap.h>
 #include <ipc/ipc.h>
 #include <ipc/ipcrsc.h>
@@ -83 +84 @@
 static void task_kill_internal(task_t *);
 static int tsk_constructor(void *, unsigned int);
+static size_t tsk_destructor(void *obj);
 
 /** Initialize kernel tasks support.
@@ -92 +94 @@
         avltree_create(&tasks_tree);
         task_slab = slab_cache_create("task_t", sizeof(task_t), 0,
-            tsk_constructor, NULL, 0);
+            tsk_constructor, tsk_destructor, 0);
 }
 
@@ -167 +169 @@
         list_initialize(&task->threads);
         
+        caps_task_alloc(task);
+        
         ipc_answerbox_init(&task->answerbox, task);
         
-        size_t i;
-        for (i = 0; i < IPC_MAX_PHONES; i++)
-                ipc_phone_init(&task->phones[i], task);
-
         spinlock_initialize(&task->active_calls_lock, "active_calls_lock");
         list_initialize(&task->active_calls);
@@ -186 +186 @@
 }
 
+size_t tsk_destructor(void *obj)
+{
+        task_t *task = (task_t *) obj;
+        
+        caps_task_free(task);
+        return 0;
+}
+
 /** Create new task with no threads.
  *
@@ -206 +214 @@
         task->ucycles = 0;
         task->kcycles = 0;
+
+        caps_task_init(task);
 
         task->ipc_info.call_sent = 0;
@@ -228 +238 @@
         
         if ((ipc_phone_0) &&
-            (container_check(ipc_phone_0->task->container, task->container)))
-                (void) ipc_phone_connect(&task->phones[0], ipc_phone_0);
+            (container_check(ipc_phone_0->task->container, task->container))) {
+                cap_handle_t phone_handle = phone_alloc(task);
+                kobject_t *phone_obj = kobject_get(task, phone_handle,
+                    KOBJECT_TYPE_PHONE);
+                (void) ipc_phone_connect(phone_obj->phone, ipc_phone_0);
+        }
         
         futex_task_init(task);
@@ -603 +617 @@
         if (*additional)
                 printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c "
-                    "%9" PRIua, task->taskid, ucycles, usuffix, kcycles,
+                    "%9" PRIua "\n", task->taskid, ucycles, usuffix, kcycles,
                     ksuffix, atomic_get(&task->refcount));
         else
@@ -609 +623 @@
                     task->taskid, task->name, task->container, task, task->as);
 #endif
-        
-        if (*additional) {
-                size_t i;
-                for (i = 0; i < IPC_MAX_PHONES; i++) {
-                        if (task->phones[i].callee)
-                                printf(" %zu:%p", i, task->phones[i].callee);
-                }
-                printf("\n");
-        }
         
         irq_spinlock_unlock(&task->lock, false);