Merge "sched/fair: bonus vruntime for task boost 3"

This commit is contained in:
qctecmdr 2020-02-12 00:18:29 -08:00 • committed by Gerrit - the friendly Code Review server
commit f3bd0349ce
2 changed files with 14 additions and 11 deletions

View file

@ -4016,6 +4016,9 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
thresh >>= 1;
vruntime -= thresh;
if (entity_is_task(se) && per_task_boost(task_of(se)) ==
TASK_BOOST_STRICT_MAX)
vruntime -= sysctl_sched_latency;
}
/* ensure we never gain time by being placed backwards. */

View file

@ -2192,17 +2192,6 @@ unsigned long arch_scale_max_freq_capacity(struct sched_domain *sd, int cpu)
unsigned long capacity_curr_of(int cpu);
#ifdef CONFIG_SMP
static inline unsigned long capacity_of(int cpu)
{
return cpu_rq(cpu)->cpu_capacity;
}
static inline unsigned long capacity_orig_of(int cpu)
{
return cpu_rq(cpu)->cpu_capacity_orig;
}
#ifdef CONFIG_SCHED_WALT
static inline int per_task_boost(struct task_struct *p)
{
@ -2222,6 +2211,17 @@ static inline int per_task_boost(struct task_struct *p)
}
#endif
#ifdef CONFIG_SMP
static inline unsigned long capacity_of(int cpu)
{
return cpu_rq(cpu)->cpu_capacity;
}
static inline unsigned long capacity_orig_of(int cpu)
{
return cpu_rq(cpu)->cpu_capacity_orig;
}
static inline unsigned long task_util(struct task_struct *p)
{
#ifdef CONFIG_SCHED_WALT