Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc876615 authored by Saravana Kannan's avatar Saravana Kannan Committed by Jonathan Avila
Browse files

cpufreq: schedutil: Keep track of average policy capacity 



Average policy capacity will be used in future patches to improve detection
of hispeed load condition.

Change-Id: Icab992243b83eb5feaae619d16b22510010f54c5
Signed-off-by: default avatarSaravana Kannan <skannan@codeaurora.org>
Signed-off-by: default avatarRohit Gupta <rohgup@codeaurora.org>
[avilaj@codeaurora.org: Fix merge conflicts caused by moving around tracepoint patch]
Signed-off-by: default avatarJonathan Avila <avilaj@codeaurora.org>
parent 21154116

kernel/sched/cpufreq_schedutil.c

+60 −8
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ struct sugov_tunables { 
struct sugov_policy {

	struct cpufreq_policy	*policy;



	u64 last_ws;

	u64 curr_cycles;

	u64 last_cyc_update_time;

	unsigned long avg_cap;

	struct sugov_tunables	*tunables;

	struct list_head	tunables_hook;

	unsigned long hispeed_util;
@@ -486,6 +490,51 @@ static bool sugov_cpu_is_busy(struct sugov_cpu *sg_cpu) 
static inline bool sugov_cpu_is_busy(struct sugov_cpu *sg_cpu) { return false; }

#endif /* CONFIG_NO_HZ_COMMON */



static unsigned long freq_to_util(struct sugov_policy *sg_policy,

				  unsigned int freq)

{

	return mult_frac(sg_policy->max, freq,

			 sg_policy->policy->cpuinfo.max_freq);

}



#define KHZ 1000

static void sugov_track_cycles(struct sugov_policy *sg_policy,

				unsigned int prev_freq,

				u64 upto)

{

	u64 delta_ns, cycles;

	/* Track cycles in current window */

	delta_ns = upto - sg_policy->last_cyc_update_time;

	cycles = (prev_freq * delta_ns) / (NSEC_PER_SEC / KHZ);

	sg_policy->curr_cycles += cycles;

	sg_policy->last_cyc_update_time = upto;

}



static void sugov_calc_avg_cap(struct sugov_policy *sg_policy, u64 curr_ws,

				unsigned int prev_freq)

{

	u64 last_ws = sg_policy->last_ws;

	unsigned int avg_freq;



	WARN_ON(curr_ws < last_ws);

	if (curr_ws <= last_ws)

		return;



	/* If we skipped some windows */

	if (curr_ws > (last_ws + sched_ravg_window)) {

		avg_freq = prev_freq;

		/* Reset tracking history */

		sg_policy->last_cyc_update_time = curr_ws;

	} else {

		sugov_track_cycles(sg_policy, prev_freq, curr_ws);

		avg_freq = sg_policy->curr_cycles;

		avg_freq /= sched_ravg_window / (NSEC_PER_SEC / KHZ);

	}

	sg_policy->avg_cap = freq_to_util(sg_policy, avg_freq);

	sg_policy->curr_cycles = 0;

	sg_policy->last_ws = curr_ws;

}



#define NL_RATIO 75

#define DEFAULT_HISPEED_LOAD 90

static void sugov_walt_adjust(struct sugov_cpu *sg_cpu, unsigned long *util,
@@ -512,14 +561,6 @@ static void sugov_walt_adjust(struct sugov_cpu *sg_cpu, unsigned long *util, 
		*util = max(*util, sg_cpu->walt_load.pl);

}



static unsigned long freq_to_util(struct sugov_policy *sg_policy,

				  unsigned int freq)

{

	return mult_frac(sg_policy->max, freq,

			 sg_policy->policy->cpuinfo.max_freq);

}





/*

 * Make sugov_should_update_freq() ignore the rate limit when DL

 * has increased the utilization.
@@ -562,6 +603,8 @@ static void sugov_update_single(struct update_util_data *hook, u64 time, 
	}



	sugov_iowait_apply(sg_cpu, time, &util, &max);

	sugov_calc_avg_cap(sg_policy, sg_cpu->walt_load.ws,

			   sg_policy->policy->cur);

	sugov_walt_adjust(sg_cpu, &util, &max);

	next_f = get_next_freq(sg_policy, util, max);

	/*
@@ -661,6 +704,8 @@ sugov_update_shared(struct update_util_data *hook, u64 time, unsigned int flags) 
	sugov_iowait_boost(sg_cpu, time, flags);

	sg_cpu->last_update = time;



	sugov_calc_avg_cap(sg_policy, sg_cpu->walt_load.ws,

			   sg_policy->policy->cur);

	ignore_dl_rate_limit(sg_cpu, sg_policy);



	if (sugov_should_update_freq(sg_policy, time)) {
@@ -694,6 +739,8 @@ static void sugov_work(struct kthread_work *work) 
	raw_spin_lock_irqsave(&sg_policy->update_lock, flags);

	freq = sg_policy->next_freq;

	sg_policy->work_in_progress = false;

	sugov_track_cycles(sg_policy, sg_policy->policy->cur,

			   ktime_get_ns());

	raw_spin_unlock_irqrestore(&sg_policy->update_lock, flags);



	mutex_lock(&sg_policy->work_lock);
@@ -1134,9 +1181,14 @@ static void sugov_stop(struct cpufreq_policy *policy) 
static void sugov_limits(struct cpufreq_policy *policy)

{

	struct sugov_policy *sg_policy = policy->governor_data;

	unsigned long flags;



	if (!policy->fast_switch_enabled) {

		mutex_lock(&sg_policy->work_lock);

		raw_spin_lock_irqsave(&sg_policy->update_lock, flags);

		sugov_track_cycles(sg_policy, sg_policy->policy->cur,

				   ktime_get_ns());

		raw_spin_unlock_irqrestore(&sg_policy->update_lock, flags);

		cpufreq_policy_apply_limits(policy);

		mutex_unlock(&sg_policy->work_lock);

	}