Re: [PATCH] intel_pstate: Do not skip samples partially

[Srinivas Pandruvada]

On Thu, 2016-03-10 at 23:45 +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> 
> If the current value of MPERF or the current value of TSC is the
> same as the previous one, respectively, intel_pstate_sample() bails
> out early and skips the sample.
> 
> However, intel_pstate_adjust_busy_pstate() is still called in that
> case which is not correct, so modify intel_pstate_sample() to
> return a bool value indicating whether or not the sample has been
> taken and use it to decide whether or not to call
> intel_pstate_adjust_busy_pstate().
> 
> While at it, remove redundant parentheses from the MPERF/TSC
> check in intel_pstate_sample().
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxxxxxxxx>
> ---
> 
> On top of my linux-next branch.
> 
> ---
> Âdrivers/cpufreq/intel_pstate.c |ÂÂÂ12 +++++++-----
> Â1 file changed, 7 insertions(+), 5 deletions(-)
> 
> Index: linux-pm/drivers/cpufreq/intel_pstate.c
> ===================================================================
> --- linux-pm.orig/drivers/cpufreq/intel_pstate.c
> +++ linux-pm/drivers/cpufreq/intel_pstate.c
> @@ -890,7 +890,7 @@ static inline void intel_pstate_calc_bus
> Â	sample->core_pct_busy = (int32_t)core_pct;
> Â}
> Â
> -static inline void intel_pstate_sample(struct cpudata *cpu, u64
> time)
> +static inline bool intel_pstate_sample(struct cpudata *cpu, u64
> time)
> Â{
> Â	u64 aperf, mperf;
> Â	unsigned long flags;
> @@ -900,9 +900,9 @@ static inline void intel_pstate_sample(s
> Â	rdmsrl(MSR_IA32_APERF, aperf);
> Â	rdmsrl(MSR_IA32_MPERF, mperf);
> Â	tsc = rdtsc();
> -	if ((cpu->prev_mperf == mperf) || (cpu->prev_tsc == tsc)) {
> +	if (cpu->prev_mperf == mperf || cpu->prev_tsc == tsc) {
> Â		local_irq_restore(flags);
> -		return;
> +		return false;
> Â	}
> Â	local_irq_restore(flags);
> Â
> @@ -920,6 +920,7 @@ static inline void intel_pstate_sample(s
> Â	cpu->prev_aperf = aperf;
> Â	cpu->prev_mperf = mperf;
> Â	cpu->prev_tsc = tsc;
> +	return true;
> Â}
> Â
> Âstatic inline int32_t get_target_pstate_use_cpu_load(struct cpudata
> *cpu)
> @@ -1026,8 +1027,9 @@ static void intel_pstate_update_util(str
> Â	u64 delta_ns = time - cpu->sample.time;
> Â
> Â	if ((s64)delta_ns >= pid_params.sample_rate_ns) {
> -		intel_pstate_sample(cpu, time);
> -		if (!hwp_active)
> +		bool sample_taken = intel_pstate_sample(cpu, time);
> +
> +		if (sample_taken && !hwp_active)
> Â			intel_pstate_adjust_busy_pstate(cpu);
> Â	}
> Â}
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm"
> in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info atÂÂhttp://vger.kernel.org/majordomo-info.html