marv7000/zinnia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

turnstile fixes

Browse Source
This commit is contained in:
Marvin
2026-10-22 01:34:45 +02:00
parent dbb543de66
commit b83f1fe6d9
10 changed files with 419 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/sched_dumb.c
+17 -12
View File
@@ -112,6 +112,11 @@ static uint8_t effective_prio(struct task* task) {
return MAX(prio, task->lent_prio);
}
static void refresh_prio(struct task* task) {
if (task->blocked_ts == nullptr)
atomic_store(&task->priority, effective_prio(task), ATOMIC_RELAXED);
}
static size_t quantum(struct task* task) {
return SCHED_TIME_SLICE_NS * (task->penalty + 1);
}
@@ -120,7 +125,7 @@ static void feedback_reset(struct scheduler* sched, struct task* task) {
task->penalty = 0;
task->time_slice = quantum(task);
task->feedback_epoch = sched->boost_epoch;
atomic_store(&task->priority, effective_prio(task), ATOMIC_RELAXED);
refresh_prio(task);
}
static void boost(struct scheduler* sched) {
@@ -153,7 +158,7 @@ static void account(struct scheduler* sched, struct task* task, uint64_t now) {
task->penalty++;
task->time_slice = quantum(task);
task->feedback_epoch = sched->boost_epoch;
atomic_store(&task->priority, effective_prio(task), ATOMIC_RELAXED);
refresh_prio(task);
sched->need_resched = true;
}
@@ -164,6 +169,7 @@ static void enqueue(struct scheduler* sched, struct task* task) {
task->last_rq = sched;
if (task->feedback_epoch < sched->boost_epoch)
feedback_reset(sched, task);
refresh_prio(task);
rq_insert(sched, task);
bool preempt = atomic_load(&task->priority, ATOMIC_RELAXED) > atomic_load(&sched->current_priority, ATOMIC_RELAXED);
spin_unlock(&sched->lock);
@@ -273,9 +279,9 @@ void sched_block(struct scheduler* sched) {
irq_lock();
struct task* current = sched->current;
spin_lock(&current->lock);
task_lock(current);
if (atomic_exchange(&current->wake_pending, false, ATOMIC_ACQ_REL)) {
spin_unlock(&current->lock);
task_unlock(current);
irq_unlock();
return;
}
@@ -286,7 +292,7 @@ void sched_block(struct scheduler* sched) {
spin_unlock(&sched->lock);
current->state = TASK_STATE_BLOCKED;
spin_unlock(&current->lock);
task_unlock(current);
do_reschedule(sched, now);
}
@@ -315,9 +321,9 @@ void sched_wake_locked(struct task* task) {
}
void sched_wake(struct task* task) {
spin_lock(&task->lock);
task_lock(task);
sched_wake_locked(task);
spin_unlock(&task->lock);
task_unlock(task);
}
bool sched_update_priority_locked(struct task* task) {
@@ -357,13 +363,12 @@ bool sched_update_priority_locked(struct task* task) {
void sched_set_priority(struct task* task, uint8_t priority) {
assert(priority <= SCHED_PRIO_MAX, "Priority %u is out of range", priority);
spin_lock(&task->lock);
task_lock(task);
task->base_prio = priority;
bool changed = sched_update_priority_locked(task);
spin_unlock(&task->lock);
if (changed)
if (sched_update_priority_locked(task))
turnstile_reprioritize(task);
else
task_unlock(task);
}
void task_entry(task_fn_t entry, uintptr_t arg0, struct task* prev) {