sched/core: Fix the bug that sched_core_find() may return throttled task
PATCH 1/1 sched/core: Fix the bug that sched_core_find() may return throttled task
When a cfs_rq is throttled, the cookie'd task in this cfs_rq wouldn't dequeue from the core tree, and sched_core_find() may return this task, which will result that the throttled task running on the cpu.
To resolve this problem, we pick the first cookie matched task and unthrottled task.
--- kernel/sched/core.c | 6 ++++++ kernel/sched/fair.c | 7 +++++++ kernel/sched/sched.h | 1 + 3 files changed, 14 insertions(+)
kernel/sched/core.c +6 -0
@@ -271,6 +271,12 @@ static struct task_struct *sched_core_find(struct rq *rq, unsigned long cookie)struct rb_node *node; node =rb_find_first ((void *)cookie, &rq->core_tree, rb_sched_core_cmp); +while (node &&task_throttled (__node_2_sc (node))) { + node =rb_next (node); +if (node && cookie !=__node_2_sc (node)->core_cookie) + node =NULL ; + } +/* * The idle task always matches any cookie! */
kernel/sched/fair.c +7 -0
@@ -11563,6 +11563,13 @@ bool cfs_prio_less(struct task_struct *a, struct task_struct *b, bool in_fi) return delta > 0; } + +inline int task_throttled (struct task_struct *p) +{ +struct cfs_rq *cfs_rq =cfs_rq_of (&p->se); + +return cfs_rq_throttled (cfs_rq); +}#else static inline void task_tick_core (struct rq *rq,struct task_struct *curr) {}#endif
kernel/sched/sched.h +1 -0
@@ -1285,6 +1285,7 @@ static inline bool sched_core_enqueued(struct task_struct *p)extern void sched_core_get (void );extern void sched_core_put (void ); +extern int task_throttled (struct task_struct *p);#else /* !CONFIG_SCHED_CORE */
Signature · 1 line
1.8.3.1
Peter Zijlstra
maintainerQuoted 6 lines · Cruz Zhao
When a
cfs_rqis throttled, the cookie'd task in thiscfs_rqwouldn't dequeue from the core tree, andsched_core_find()may return this task, which will result that the throttled task running on the cpu.To resolve this problem, we pick the first cookie matched task and unthrottled task.
You mean: first that that both matches the cookie and is not throttled.
Except I think you can have the same problem with the RT crud.
Quoted 10 lines · Peter Zijlstra
Quoted 6 lines · Cruz Zhao
When a
cfs_rqis throttled, the cookie'd task in thiscfs_rqwouldn't dequeue from the core tree, andsched_core_find()may return this task, which will result that the throttled task running on the cpu.To resolve this problem, we pick the first cookie matched task and unthrottled task.
You mean: first that that both matches the cookie and is not throttled.
Yeah, I mean "the first cookie matched and not throttled task".
Quoted 1 line
Except I think you can have the same problem with the RT crud.
Sure, there's the same problem with the RT crud.
There's also a problem that the priority of the tasks in the core_tree won't change since sched_core_enqueue(), but the priority of cfs tasks will change as vruntime changes. And sched_core_find() may not pick the cookie matched task with the highest priority.
I tried to combine the core_tree with cfs_rq (dl_rq, rt_rq should also be considered) to solve this problem, but I haven't come up with a simple and graceful solution yet.