Changeset 169815e in mainline for kernel/generic/src/proc

Timestamp:

2023-04-16T12:22:00Z (3 years ago)

Author:

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

Branches:

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

Children:

fbaf6ac

Parents:

b2ec5cf

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-04-16 12:14:09)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-04-16 12:22:00)

Message:

Split cpu_t::lock into fpu_lock and tlb_lock

For all other purposes, locking is unnecessary, since the fields
in question are only accessed locally from the CPU they belong to.

Location:

kernel/generic/src/proc

Files:

• scheduler.c (modified) (7 diffs)
• thread.c (modified) (1 diff)

kernel/generic/src/proc/scheduler.c

@@ -129 +129 @@
 {
         fpu_enable();
-        irq_spinlock_lock(&CPU->lock, false);
+        irq_spinlock_lock(&CPU->fpu_lock, false);
 
         /* Save old context */
@@ -154 +154 @@
         irq_spinlock_unlock(&THREAD->lock, false);
 
-        irq_spinlock_unlock(&CPU->lock, false);
+        irq_spinlock_unlock(&CPU->fpu_lock, false);
 }
 #endif /* CONFIG_FPU_LAZY */
@@ -187 +187 @@
                  * This improves energy saving and hyperthreading.
                  */
-                irq_spinlock_lock(&CPU->lock, false);
                 CPU->idle = true;
-                irq_spinlock_unlock(&CPU->lock, false);
 
                 /*
@@ -298 +296 @@
         size_t n = 0;
 
-        irq_spinlock_lock(&CPU->lock, false);
-
         /* Move every list (except the one with highest priority) one level up. */
         for (int i = RQ_COUNT - 1; i > start; i--) {
@@ -322 +318 @@
                 irq_spinlock_unlock(&CPU->rq[start].lock, false);
         }
-
-        irq_spinlock_unlock(&CPU->lock, false);
 }
 
@@ -684 +678 @@
                         continue;
 
-                irq_spinlock_lock(&cpus[cpu].lock, true);
-
                 /* Technically a data race, but we don't really care in this case. */
                 int needs_relink = cpus[cpu].relink_deadline - cpus[cpu].current_clock_tick;
@@ -711 +703 @@
                         irq_spinlock_unlock(&(cpus[cpu].rq[i].lock), false);
                 }
-
-                irq_spinlock_unlock(&cpus[cpu].lock, true);
         }
 }

kernel/generic/src/proc/thread.c

@@ -425 +425 @@
 
         assert((thread->state == Exiting) || (thread->state == Lingering));
-        assert(thread->cpu);
 
         /* Clear cpu->fpu_owner if set to this thread. */
-        irq_spinlock_lock(&thread->cpu->lock, false);
-        if (thread->cpu->fpu_owner == thread)
-                thread->cpu->fpu_owner = NULL;
-        irq_spinlock_unlock(&thread->cpu->lock, false);
+#ifdef CONFIG_FPU_LAZY
+        if (thread->cpu) {
+                irq_spinlock_lock(&thread->cpu->fpu_lock, false);
+                if (thread->cpu->fpu_owner == thread)
+                        thread->cpu->fpu_owner = NULL;
+                irq_spinlock_unlock(&thread->cpu->fpu_lock, false);
+        }
+#endif
 
         interrupts_restore(ipl);