Changeset abf6c01 in mainline

Timestamp:

2018-11-09T22:03:24Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

436a0a5

Parents:

ba9a150

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-08 17:00:46)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-09 22:03:24)

Message:

Add FRAME_ATOMIC to some allocations

Location:

kernel

Files:

• generic/src/ipc/ipc.c (modified) (1 diff)
• generic/src/main/kinit.c (modified) (1 diff)
• generic/src/mm/as.c (modified) (1 diff)
• generic/src/mm/slab.c (modified) (2 diffs)
• generic/src/proc/task.c (modified) (1 diff)
• generic/src/proc/thread.c (modified) (3 diffs)
• generic/src/sysinfo/sysinfo.c (modified) (2 diffs)
• test/mm/slab1.c (modified) (4 diffs)

kernel/generic/src/ipc/ipc.c

@@ -213 +213 @@
 errno_t ipc_call_sync(phone_t *phone, call_t *request)
 {
-        answerbox_t *mybox = slab_alloc(answerbox_cache, 0);
+        answerbox_t *mybox = slab_alloc(answerbox_cache, FRAME_ATOMIC);
+        if (!mybox)
+                return ENOMEM;
+
         ipc_answerbox_init(mybox, TASK);
 

kernel/generic/src/main/kinit.c

@@ -120 +120 @@
                 thread = thread_create(kmp, NULL, TASK,
                     THREAD_FLAG_UNCOUNTED, "kmp");
-                if (thread != NULL) {
-                        thread_wire(thread, &cpus[0]);
-                        thread_ready(thread);
-                } else
+                if (!thread)
                         panic("Unable to create kmp thread.");
 
+                thread_wire(thread, &cpus[0]);
+                thread_ready(thread);
                 thread_join(thread);
                 thread_detach(thread);

kernel/generic/src/mm/as.c

@@ -151 +151 @@
 as_t *as_create(unsigned int flags)
 {
-        as_t *as = (as_t *) slab_alloc(as_cache, 0);
+        as_t *as = (as_t *) slab_alloc(as_cache, FRAME_ATOMIC);
+        if (!as)
+                return NULL;
+
         (void) as_create_arch(as, 0);
 

kernel/generic/src/mm/slab.c

@@ -667 +667 @@
     size_t (*destructor)(void *obj), unsigned int flags)
 {
-        slab_cache_t *cache = slab_alloc(&slab_cache_cache, 0);
+        slab_cache_t *cache = slab_alloc(&slab_cache_cache, FRAME_ATOMIC);
+        if (!cache)
+                panic("Not enough memory to allocate slab cache %s.", name);
+
         _slab_cache_create(cache, name, size, align, constructor, destructor,
             flags);
@@ -730 +733 @@
 NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
 {
+        if (!obj)
+                return;
+
         ipl_t ipl = interrupts_disable();
 

kernel/generic/src/proc/task.c

@@ -199 +199 @@
 task_t *task_create(as_t *as, const char *name)
 {
-        task_t *task = (task_t *) slab_alloc(task_cache, 0);
-        if (task == NULL) {
+        task_t *task = (task_t *) slab_alloc(task_cache, FRAME_ATOMIC);
+        if (!task)
                 return NULL;
-        }
 
         task_create_arch(task);

kernel/generic/src/proc/thread.c

@@ -165 +165 @@
 
 #ifdef CONFIG_FPU
-        thread->saved_fpu_context = slab_alloc(fpu_context_cache, kmflags);
+        thread->saved_fpu_context = slab_alloc(fpu_context_cache,
+            FRAME_ATOMIC | kmflags);
         if (!thread->saved_fpu_context)
                 return ENOMEM;
@@ -338 +339 @@
     thread_flags_t flags, const char *name)
 {
-        thread_t *thread = (thread_t *) slab_alloc(thread_cache, 0);
+        thread_t *thread = (thread_t *) slab_alloc(thread_cache, FRAME_ATOMIC);
         if (!thread)
                 return NULL;
@@ -652 +653 @@
 
         return waitq_sleep_timeout(&thread->join_wq, usec, flags, NULL);
+
+        // FIXME: join should deallocate the thread.
+        //        Current code calls detach after join, that's contrary to how
+        //        join is used in other threading APIs.
 }
 

kernel/generic/src/sysinfo/sysinfo.c

@@ -204 +204 @@
 
                 *psubtree =
-                    (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0);
+                    (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, FRAME_ATOMIC);
                 if (!*psubtree)
                         return NULL;
@@ -280 +280 @@
 
                         sysinfo_item_t *item =
-                            (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0);
+                            (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, FRAME_ATOMIC);
                         if (!item)
                                 return NULL;

kernel/test/mm/slab1.c

@@ -50 +50 @@
 
         for (i = 0; i < count; i++) {
-                data[i] = slab_alloc(cache, 0);
-                memsetb(data[i], size, 0);
+                data[i] = slab_alloc(cache, FRAME_ATOMIC);
+                if (data[i])
+                        memsetb(data[i], size, 0);
         }
 
@@ -66 +67 @@
 
         for (i = 0; i < count; i++) {
-                data[i] = slab_alloc(cache, 0);
-                memsetb(data[i], size, 0);
+                data[i] = slab_alloc(cache, FRAME_ATOMIC);
+                if (data[i])
+                        memsetb(data[i], size, 0);
         }
 
@@ -82 +84 @@
 
         for (i = count / 2; i < count; i++) {
-                data[i] = slab_alloc(cache, 0);
-                memsetb(data[i], size, 0);
+                data[i] = slab_alloc(cache, FRAME_ATOMIC);
+                if (data[i])
+                        memsetb(data[i], size, 0);
         }
 
@@ -131 +134 @@
         for (j = 0; j < 10; j++) {
                 for (i = 0; i < THR_MEM_COUNT; i++)
-                        thr_data[offs][i] = slab_alloc(thr_cache, 0);
+                        thr_data[offs][i] = slab_alloc(thr_cache, FRAME_ATOMIC);
                 for (i = 0; i < THR_MEM_COUNT / 2; i++)
                         slab_free(thr_cache, thr_data[offs][i]);
                 for (i = 0; i < THR_MEM_COUNT / 2; i++)
-                        thr_data[offs][i] = slab_alloc(thr_cache, 0);
+                        thr_data[offs][i] = slab_alloc(thr_cache, FRAME_ATOMIC);
                 for (i = 0; i < THR_MEM_COUNT; i++)
                         slab_free(thr_cache, thr_data[offs][i]);