summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/driver_subr.c6
-rw-r--r--sys/kern/init_main.c8
-rw-r--r--sys/kern/kern_krq.c61
-rw-r--r--sys/kern/kern_panic.c32
-rw-r--r--sys/kern/kern_syscall.c2
-rw-r--r--sys/kern/kern_syslog.c1
6 files changed, 99 insertions, 11 deletions
diff --git a/sys/kern/driver_subr.c b/sys/kern/driver_subr.c
index 29eac71..b53463a 100644
--- a/sys/kern/driver_subr.c
+++ b/sys/kern/driver_subr.c
@@ -55,8 +55,10 @@ __driver_init_td(void)
for (dp = (void *)start; (uintptr_t)dp < end; ++dp) {
var = dp->data;
- dp->init();
- var->deferred = 0;
+ if (var->deferred) {
+ dp->init();
+ var->deferred = 0;
+ }
}
exit1(td, 0);
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 797319f..6b3e09b 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -44,10 +44,11 @@
#include <vm/vm.h>
#include <string.h>
+#define _START_PATH "/usr/sbin/init"
#if defined(_INSTALL_MEDIA)
-#define _START_PATH "/usr/sbin/install"
+#define _START_ARG "/usr/sbin/install"
#else
-#define _START_PATH "/usr/sbin/init"
+#define _START_ARG NULL
#endif /* _INSTALL_MEDIA */
struct proc g_proc0;
@@ -64,7 +65,7 @@ start_init(void)
{
struct proc *td = this_td();
struct execve_args execve_args;
- char *argv[] = { _START_PATH, NULL, NULL };
+ char *argv[] = { _START_PATH, _START_ARG, NULL };
char *envp[] = { NULL };
kprintf("starting init...\n");
@@ -127,7 +128,6 @@ main(void)
* and here we go!
*/
mp_bootstrap_aps(&g_bsp_ci);
- DRIVERS_SCHED();
sched_enter();
__builtin_unreachable();
}
diff --git a/sys/kern/kern_krq.c b/sys/kern/kern_krq.c
new file mode 100644
index 0000000..c12a98c
--- /dev/null
+++ b/sys/kern/kern_krq.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Hyra nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/syscall.h>
+#include <sys/krq.h>
+#include <sys/errno.h>
+#include <sys/spinlock.h>
+#include <sys/driver.h>
+#include <sys/syslog.h>
+
+static struct spinlock krq_lock = {0};
+
+/*
+ * Load a kernel runtime quantum (KRQ)
+ *
+ * @arg0: path
+ *
+ * XXX: If the 'path' argument is NULL, all deferrable
+ * drivers are loaded.
+ *
+ * TODO: Handle non-null paths where a completly seperate
+ * module/krq can be loaded.
+ */
+scret_t
+sys_inject(struct syscall_args *scargs)
+{
+ if (scargs->arg0 != 0) {
+ return -EINVAL;
+ }
+
+ spinlock_acquire(&krq_lock);
+ DRIVERS_SCHED();
+ spinlock_release(&krq_lock);
+ return 0;
+}
diff --git a/sys/kern/kern_panic.c b/sys/kern/kern_panic.c
index 703dba9..099f620 100644
--- a/sys/kern/kern_panic.c
+++ b/sys/kern/kern_panic.c
@@ -31,6 +31,7 @@
#include <sys/spinlock.h>
#include <sys/syslog.h>
#include <sys/reboot.h>
+#include <dev/cons/cons.h>
#include <machine/cdefs.h>
#include <machine/cpu.h>
@@ -53,10 +54,35 @@ bas(bool do_trace, int reboot_type)
md_backtrace();
}
+ kprintf(OMIT_TIMESTAMP "\n-- ALL CORES HAVE BEEN HALTED --\n");
cpu_reboot(reboot_type);
__builtin_unreachable();
}
+static void
+panic_screen(void)
+{
+ struct cons_screen *scr = &g_root_scr;
+
+ if (scr->fb_mem != NULL) {
+ scr->bg = 0x8B0000;
+ scr->fg = 0xAABBAA;
+ cons_reset_cursor(scr);
+ cons_clear_scr(scr, 0x393B39);
+ }
+}
+
+static void
+do_panic(const char *fmt, va_list *ap)
+{
+ syslog_silence(false);
+ kprintf(OMIT_TIMESTAMP "panic: ");
+ vkprintf(fmt, ap);
+ bas(true, REBOOT_HALT);
+
+ __builtin_unreachable();
+}
+
/*
* Tells the user something terribly wrong happened then
* halting the system as soon as possible.
@@ -75,11 +101,9 @@ panic(const char *fmt, ...)
md_intoff();
cpu_halt_others();
+ panic_screen();
va_start(ap, fmt);
- kprintf(OMIT_TIMESTAMP "\npanic: ");
- vkprintf(fmt, &ap);
- bas(true, REBOOT_HALT);
-
+ do_panic(fmt, &ap);
__builtin_unreachable();
}
diff --git a/sys/kern/kern_syscall.c b/sys/kern/kern_syscall.c
index b1deb7a..292fa56 100644
--- a/sys/kern/kern_syscall.c
+++ b/sys/kern/kern_syscall.c
@@ -35,6 +35,7 @@
#include <sys/mman.h>
#include <sys/proc.h>
#include <sys/vfs.h>
+#include <sys/krq.h>
scret_t(*g_sctab[])(struct syscall_args *) = {
NULL, /* SYS_none */
@@ -52,6 +53,7 @@ scret_t(*g_sctab[])(struct syscall_args *) = {
sys_access, /* SYS_access */
sys_lseek, /* SYS_lseek */
sys_sleep, /* SYS_sleep */
+ sys_inject, /* SYS_inject */
};
const size_t MAX_SYSCALLS = NELEM(g_sctab);
diff --git a/sys/kern/kern_syslog.c b/sys/kern/kern_syslog.c
index a0ef04e..c7f51f7 100644
--- a/sys/kern/kern_syslog.c
+++ b/sys/kern/kern_syslog.c
@@ -57,7 +57,6 @@
__static_assert(KBUF_SIZE <= (1 << 16), "KBUF_SIZE too high!");
/* Global logger lock */
-static struct spinlock lock = {0};
static struct spinlock kmsg_lock = {0};
static bool no_cons_log = false;
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-30 06:41:14 +0000