github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 19:47:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

sched: Improve the Scheduler

Browse Source 
This change is for general scheduler improvement.

Change-Id: Iebc41134b83b1c83d02f433d92ec2b44ed972511
Signed-off-by: Shaleen Agrawal <quic_shalagra@quicinc.com>
This commit is contained in:
Shaleen Agrawal 2022-01-24 16:52:41 -08:00 committed by Rishabh Bhatnagar
parent 69bd1582b2
commit d0ba68e336
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/sched/walt/sched_avg.c
View File

@ -261,7 +261,7 @@ unsigned int sched_get_cpu_util_pct(int cpu)
capacity = capacity_orig_of(cpu);
util = wrq->prev_runnable_sum + wrq->grp_time.prev_runnable_sum;
util = div64_u64(util, sched_ravg_window >> SCHED_CAPACITY_SHIFT);
util = scale_time_to_util(util);
raw_spin_unlock_irqrestore(&rq->__lock, flags);
util = (util >= capacity) ? capacity : util;

17
kernel/sched/walt/walt.c
View File

@ -650,8 +650,7 @@ __cpu_util_freq_walt(int cpu, struct walt_cpu_load *walt_load, unsigned int *rea
unsigned long capacity = capacity_orig_of(cpu);
struct walt_rq *wrq = (struct walt_rq *) rq->android_vendor_data1;
util = div64_u64(freq_policy_load(rq, reason),
sched_ravg_window >> SCHED_CAPACITY_SHIFT);
util = scale_time_to_util(freq_policy_load(rq, reason));
if (walt_load) {
u64 nl = wrq->nt_prev_runnable_sum +
@ -661,7 +660,7 @@ __cpu_util_freq_walt(int cpu, struct walt_cpu_load *walt_load, unsigned int *rea
wrq->old_busy_time = util;
wrq->old_estimated_time = pl;
nl = div64_u64(nl, sched_ravg_window >> SCHED_CAPACITY_SHIFT);
nl = scale_time_to_util(nl);
walt_load->nl = nl;
walt_load->pl = pl;
walt_load->ws = walt_load_reported_window;
@ -1290,7 +1289,7 @@ static void update_task_pred_demand(struct rq *rq, struct task_struct *p, int ev
return;
}
curr_window_scaled = scale_demand(wts->curr_window);
curr_window_scaled = scale_time_to_util(wts->curr_window);
if (wts->pred_demand_scaled >= curr_window_scaled)
return;
@ -1515,7 +1514,7 @@ static inline u64 scale_exec_time(u64 delta, struct rq *rq)
{
struct walt_rq *wrq = (struct walt_rq *) rq->android_vendor_data1;
return (delta * wrq->task_exec_scale) >> 10;
return (delta * wrq->task_exec_scale) >> SCHED_CAPACITY_SHIFT;
}
/* Convert busy time to frequency equivalent
@ -1955,8 +1954,8 @@ static void update_history(struct rq *rq, struct task_struct *p,
else
demand = max(avg, runtime);
}
pred_demand_scaled = predict_and_update_buckets(p, scale_demand(runtime));
demand_scaled = scale_demand(demand);
pred_demand_scaled = predict_and_update_buckets(p, scale_time_to_util(runtime));
demand_scaled = scale_time_to_util(demand);
/*
* A throttled deadline sched class task gets dequeued without
@ -2298,7 +2297,7 @@ static void init_new_task_load(struct task_struct *p)
if (init_load_pct) {
init_load_windows = div64_u64((u64)init_load_pct *
(u64)sched_ravg_window, 100);
init_load_windows_scaled = scale_demand(init_load_windows);
init_load_windows_scaled = scale_time_to_util(init_load_windows);
}
wts->demand = init_load_windows;
@ -3771,7 +3770,7 @@ static void walt_init_window_dep(void)
div64_u64((u64)sysctl_sched_init_task_load_pct *
(u64)sched_ravg_window, 100);
sched_init_task_load_windows_scaled =
scale_demand(sched_init_task_load_windows);
scale_time_to_util(sched_init_task_load_windows);
walt_cpu_high_irqload = div64_u64((u64)sched_ravg_window * 95, (u64) 100);
}

11
kernel/sched/walt/walt.h
View File

@ -906,7 +906,16 @@ void walt_cfs_tick(struct rq *rq);
void walt_lb_tick(struct rq *rq);
extern __read_mostly unsigned int walt_scale_demand_divisor;
#define scale_demand(d) ((d)/walt_scale_demand_divisor)
static inline u64 scale_time_to_util(u64 d)
{
/*
* The denominator at most could be (8 * tick_size) >> SCHED_CAPACITY_SHIFT,
* a value that easily fits a 32bit integer.
*/
do_div(d, walt_scale_demand_divisor);
return d;
}
#define ASYMCAP_BOOST(cpu) (sysctl_sched_asymcap_boost && !is_min_cluster_cpu(cpu))

2
kernel/sched/walt/walt_cfs.c
View File

@ -681,7 +681,7 @@ walt_pd_compute_energy(struct task_struct *p, int dst_cpu, struct perf_domain *p
max_util = max(max_util, cpu_util);
}
max_util = scale_demand(max_util);
max_util = scale_time_to_util(max_util);
if (output)
output->cluster_first_cpu[x] = cpumask_first(pd_mask);