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

fastpath: apply MCS queue changes to signal FP

Browse source 
Apply the changes from commit 771c9e43ce to the signal fast path,
which was missed there.

Signed-off-by: Gerwin Klein <gerwin.klein@proofcraft.systems>
This commit is contained in:
Gerwin Klein 2026-05-22 15:38:15 +10:00 committed by Indan Zupancic
parent 2f1b0708b3
commit 7c11116b65
2 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/fastpath/fastpath.h
View file

@ -35,16 +35,9 @@ static inline void maybeDonateSchedContext_fp(tcb_t *dest, sched_context_t *sc)
static inline void cancelIPC_fp(tcb_t *dest)
{
endpoint_t *ep_ptr;
tcb_queue_t queue;
ep_ptr = EP_PTR(thread_state_get_blockingObject(dest->tcbState));
queue = ep_ptr_get_queue(ep_ptr);
queue = tcbEPDequeue(dest, queue);
ep_ptr_set_queue(ep_ptr, queue);
if (!queue.head) {
endpoint_ptr_set_state(ep_ptr, EPState_Idle);
}
tcbEPDequeue(dest, ep_ptr);
/* we are in BlockedOnReceive, because fastpath_signal explicitly checks for it */
assert(thread_state_get_tsType(dest->tcbState) == ThreadState_BlockedOnReceive);
@ -53,23 +46,6 @@ static inline void cancelIPC_fp(tcb_t *dest)
reply_unlink(reply, dest);
}
}
/* Dequeue TCB from notification queue */
static inline void ntfn_queue_dequeue_fp(tcb_t *dest, notification_t *ntfn_ptr)
{
tcb_queue_t ntfn_queue;
ntfn_queue.head = (tcb_t *)notification_ptr_get_ntfnQueue_head(ntfn_ptr);
ntfn_queue.end = (tcb_t *)notification_ptr_get_ntfnQueue_tail(ntfn_ptr);
ntfn_queue = tcbEPDequeue(dest, ntfn_queue);
notification_ptr_set_ntfnQueue_head(ntfn_ptr, (word_t)ntfn_queue.head);
notification_ptr_set_ntfnQueue_tail(ntfn_ptr, (word_t)ntfn_queue.end);
if (!ntfn_queue.head) {
notification_ptr_set_state(ntfn_ptr, NtfnState_Idle);
}
}
#endif
#ifdef CONFIG_EXCEPTION_FASTPATH

2
src/fastpath/fastpath.c
View file

@ -680,7 +680,7 @@ void NORETURN fastpath_signal(word_t cptr, word_t msgInfo)
cancelIPC_fp(dest);
} else {
/* Dequeue dest from the notification queue */
ntfn_queue_dequeue_fp(dest, ntfnPtr);
tcbNTFNDequeue(dest, ntfnPtr);
}
/* Wake up the signalled thread and transfer badge */