portugalfuturista/seL4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mcs: SchedControlConfigure: charge correct core

Browse source 
Previously this code would incorrectly call chargeBudget twice, where it
was intended to be charging a specific core.
This commit is contained in:
Anna Lyons 2018-06-08 09:16:26 +10:00 committed by Kent Mcleod
parent 4f00022f7d
commit 483f0ae22f
4 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/kernel/thread.h
View file

@ -191,7 +191,7 @@ static inline void updateRestartPC(tcb_t *tcb)
void endTimeslice(bool_t can_timeout_fault);
/* called when a thread has used up its head refill */
void chargeBudget(ticks_t capacity, ticks_t consumed, bool_t canTimeoutFault);
void chargeBudget(ticks_t capacity, ticks_t consumed, bool_t canTimeoutFault, word_t core, bool_t isCurCPU);
/* Update the kernels timestamp and stores in ksCurTime.
* The difference between the previous kernel timestamp and the one just read
@ -236,7 +236,7 @@ static inline bool_t checkBudget(void)
return true;
}
chargeBudget(capacity, NODE_STATE(ksConsumed), true);
chargeBudget(capacity, NODE_STATE(ksConsumed), true, CURRENT_CPU_INDEX(), true);
return false;
}

2
src/api/syscall.c
View file

@ -533,7 +533,7 @@ static void handleYield(void)
{
#ifdef CONFIG_KERNEL_MCS
/* Yield the current remaining budget */
chargeBudget(0, REFILL_HEAD(NODE_STATE(ksCurSC)).rAmount, false);
chargeBudget(0, REFILL_HEAD(NODE_STATE(ksCurSC)).rAmount, false, CURRENT_CPU_INDEX(), true);
#else
tcbSchedDequeue(NODE_STATE(ksCurThread));
SCHED_APPEND_CURRENT_TCB;

20
src/kernel/thread.c
View file

@ -611,21 +611,21 @@ void setNextInterrupt(void)
setDeadline(next_interrupt - getTimerPrecision());
}
void chargeBudget(ticks_t capacity, ticks_t consumed, bool_t canTimeoutFault)
void chargeBudget(ticks_t capacity, ticks_t consumed, bool_t canTimeoutFault, word_t core, bool_t isCurCPU)
{
if (isRoundRobin(NODE_STATE(ksCurSC))) {
assert(refill_size(NODE_STATE(ksCurSC)) == MIN_REFILLS);
REFILL_HEAD(NODE_STATE(ksCurSC)).rAmount += REFILL_TAIL(NODE_STATE(ksCurSC)).rAmount;
REFILL_TAIL(NODE_STATE(ksCurSC)).rAmount = 0;
if (isRoundRobin(NODE_STATE_ON_CORE(ksCurSC, core))) {
assert(refill_size(NODE_STATE_ON_CORE(ksCurSC, core)) == MIN_REFILLS);
REFILL_HEAD(NODE_STATE_ON_CORE(ksCurSC, core)).rAmount += REFILL_TAIL(NODE_STATE_ON_CORE(ksCurSC, core)).rAmount;
REFILL_TAIL(NODE_STATE_ON_CORE(ksCurSC, core)).rAmount = 0;
} else {
refill_budget_check(NODE_STATE(ksCurSC), consumed, capacity);
refill_budget_check(NODE_STATE_ON_CORE(ksCurSC, core), consumed, capacity);
}
assert(REFILL_HEAD(NODE_STATE(ksCurSC)).rAmount >= MIN_BUDGET);
NODE_STATE(ksCurSC)->scConsumed += consumed;
NODE_STATE(ksConsumed) = 0;
if (likely(isRunnable(NODE_STATE(ksCurThread)))) {
assert(REFILL_HEAD(NODE_STATE_ON_CORE(ksCurSC, core)).rAmount >= MIN_BUDGET);
NODE_STATE_ON_CORE(ksCurSC, core)->scConsumed += consumed;
NODE_STATE_ON_CORE(ksConsumed, core) = 0;
if (isCurCPU && likely(isRunnable(NODE_STATE_ON_CORE(ksCurThread, core)))) {
endTimeslice(canTimeoutFault);
rescheduleRequired();
NODE_STATE(ksReprogram) = true;

17
src/object/schedcontrol.c
View file

@ -31,12 +31,21 @@ static exception_t invokeSchedControl_Configure(sched_context_t *target, word_t
tcbSchedDequeue(target->scTcb);
/* bill the current consumed amount before adjusting the params */
if (NODE_STATE_ON_CORE(ksCurSC, target->scCore) == target) {
ticks_t capacity = refill_capacity(target, NODE_STATE_ON_CORE(ksConsumed, target->scCore));
if (checkBudget()) {
commitTime();
#ifdef ENABLE_SMP_SUPPORT
if (target->scCore == getCurrentCPUIndex()) {
#endif /* ENABLE_SMP_SUPPORT */
if (checkBudget()) {
commitTime();
}
#ifdef ENABLE_SMP_SUPPORT
} else {
chargeBudget(capacity, NODE_STATE_ON_CORE(ksConsumed, target->scCore), false);
/* if its a remote core, manually charge the budget */
ticks_t capacity = refill_capacity(target, NODE_STATE_ON_CORE(ksConsumed, target->scCore));
chargeBudget(capacity, NODE_STATE_ON_CORE(ksConsumed, target->scCore), false, target->scCore, false);
doReschedule(target->scCore);
}
#endif /* ENABLE_SMP_SUPPORT */
}
}