On Wed, Jul 15, 2020 at 2:09 AM Francisco Jerez <currojerez@xxxxxxxxxx> wrote:
>
> "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx> writes:
>
> > From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> >
> > Allow intel_pstate to work in the passive mode with HWP enabled and
> > make it set the HWP minimum performance limit (HWP floor) to the
> > P-state value given by the target frequency supplied by the cpufreq
> > governor, so as to prevent the HWP algorithm and the CPU scheduler
> > from working against each other, at least when the schedutil governor
> > is in use, and update the intel_pstate documentation accordingly.
> >
> > Among other things, this allows utilization clamps to be taken
> > into account, at least to a certain extent, when intel_pstate is
> > in use and makes it more likely that sufficient capacity for
> > deadline tasks will be provided.
> >
> > After this change, the resulting behavior of an HWP system with
> > intel_pstate in the passive mode should be close to the behavior
> > of the analogous non-HWP system with intel_pstate in the passive
> > mode, except that in the frequency range below the base frequency
> > (ie. the frequency retured by the base_frequency cpufreq attribute
> > in sysfs on HWP systems) the HWP algorithm is allowed to go above
> > the floor P-state set by intel_pstate with or without hardware
> > coordination of P-states among CPUs in the same package.
> >
> > Also note that the setting of the HWP floor may not be taken into
> > account by the processor in the following cases:
> >
> > * For the HWP floor in the range of P-states above the base
> > frequency, referred to as the turbo range, the processor has a
> > license to choose any P-state from that range, either below or
> > above the HWP floor, just like a non-HWP processor in the case
> > when the target P-state falls into the turbo range.
> >
> > * If P-states of the CPUs in the same package are coordinated
> > at the hardware level, the processor may choose a P-state
> > above the HWP floor, just like a non-HWP processor in the
> > analogous case.
> >
> > With this change applied, intel_pstate in the passive mode
> > assumes complete control over the HWP request MSR and concurrent
> > changes of that MSR (eg. via the direct MSR access interface) are
> > overridden by it.
> >
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> > ---
> >
> > This basically unifies the passive mode behavior of intel_pstate for systems
> > with and without HWP enabled. The only case in which there is a difference
> > between the two (after this patch) is below the turbo range, where the HWP
> > algorithm can go above the floor regardless of whether or not P-state are
> > coordinated package-wide (this means the systems with per-core P-states
> > mostly is where the difference can be somewhat visible).
> >
> > Since the passive mode hasn't worked with HWP at all, and it is not going to
> > the default for HWP systems anyway, I don't see any drawbacks related to making
> > this change, so I would consider this as 5.9 material unless there are any
> > serious objections.
> >
> > Thanks!
> >
> > ---
> > Documentation/admin-guide/pm/intel_pstate.rst | 89 +++++++---------
> > drivers/cpufreq/intel_pstate.c | 141 ++++++++++++++++++++------
> > 2 files changed, 152 insertions(+), 78 deletions(-)
> >
> > Index: linux-pm/drivers/cpufreq/intel_pstate.c
> > ===================================================================
> > --- linux-pm.orig/drivers/cpufreq/intel_pstate.c
> > +++ linux-pm/drivers/cpufreq/intel_pstate.c
> > @@ -36,6 +36,7 @@
> > #define INTEL_PSTATE_SAMPLING_INTERVAL (10 * NSEC_PER_MSEC)
> >
> > #define INTEL_CPUFREQ_TRANSITION_LATENCY 20000
> > +#define INTEL_CPUFREQ_TRANSITION_DELAY_HWP 5000
> > #define INTEL_CPUFREQ_TRANSITION_DELAY 500
> >
> > #ifdef CONFIG_ACPI
> > @@ -222,6 +223,7 @@ struct global_params {
> > * preference/bias
> > * @epp_saved: Saved EPP/EPB during system suspend or CPU offline
> > * operation
> > + * @epp_cached Cached HWP energy-performance preference value
> > * @hwp_req_cached: Cached value of the last HWP Request MSR
> > * @hwp_cap_cached: Cached value of the last HWP Capabilities MSR
> > * @last_io_update: Last time when IO wake flag was set
> > @@ -259,6 +261,7 @@ struct cpudata {
> > s16 epp_policy;
> > s16 epp_default;
> > s16 epp_saved;
> > + s16 epp_cached;
> > u64 hwp_req_cached;
> > u64 hwp_cap_cached;
> > u64 last_io_update;
> > @@ -676,6 +679,8 @@ static int intel_pstate_set_energy_pref_
> >
> > value |= (u64)epp << 24;
> > ret = wrmsrl_on_cpu(cpu_data->cpu, MSR_HWP_REQUEST, value);
> > +
> > + WRITE_ONCE(cpu_data->epp_cached, epp);
>
> Why introduce a new EPP cache variable if there is already
> hwp_req_cached? If intel_pstate_set_energy_pref_index() is failing to
> update hwp_req_cached maybe we should fix that instead. That will save
> you a little bit of work in intel_cpufreq_adjust_hwp().
Yes, it would, but then we'd need to explicitly synchronize
intel_pstate_set_energy_pref_index() with the scheduler context which
I'd rather avoid.
> > } else {
> > if (epp == -EINVAL)
> > epp = (pref_index - 1) << 2;
> > @@ -2047,6 +2052,7 @@ static int intel_pstate_init_cpu(unsigne
> > cpu->epp_default = -EINVAL;
> > cpu->epp_powersave = -EINVAL;
> > cpu->epp_saved = -EINVAL;
> > + WRITE_ONCE(cpu->epp_cached, -EINVAL);
> > }
> >
> > cpu = all_cpu_data[cpunum];
> > @@ -2245,7 +2251,10 @@ static int intel_pstate_verify_policy(st
> >
> > static void intel_cpufreq_stop_cpu(struct cpufreq_policy *policy)
> > {
> > - intel_pstate_set_min_pstate(all_cpu_data[policy->cpu]);
> > + if (hwp_active)
> > + intel_pstate_hwp_force_min_perf(policy->cpu);
> > + else
> > + intel_pstate_set_min_pstate(all_cpu_data[policy->cpu]);
> > }
> >
> > static void intel_pstate_stop_cpu(struct cpufreq_policy *policy)
> > @@ -2253,12 +2262,10 @@ static void intel_pstate_stop_cpu(struct
> > pr_debug("CPU %d exiting\n", policy->cpu);
> >
> > intel_pstate_clear_update_util_hook(policy->cpu);
> > - if (hwp_active) {
> > + if (hwp_active)
> > intel_pstate_hwp_save_state(policy);
> > - intel_pstate_hwp_force_min_perf(policy->cpu);
> > - } else {
> > - intel_cpufreq_stop_cpu(policy);
> > - }
> > +
> > + intel_cpufreq_stop_cpu(policy);
> > }
> >
> > static int intel_pstate_cpu_exit(struct cpufreq_policy *policy)
> > @@ -2388,13 +2395,82 @@ static void intel_cpufreq_trace(struct c
> > fp_toint(cpu->iowait_boost * 100));
> > }
> >
> > +static void intel_cpufreq_adjust_hwp(struct cpudata *cpu, u32 target_pstate,
> > + bool fast_switch)
> > +{
> > + u64 prev = READ_ONCE(cpu->hwp_req_cached), value = prev;
> > + s16 epp;
> > +
> > + value &= ~HWP_MIN_PERF(~0L);
> > + value |= HWP_MIN_PERF(target_pstate);
> > +
> > + /*
> > + * The entire MSR needs to be updated in order to update the HWP min
> > + * field in it, so opportunistically update the max too if needed.
> > + */
> > + value &= ~HWP_MAX_PERF(~0L);
> > + value |= HWP_MAX_PERF(cpu->max_perf_ratio);
> > +
> > + /*
> > + * In case the EPP has been adjusted via sysfs, write the last cached
> > + * value of it to the MSR as well.
> > + */
> > + epp = READ_ONCE(cpu->epp_cached);
> > + if (epp >= 0) {
> > + value &= ~GENMASK_ULL(31, 24);
> > + value |= (u64)epp << 24;
> > + }
> > +
> > + if (value == prev)
> > + return;
> > +
> > + WRITE_ONCE(cpu->hwp_req_cached, value);
> > + if (fast_switch)
> > + wrmsrl(MSR_HWP_REQUEST, value);
> > + else
> > + wrmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, value);
> > +}
>
> I've asked this question already but you may have missed it: Given that
> you are of the opinion that [1] should be implemented in schedutil
> instead with intel_pstate in HWP passive mode, what's your plan for
> exposing the HWP_MAX_PERF knob to the governor in addition to
> HWP_MIN_PERF, since the interface implemented here only allows the
> governor to provide a single frequency?
>
> [1] https://lwn.net/ml/linux-pm/20200428032258.2518-1-currojerez@xxxxxxxxxx/
This is not just about the schedutil governor, but about cpufreq
governors in general (someone may still want to use the performance
governor on top of intel_pstate, for example).
And while governors can only provide one frequency, the policy limits
in the cpufreq framework are based on QoS lists now and so it is
possible to add a max limit request, say from a driver, to the max QoS
list, and update it as needed, causing the max policy limit to be
adjusted.
That said I'm not exactly sure how useful the max limit generally is
in practice on HWP systems, given that setting it above the base
frequency causes it to be ignored, effectively, and the turbo range
may be wider than the range of P-states below the base frequency.
Generally, I'm not quite convinced that limiting the max frequency is
really the right choice for controlling the processor's power draw on
the systems in question. There are other ways to do that, which in
theory should be more effective. I mentioned RAPL somewhere in this
context and there's the GUC firmware too.
