Changeset 11909ce3 in mainline

Timestamp:

2024-01-21T15:48:43Z (11 months ago)

Author:

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

Branches:

master

Children:

515f1b1

Parents:

33e15a0

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-03-29 10:25:36)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2024-01-21 15:48:43)

Message:

Make thread cycle statistics atomic

Location:

kernel/generic

Files:

• include/proc/thread.h (modified) (1 diff)
• src/interrupt/interrupt.c (modified) (2 diffs)
• src/proc/scheduler.c (modified) (1 diff)
• src/proc/task.c (modified) (2 diffs)
• src/proc/thread.c (modified) (4 diffs)
• src/syscall/syscall.c (modified) (2 diffs)
• src/sysinfo/stats.c (modified) (2 diffs)

kernel/generic/include/proc/thread.h

@@ -147 +147 @@
 
         /** Thread accounting. */
-        uint64_t ucycles;
-        uint64_t kcycles;
+        atomic_time_stat_t ucycles;
+        atomic_time_stat_t kcycles;
         /** Last sampled cycle. */
         uint64_t last_cycle;

kernel/generic/src/interrupt/interrupt.c

@@ -114 +114 @@
 
         /* Account user cycles */
-        if (THREAD) {
-                irq_spinlock_lock(&THREAD->lock, false);
+        if (THREAD)
                 thread_update_accounting(true);
-                irq_spinlock_unlock(&THREAD->lock, false);
-        }
 
         /* Account CPU usage if it woke up from sleep */
@@ -155 +152 @@
 
         /* Do not charge THREAD for exception cycles */
-        if (THREAD) {
-                irq_spinlock_lock(&THREAD->lock, false);
+        if (THREAD)
                 THREAD->last_cycle = end_cycle;
-                irq_spinlock_unlock(&THREAD->lock, false);
-        }
 #else
         panic("No space for any exception handler, yet we want to handle some exception.");

kernel/generic/src/proc/scheduler.c

@@ -507 +507 @@
 
         /* Update thread kernel accounting */
-        THREAD->kcycles += get_cycle() - THREAD->last_cycle;
+        atomic_time_increment(&THREAD->kcycles, get_cycle() - THREAD->last_cycle);
 
         /*

kernel/generic/src/proc/task.c

@@ -506 +506 @@
         /* Current values of threads */
         list_foreach(task->threads, th_link, thread_t, thread) {
-                irq_spinlock_lock(&thread->lock, false);
-
                 /* Process only counted threads */
                 if (!thread->uncounted) {
@@ -515 +513 @@
                         }
 
-                        uret += thread->ucycles;
-                        kret += thread->kcycles;
+                        uret += atomic_time_read(&thread->ucycles);
+                        kret += atomic_time_read(&thread->kcycles);
                 }
-
-                irq_spinlock_unlock(&thread->lock, false);
         }
 

kernel/generic/src/proc/thread.c

@@ -258 +258 @@
         thread->thread_code = func;
         thread->thread_arg = arg;
-        thread->ucycles = 0;
-        thread->kcycles = 0;
+        thread->ucycles = ATOMIC_TIME_INITIALIZER();
+        thread->kcycles = ATOMIC_TIME_INITIALIZER();
         thread->uncounted =
             ((flags & THREAD_FLAG_UNCOUNTED) == THREAD_FLAG_UNCOUNTED);
@@ -333 +333 @@
 
         if (!thread->uncounted) {
-                thread->task->ucycles += thread->ucycles;
-                thread->task->kcycles += thread->kcycles;
+                thread->task->ucycles += atomic_time_read(&thread->ucycles);
+                thread->task->kcycles += atomic_time_read(&thread->kcycles);
         }
 
@@ -682 +682 @@
         uint64_t ucycles, kcycles;
         char usuffix, ksuffix;
-        order_suffix(thread->ucycles, &ucycles, &usuffix);
-        order_suffix(thread->kcycles, &kcycles, &ksuffix);
+        order_suffix(atomic_time_read(&thread->ucycles), &ucycles, &usuffix);
+        order_suffix(atomic_time_read(&thread->kcycles), &kcycles, &ksuffix);
 
         state_t state = atomic_get_unordered(&thread->state);
@@ -788 +788 @@
 void thread_update_accounting(bool user)
 {
+        assert(interrupts_disabled());
+
         uint64_t time = get_cycle();
 
-        assert(interrupts_disabled());
-        assert(irq_spinlock_locked(&THREAD->lock));
-
         if (user)
-                THREAD->ucycles += time - THREAD->last_cycle;
+                atomic_time_increment(&THREAD->ucycles, time - THREAD->last_cycle);
         else
-                THREAD->kcycles += time - THREAD->last_cycle;
+                atomic_time_increment(&THREAD->kcycles, time - THREAD->last_cycle);
 
         THREAD->last_cycle = time;

kernel/generic/src/syscall/syscall.c

@@ -141 +141 @@
 {
         /* Do userpace accounting */
-        irq_spinlock_lock(&THREAD->lock, true);
+        ipl_t ipl = interrupts_disable();
         thread_update_accounting(true);
-        irq_spinlock_unlock(&THREAD->lock, true);
+        interrupts_restore(ipl);
 
 #ifdef CONFIG_UDEBUG
@@ -191 +191 @@
 
         /* Do kernel accounting */
-        irq_spinlock_lock(&THREAD->lock, true);
+        ipl = interrupts_disable();
         thread_update_accounting(false);
-        irq_spinlock_unlock(&THREAD->lock, true);
+        interrupts_restore(ipl);
 
         return rc;

kernel/generic/src/sysinfo/stats.c

@@ -299 +299 @@
 {
         assert(interrupts_disabled());
-        assert(irq_spinlock_locked(&thread->lock));
 
         stats_thread->thread_id = thread->tid;
@@ -305 +304 @@
         stats_thread->state = atomic_get_unordered(&thread->state);
         stats_thread->priority = atomic_get_unordered(&thread->priority);
-        stats_thread->ucycles = thread->ucycles;
-        stats_thread->kcycles = thread->kcycles;
+        stats_thread->ucycles = atomic_time_read(&thread->ucycles);
+        stats_thread->kcycles = atomic_time_read(&thread->kcycles);
 
         cpu_t *cpu = atomic_get_unordered(&thread->cpu);