Changeset deacd722 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:

b389f95

Parents:

90efa3b

git-author:

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

git-committer:

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

Message:

Allow thread_create_arch() to fail

Location:

kernel

Files:

• arch/abs32le/src/proc/thread.c (modified) (1 diff)
• arch/amd64/src/proc/thread.c (modified) (2 diffs)
• arch/arm32/include/arch/proc/thread.h (modified) (1 diff)
• arch/ia32/src/proc/thread.c (modified) (1 diff)
• arch/ia64/include/arch/proc/thread.h (modified) (1 diff)
• arch/mips32/include/arch/proc/thread.h (modified) (1 diff)
• arch/ppc32/include/arch/proc/thread.h (modified) (1 diff)
• arch/riscv64/src/proc/thread.c (modified) (1 diff)
• arch/sparc64/src/proc/thread.c (modified) (2 diffs)
• generic/include/proc/thread.h (modified) (1 diff)
• generic/src/proc/thread.c (modified) (2 diffs)

kernel/arch/abs32le/src/proc/thread.c

@@ -35 +35 @@
 #include <proc/thread.h>
 
-void thread_create_arch(thread_t *t)
+errno_t thread_create_arch(thread_t *t, thread_flags_t flags)
 {
+        return EOK;
 }
 

kernel/arch/amd64/src/proc/thread.c

@@ -42 +42 @@
  *
  */
-void thread_create_arch(thread_t *thread)
+errno_t thread_create_arch(thread_t *thread, thread_flags_t flags)
 {
         /*
@@ -49 +49 @@
         thread->arch.kstack_rsp =
             (uintptr_t) &thread->kstack[PAGE_SIZE - sizeof(istate_t)];
+        return EOK;
 }
 

kernel/arch/arm32/include/arch/proc/thread.h

@@ -42 +42 @@
 #define thr_constructor_arch(t)
 #define thr_destructor_arch(t)
-#define thread_create_arch(t)
+#define thread_create_arch(t, flags) (EOK)
 
 #endif

kernel/arch/ia32/src/proc/thread.c

@@ -39 +39 @@
  * @param t Thread to be initialized.
  */
-void thread_create_arch(thread_t *t)
+errno_t thread_create_arch(thread_t *t, thread_flags_t flags)
 {
+        return EOK;
 }
 

kernel/arch/ia64/include/arch/proc/thread.h

@@ -41 +41 @@
 #define thr_constructor_arch(t)
 #define thr_destructor_arch(t)
-#define thread_create_arch(t)
+#define thread_create_arch(t, flags) (EOK)
 
 #endif

kernel/arch/mips32/include/arch/proc/thread.h

@@ -41 +41 @@
 #define thr_constructor_arch(t)
 #define thr_destructor_arch(t)
-#define thread_create_arch(t)
+#define thread_create_arch(t, flags) (EOK)
 
 #endif

kernel/arch/ppc32/include/arch/proc/thread.h

@@ -41 +41 @@
 #define thr_constructor_arch(t)
 #define thr_destructor_arch(t)
-#define thread_create_arch(t)
+#define thread_create_arch(t, flags) (EOK)
 
 #endif

kernel/arch/riscv64/src/proc/thread.c

@@ -35 +35 @@
 #include <proc/thread.h>
 
-void thread_create_arch(thread_t *t)
+errno_t thread_create_arch(thread_t *t, thread_flags_t flags)
 {
+        return EOK;
 }
 

kernel/arch/sparc64/src/proc/thread.c

@@ -62 +62 @@
 }
 
-void thread_create_arch(thread_t *t)
+errno_t thread_create_arch(thread_t *t, thread_flags_t flags)
 {
-        if ((t->uspace) && (!t->arch.uspace_window_buffer)) {
+        if ((flags & THREAD_FLAG_USPACE) && (!t->arch.uspace_window_buffer)) {
                 /*
                  * The thread needs userspace window buffer and the object
                  * returned from the slab allocator doesn't have any.
                  */
-                t->arch.uspace_window_buffer = slab_alloc(uwb_cache, 0);
+                t->arch.uspace_window_buffer = slab_alloc(uwb_cache, FRAME_ATOMIC);
+                if (!t->arch.uspace_window_buffer)
+                        return ENOMEM;
         } else {
                 uintptr_t uw_buf = (uintptr_t) t->arch.uspace_window_buffer;
@@ -80 +82 @@
                     UWB_ALIGNMENT);
         }
+        return EOK;
 }
 

kernel/generic/include/proc/thread.h

@@ -225 +225 @@
 
 #ifndef thread_create_arch
-extern void thread_create_arch(thread_t *);
+extern errno_t thread_create_arch(thread_t *, thread_flags_t);
 #endif
 

kernel/generic/src/proc/thread.c

@@ -346 +346 @@
                 return NULL;
 
+        if (thread_create_arch(thread, flags) != EOK) {
+                slab_free(thread_cache, thread);
+                return NULL;
+        }
+
         /* Not needed, but good for debugging */
         memsetb(thread->kstack, STACK_SIZE, 0);
@@ -407 +412 @@
         udebug_thread_initialize(&thread->udebug);
 #endif
-
-        /* Might depend on previous initialization */
-        thread_create_arch(thread);
 
         if ((flags & THREAD_FLAG_NOATTACH) != THREAD_FLAG_NOATTACH)