From dfc08a0b6600c611f06a4b96c5870807c2e988cc Mon Sep 17 00:00:00 2001 From: chenhonglin Date: Tue, 28 Sep 2021 11:28:05 +0800 Subject: [PATCH] sched/sched/remove_readytorun.c: Fix CPU affinity issues in SMP the logical may choose the head of g_readytorun(the greatest priority) task as the next while ignoring the cpu affinity of it. Signed-off-by: chenhonglin --- sched/sched/sched_removereadytorun.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sched/sched/sched_removereadytorun.c b/sched/sched/sched_removereadytorun.c index 170e18b835..398a348ce9 100644 --- a/sched/sched/sched_removereadytorun.c +++ b/sched/sched/sched_removereadytorun.c @@ -209,20 +209,16 @@ bool nxsched_remove_readytorun(FAR struct tcb_s *rtcb) if (rtrtcb != NULL && rtrtcb->sched_priority >= nxttcb->sched_priority) { - FAR struct tcb_s *tmptcb; - - /* The TCB at the head of the ready to run list has the higher - * priority. Remove that task from the head of the g_readytorun + /* The TCB rtrtcb has the higher priority and it can be run on + * target CPU. Remove that task (rtrtcb) from the g_readytorun * list and add to the head of the g_assignedtasks[cpu] list. */ - tmptcb = (FAR struct tcb_s *) - dq_remfirst((FAR dq_queue_t *)&g_readytorun); + dq_rem((FAR dq_entry_t *)rtrtcb, (FAR dq_queue_t *)&g_readytorun); + dq_addfirst((FAR dq_entry_t *)rtrtcb, tasklist); - dq_addfirst((FAR dq_entry_t *)tmptcb, tasklist); - - tmptcb->cpu = cpu; - nxttcb = tmptcb; + rtrtcb->cpu = cpu; + nxttcb = rtrtcb; } /* Will pre-emption be disabled after the switch? If the lockcount is