diff options
Diffstat (limited to 'kernel/sched_fair.c')
-rw-r--r-- | kernel/sched_fair.c | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 7c248dc30f41..652e8bdef9aa 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -266,6 +266,12 @@ static inline u64 min_vruntime(u64 min_vruntime, u64 vruntime) | |||
266 | return min_vruntime; | 266 | return min_vruntime; |
267 | } | 267 | } |
268 | 268 | ||
269 | static inline int entity_before(struct sched_entity *a, | ||
270 | struct sched_entity *b) | ||
271 | { | ||
272 | return (s64)(a->vruntime - b->vruntime) < 0; | ||
273 | } | ||
274 | |||
269 | static inline s64 entity_key(struct cfs_rq *cfs_rq, struct sched_entity *se) | 275 | static inline s64 entity_key(struct cfs_rq *cfs_rq, struct sched_entity *se) |
270 | { | 276 | { |
271 | return se->vruntime - cfs_rq->min_vruntime; | 277 | return se->vruntime - cfs_rq->min_vruntime; |
@@ -605,9 +611,13 @@ account_entity_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
605 | static void enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se) | 611 | static void enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se) |
606 | { | 612 | { |
607 | #ifdef CONFIG_SCHEDSTATS | 613 | #ifdef CONFIG_SCHEDSTATS |
614 | struct task_struct *tsk = NULL; | ||
615 | |||
616 | if (entity_is_task(se)) | ||
617 | tsk = task_of(se); | ||
618 | |||
608 | if (se->sleep_start) { | 619 | if (se->sleep_start) { |
609 | u64 delta = rq_of(cfs_rq)->clock - se->sleep_start; | 620 | u64 delta = rq_of(cfs_rq)->clock - se->sleep_start; |
610 | struct task_struct *tsk = task_of(se); | ||
611 | 621 | ||
612 | if ((s64)delta < 0) | 622 | if ((s64)delta < 0) |
613 | delta = 0; | 623 | delta = 0; |
@@ -618,11 +628,11 @@ static void enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
618 | se->sleep_start = 0; | 628 | se->sleep_start = 0; |
619 | se->sum_sleep_runtime += delta; | 629 | se->sum_sleep_runtime += delta; |
620 | 630 | ||
621 | account_scheduler_latency(tsk, delta >> 10, 1); | 631 | if (tsk) |
632 | account_scheduler_latency(tsk, delta >> 10, 1); | ||
622 | } | 633 | } |
623 | if (se->block_start) { | 634 | if (se->block_start) { |
624 | u64 delta = rq_of(cfs_rq)->clock - se->block_start; | 635 | u64 delta = rq_of(cfs_rq)->clock - se->block_start; |
625 | struct task_struct *tsk = task_of(se); | ||
626 | 636 | ||
627 | if ((s64)delta < 0) | 637 | if ((s64)delta < 0) |
628 | delta = 0; | 638 | delta = 0; |
@@ -633,17 +643,19 @@ static void enqueue_sleeper(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
633 | se->block_start = 0; | 643 | se->block_start = 0; |
634 | se->sum_sleep_runtime += delta; | 644 | se->sum_sleep_runtime += delta; |
635 | 645 | ||
636 | /* | 646 | if (tsk) { |
637 | * Blocking time is in units of nanosecs, so shift by 20 to | 647 | /* |
638 | * get a milliseconds-range estimation of the amount of | 648 | * Blocking time is in units of nanosecs, so shift by |
639 | * time that the task spent sleeping: | 649 | * 20 to get a milliseconds-range estimation of the |
640 | */ | 650 | * amount of time that the task spent sleeping: |
641 | if (unlikely(prof_on == SLEEP_PROFILING)) { | 651 | */ |
642 | 652 | if (unlikely(prof_on == SLEEP_PROFILING)) { | |
643 | profile_hits(SLEEP_PROFILING, (void *)get_wchan(tsk), | 653 | profile_hits(SLEEP_PROFILING, |
644 | delta >> 20); | 654 | (void *)get_wchan(tsk), |
655 | delta >> 20); | ||
656 | } | ||
657 | account_scheduler_latency(tsk, delta >> 10, 0); | ||
645 | } | 658 | } |
646 | account_scheduler_latency(tsk, delta >> 10, 0); | ||
647 | } | 659 | } |
648 | #endif | 660 | #endif |
649 | } | 661 | } |
@@ -1017,7 +1029,7 @@ static void yield_task_fair(struct rq *rq) | |||
1017 | /* | 1029 | /* |
1018 | * Already in the rightmost position? | 1030 | * Already in the rightmost position? |
1019 | */ | 1031 | */ |
1020 | if (unlikely(!rightmost || rightmost->vruntime < se->vruntime)) | 1032 | if (unlikely(!rightmost || entity_before(rightmost, se))) |
1021 | return; | 1033 | return; |
1022 | 1034 | ||
1023 | /* | 1035 | /* |
@@ -1713,7 +1725,7 @@ static void task_new_fair(struct rq *rq, struct task_struct *p) | |||
1713 | 1725 | ||
1714 | /* 'curr' will be NULL if the child belongs to a different group */ | 1726 | /* 'curr' will be NULL if the child belongs to a different group */ |
1715 | if (sysctl_sched_child_runs_first && this_cpu == task_cpu(p) && | 1727 | if (sysctl_sched_child_runs_first && this_cpu == task_cpu(p) && |
1716 | curr && curr->vruntime < se->vruntime) { | 1728 | curr && entity_before(curr, se)) { |
1717 | /* | 1729 | /* |
1718 | * Upon rescheduling, sched_class::put_prev_task() will place | 1730 | * Upon rescheduling, sched_class::put_prev_task() will place |
1719 | * 'current' within the tree based on its new key value. | 1731 | * 'current' within the tree based on its new key value. |