Changeset ce732e74 in mainline

Timestamp:

2017-10-12T17:59:31Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d51838f

Parents:

d29ae35

Message:

Allocate capabilities from a dedicated slab cache

Location:

kernel/generic

Files:

• include/cap/cap.h (modified) (1 diff)
• src/cap/cap.c (modified) (5 diffs)
• src/main/main.c (modified) (2 diffs)

kernel/generic/include/cap/cap.h

@@ -111 +111 @@
 } cap_info_t;
 
+extern void caps_init(void);
 extern int caps_task_alloc(struct task *);
 extern void caps_task_free(struct task *);

kernel/generic/src/cap/cap.c

@@ -83 +83 @@
 #define MAX_CAPS        INT_MAX
 
+static slab_cache_t *cap_slab;
+
 static kobject_t *cap_unpublish_locked(task_t *, cap_handle_t, kobject_type_t);
 
@@ -109 +111 @@
         .key_equal = caps_key_equal
 };
+
+void caps_init(void)
+{
+        cap_slab = slab_cache_create("cap_t", sizeof(cap_t), 0, NULL,
+            NULL, 0);
+}
 
 /** Allocate the capability info structure
@@ -267 +275 @@
          */
         if (!cap) {
-                cap = malloc(sizeof(cap_t), 0);
+                cap = slab_alloc(cap_slab, FRAME_ATOMIC);
                 if (!cap) {
                         mutex_unlock(&task->cap_info->lock);
@@ -274 +282 @@
                 uintptr_t hbase;
                 if (!ra_alloc(task->cap_info->handles, 1, 1, &hbase)) {
-                        free(cap);
+                        slab_free(cap_slab, cap);
                         mutex_unlock(&task->cap_info->lock);
                         return ENOMEM;
@@ -370 +378 @@
         hash_table_remove_item(&task->cap_info->caps, &cap->caps_link);
         ra_free(task->cap_info->handles, handle, 1);
-        free(cap);
+        slab_free(cap_slab, cap);
         mutex_unlock(&task->cap_info->lock);
 }

kernel/generic/src/main/main.c

@@ -92 +92 @@
 #include <sysinfo/stats.h>
 #include <lib/ra.h>
+#include <cap/cap.h>
 
 /* Ensure [u]int*_t types are of correct size.
@@ -277 +278 @@
         timeout_init();
         scheduler_init();
+        caps_init();
         task_init();
         thread_init();