Changeset dc5c303 in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (6 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -58 +58 @@
 #include <trace.h>
 
+/*
+ * If IVT_ITEMS is zero (e.g. for special/abs32le) we hide completely any
+ * access to the exception table array and panic if the function is called
+ * at all. It also silences (correct) compiler warnings about possible
+ * out-of-bound array access.
+ */
+
 exc_table_t exc_table[IVT_ITEMS];
 IRQ_SPINLOCK_INITIALIZE(exctbl_lock);
@@ -77 +84 @@
 #if (IVT_ITEMS > 0)
         assert(n < IVT_ITEMS);
-#endif
 
         irq_spinlock_lock(&exctbl_lock, true);
@@ -91 +97 @@
 
         return old;
+#else
+        panic("No space for any exception handler, cannot register.");
+#endif
 }
 
@@ -103 +112 @@
 #if (IVT_ITEMS > 0)
         assert(n < IVT_ITEMS);
-#endif
 
         /* Account user cycles */
@@ -114 +122 @@
         /* Account CPU usage if it woke up from sleep */
         if (CPU && CPU->idle) {
-                irq_spinlock_lock(&CPU->lock, false);
                 uint64_t now = get_cycle();
-                CPU->idle_cycles += now - CPU->last_cycle;
+                atomic_time_increment(&CPU->idle_cycles, now - CPU->last_cycle);
                 CPU->last_cycle = now;
                 CPU->idle = false;
-                irq_spinlock_unlock(&CPU->lock, false);
         }
 
@@ -154 +160 @@
                 irq_spinlock_unlock(&THREAD->lock, false);
         }
+#else
+        panic("No space for any exception handler, yet we want to handle some exception.");
+#endif
 }