From 451631e73f59f0383425bcf19479814771e68879 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Tue, 15 Apr 2025 23:13:10 -0400 Subject: kernel: sched: Run oneshots forever Signed-off-by: Ian Moffett --- sys/kern/kern_sched.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/kern/kern_sched.c') diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c index 16daae2..ca5bfbe 100644 --- a/sys/kern/kern_sched.c +++ b/sys/kern/kern_sched.c @@ -237,8 +237,10 @@ sched_switch(struct trapframe *tf) void sched_enter(void) { - sched_oneshot(false); - for (;;); + for (;;) { + sched_oneshot(false); + md_pause(); + } } void -- cgit v1.2.3 From be63b6e102a617a048160c42c84ef46fa38e6aad Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Thu, 17 Apr 2025 00:45:10 -0400 Subject: kernel: sched: Returns as soon as result Signed-off-by: Ian Moffett --- sys/kern/kern_sched.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/kern/kern_sched.c') diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c index ca5bfbe..c1eb3d8 100644 --- a/sys/kern/kern_sched.c +++ b/sys/kern/kern_sched.c @@ -105,12 +105,14 @@ sched_dequeue_td(void) if (!TAILQ_EMPTY(&queue->q)) { td = TAILQ_FIRST(&queue->q); TAILQ_REMOVE(&queue->q, td, link); - break; + spinlock_release(&tdq_lock); + return td; } } + /* We got nothing */ spinlock_release(&tdq_lock); - return td; + return NULL; } /* -- cgit v1.2.3 From 5f13039023890e9c634912704464601f199c672d Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Thu, 17 Apr 2025 02:53:00 -0400 Subject: kernel: Enable interrupts upon sched entry Signed-off-by: Ian Moffett --- sys/arch/amd64/amd64/machdep.c | 11 ++++++++++- sys/include/arch/amd64/cdefs.h | 1 + sys/include/arch/amd64/sync.h | 35 +++++++++++++++++++++++++++++++++++ sys/kern/kern_sched.c | 14 ++++++++++++++ 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 sys/include/arch/amd64/sync.h (limited to 'sys/kern/kern_sched.c') diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index a5fb4bf..d54ea22 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -207,6 +207,16 @@ this_cpu(void) return ci; } +/* + * Sync all system operation + */ +int +md_sync_all(void) +{ + lapic_eoi(); + return 0; +} + void cpu_startup(struct cpu_info *ci) { @@ -220,6 +230,5 @@ cpu_startup(struct cpu_info *ci) init_tss(ci); try_mitigate_spectre(); - __ASMV("sti"); /* Unmask interrupts */ lapic_init(); } diff --git a/sys/include/arch/amd64/cdefs.h b/sys/include/arch/amd64/cdefs.h index 98d3f0b..29a8841 100644 --- a/sys/include/arch/amd64/cdefs.h +++ b/sys/include/arch/amd64/cdefs.h @@ -31,6 +31,7 @@ #define _AMD64_CDEFS_H_ #include +#include #define md_pause() __ASMV("rep; nop") diff --git a/sys/include/arch/amd64/sync.h b/sys/include/arch/amd64/sync.h new file mode 100644 index 0000000..f331f43 --- /dev/null +++ b/sys/include/arch/amd64/sync.h @@ -0,0 +1,35 @@ +/* + * 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. + */ + +#ifndef _MACHINE_SYNC_H_ +#define _MACHINE_SYNC_H_ + +int md_sync_all(void); + +#endif /* !_MACHINE_SYNC_H_ */ diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c index c1eb3d8..386406e 100644 --- a/sys/kern/kern_sched.c +++ b/sys/kern/kern_sched.c @@ -33,8 +33,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -239,6 +241,18 @@ sched_switch(struct trapframe *tf) void sched_enter(void) { + static int nenter = 0; + + /* + * Enable interrupts for all processors and + * sync on first entry. + */ + md_inton(); + if (nenter == 0) { + md_sync_all(); + atomic_inc_int(&nenter); + } + for (;;) { sched_oneshot(false); md_pause(); -- cgit v1.2.3 From 27d771013d7fc923b8079b6a0246ba3bc4e83d58 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Thu, 17 Apr 2025 03:01:30 -0400 Subject: kernel: sched: Default to MLFQ Signed-off-by: Ian Moffett --- sys/kern/kern_sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/kern/kern_sched.c') diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c index 386406e..35a1af7 100644 --- a/sys/kern/kern_sched.c +++ b/sys/kern/kern_sched.c @@ -46,7 +46,7 @@ void sched_switch(struct trapframe *tf); -static sched_policy_t policy = SCHED_POLICY_RR; +static sched_policy_t policy = SCHED_POLICY_MLFQ; /* * Thread ready queues - all threads ready to be -- cgit v1.2.3 From e4648e44a871e4d570acb7e149797759ff4be7fc Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Fri, 18 Apr 2025 21:40:30 -0400 Subject: kernel: sched: Always sync on sched entry Signed-off-by: Ian Moffett --- sys/kern/kern_sched.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'sys/kern/kern_sched.c') diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c index 35a1af7..4bbe5a0 100644 --- a/sys/kern/kern_sched.c +++ b/sys/kern/kern_sched.c @@ -241,18 +241,8 @@ sched_switch(struct trapframe *tf) void sched_enter(void) { - static int nenter = 0; - - /* - * Enable interrupts for all processors and - * sync on first entry. - */ md_inton(); - if (nenter == 0) { - md_sync_all(); - atomic_inc_int(&nenter); - } - + md_sync_all(); for (;;) { sched_oneshot(false); md_pause(); -- cgit v1.2.3