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

abf6c01

Parents:

4f3aa76

git-author:

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

git-committer:

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

Message:

Always allocate FPU context ahead of time, even when switching is lazy

Location:

kernel/generic/src/proc

Files:

• scheduler.c (modified) (2 diffs)
• thread.c (modified) (3 diffs)

kernel/generic/src/proc/scheduler.c

@@ -134 +134 @@
 void scheduler_fpu_lazy_request(void)
 {
-restart:
         fpu_enable();
         irq_spinlock_lock(&CPU->lock, false);
@@ -153 +152 @@
                 fpu_context_restore(THREAD->saved_fpu_context);
         } else {
-                /* Allocate FPU context */
-                if (!THREAD->saved_fpu_context) {
-                        /* Might sleep */
-                        irq_spinlock_unlock(&THREAD->lock, false);
-                        irq_spinlock_unlock(&CPU->lock, false);
-                        THREAD->saved_fpu_context =
-                            (fpu_context_t *) slab_alloc(fpu_context_cache, 0);
-
-                        /* We may have switched CPUs during slab_alloc */
-                        goto restart;
-                }
                 fpu_init();
                 THREAD->fpu_context_exists = true;

kernel/generic/src/proc/thread.c

@@ -165 +165 @@
 
 #ifdef CONFIG_FPU
-#ifdef CONFIG_FPU_LAZY
-        thread->saved_fpu_context = NULL;
-#else /* CONFIG_FPU_LAZY */
         thread->saved_fpu_context = slab_alloc(fpu_context_cache, kmflags);
         if (!thread->saved_fpu_context)
                 return ENOMEM;
-#endif /* CONFIG_FPU_LAZY */
 #endif /* CONFIG_FPU */
 
@@ -200 +196 @@
         if (!stack_phys) {
 #ifdef CONFIG_FPU
-                if (thread->saved_fpu_context)
-                        slab_free(fpu_context_cache, thread->saved_fpu_context);
+                assert(thread->saved_fpu_context);
+                slab_free(fpu_context_cache, thread->saved_fpu_context);
 #endif
                 return ENOMEM;
@@ -226 +222 @@
 
 #ifdef CONFIG_FPU
-        if (thread->saved_fpu_context)
-                slab_free(fpu_context_cache, thread->saved_fpu_context);
+        assert(thread->saved_fpu_context);
+        slab_free(fpu_context_cache, thread->saved_fpu_context);
 #endif