Changeset f2cb80a in mainline for kernel/generic/include/cpu.h

Timestamp:

2024-02-23T17:57:23Z (3 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• kernel/generic/include/cpu.h (modified) (3 diffs)

kernel/generic/include/cpu.h

@@ -44 +44 @@
 #include <arch.h>
 
-#define CPU                  CURRENT->cpu
+#define CPU                  (CURRENT->cpu)
+#define CPU_LOCAL            (&CPU->local)
+
+/**
+ * Contents of CPU_LOCAL. These are variables that are only ever accessed by
+ * the CPU they belong to, so they don't need any synchronization,
+ * just locally disabled interrupts.
+ */
+typedef struct cpu_local {
+        /**
+         * When system clock loses a tick, it is
+         * recorded here so that clock() can react.
+         */
+        size_t missed_clock_ticks;
+
+        uint64_t current_clock_tick;
+        uint64_t preempt_deadline;  /* < when should the currently running thread be preempted */
+        uint64_t relink_deadline;
+
+        /**
+         * Stack used by scheduler when there is no running thread.
+         * This field is unchanged after initialization.
+         */
+        uint8_t *stack;
+
+        /**
+         * Processor cycle accounting.
+         */
+        bool idle;
+        uint64_t last_cycle;
+
+        context_t scheduler_context;
+
+        struct thread *prev_thread;
+} cpu_local_t;
 
 /** CPU structure.
@@ -63 +97 @@
 
         /**
-         * When system clock loses a tick, it is
-         * recorded here so that clock() can react.
-         * This variable is CPU-local and can be
-         * only accessed when interrupts are
-         * disabled.
-         */
-        size_t missed_clock_ticks;
-
-        /** Can only be accessed by the CPU represented by this structure when interrupts are disabled. */
-        uint64_t current_clock_tick;
-        uint64_t preempt_deadline;  /* < when should the currently running thread be preempted */
-        uint64_t relink_deadline;
-
-        /**
          * Processor cycle accounting.
          */
-        bool idle;
-        uint64_t last_cycle;
         atomic_time_stat_t idle_cycles;
         atomic_time_stat_t busy_cycles;
@@ -103 +121 @@
         _Atomic(struct thread *) fpu_owner;
 
-        /**
-         * Stack used by scheduler when there is no running thread.
-         */
-        uint8_t *stack;
+        cpu_local_t local;
 } cpu_t;