Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sched: fix goto retry in pick_next_task_rt()

looking at it one more time:

(1) it looks to me that there is no need to call
sched_rt_ratio_exceeded() from pick_next_rt_entity()

- [ for CONFIG_FAIR_GROUP_SCHED ] queues with rt_rq->rt_throttled are
not within this 'tree-like hierarchy' (or whatever we should call it
:-)

- there is also no need to re-check 'rt_rq->rt_time > ratio' at this
point as 'rt_rq->rt_time' couldn't have been increased since the last
call to update_curr_rt() (which obviously calls
sched_rt_ratio_esceeded())
well, it might be that 'ratio' for this rt_rq has been re-configured
(and the period over which this rt_rq was active has not yet been
finished)... but I don't think we should really take this into
account.

(2) now pick_next_rt_entity() must never return NULL, so let's change
pick_next_task_rt() accordingly.

Signed-off-by: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

authored by

Dmitry Adamushko and committed by
Ingo Molnar
326587b8 e118adef

+2 -7
+2 -7
kernel/sched_rt.c
··· 476 476 struct list_head *queue; 477 477 int idx; 478 478 479 - if (sched_rt_ratio_exceeded(rt_rq)) 480 - goto out; 481 - 482 479 idx = sched_find_first_bit(array->bitmap); 483 480 BUG_ON(idx >= MAX_RT_PRIO); 484 481 485 482 queue = array->queue + idx; 486 483 next = list_entry(queue->next, struct sched_rt_entity, run_list); 487 - out: 484 + 488 485 return next; 489 486 } 490 487 ··· 491 494 struct task_struct *p; 492 495 struct rt_rq *rt_rq; 493 496 494 - retry: 495 497 rt_rq = &rq->rt; 496 498 497 499 if (unlikely(!rt_rq->rt_nr_running)) ··· 501 505 502 506 do { 503 507 rt_se = pick_next_rt_entity(rq, rt_rq); 504 - if (unlikely(!rt_se)) 505 - goto retry; 508 + BUG_ON(!rt_se); 506 509 rt_rq = group_rt_rq(rt_se); 507 510 } while (rt_rq); 508 511