Received-SPF: pass (google.com: domain of linux-kernel+bounces-87339-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <20240227091351.1144757-1-quic_kshivnan@quicinc.com>
In-Reply-To: <20240227091351.1144757-1-quic_kshivnan@quicinc.com>
From: "Rafael J. Wysocki" <rafael@kernel.org>
Date: Thu, 29 Feb 2024 20:23:23 +0100
Message-ID: <CAJZ5v0i_XYYxJpg9VFyFOj2VfEVeAknuLs=c6sRyVSj9qs+Hmw@mail.gmail.com>
Subject: Re: [PATCH v2] cpufreq: Limit resolving a frequency to policy min/max
To: Shivnandan Kumar <quic_kshivnan@quicinc.com>
Cc: rafael@kernel.org, Viresh Kumar <viresh.kumar@linaro.org>, 
	Vincent Donnefort <vincent.donnefort@arm.com>, linux-pm@vger.kernel.org, 
	linux-kernel@vger.kernel.org, quic_pkondeti@quicinc.com, 
	quic_namajain@quicinc.com, quic_rgottimu@quicinc.com, 
	kernel <kernel@quicinc.com>, stable@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Feb 27, 2024 at 10:15=E2=80=AFAM Shivnandan Kumar
<quic_kshivnan@quicinc.com> wrote:
>
> Resolving a frequency to an efficient one should not transgress policy->m=
ax
> (which can be set for thermal reason) and policy->min. Currently there is
> possibility where scaling_cur_freq can exceed scaling_max_freq when
> scaling_max_freq is inefficient frequency. Add additional check to ensure
> that resolving a frequency will respect policy->min/max.
>
> Cc: <stable@vger.kernel.org>
> Fixes: 1f39fa0dccff ("cpufreq: Introducing CPUFREQ_RELATION_E")
> Signed-off-by: Shivnandan Kumar <quic_kshivnan@quicinc.com>
> --
>
> Changes in v2:
> -rename function name from cpufreq_table_index_is_in_limits to cpufreq_is=
_in_limits
> -remove redundant outer parenthesis in return statement
> -Make comment single line
>
> --
> ---
>  include/linux/cpufreq.h | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
> index afda5f24d3dd..7741244dee6e 100644
> --- a/include/linux/cpufreq.h
> +++ b/include/linux/cpufreq.h
> @@ -1021,6 +1021,19 @@ static inline int cpufreq_table_find_index_c(struc=
t cpufreq_policy *policy,
>                                                    efficiencies);
>  }
>
> +static inline bool cpufreq_is_in_limits(struct cpufreq_policy *policy,
> +                                                   int idx)
> +{
> +       unsigned int freq;
> +
> +       if (idx < 0)
> +               return false;
> +
> +       freq =3D policy->freq_table[idx].frequency;
> +
> +       return freq =3D=3D clamp_val(freq, policy->min, policy->max);
> +}
> +
>  static inline int cpufreq_frequency_table_target(struct cpufreq_policy *=
policy,
>                                                  unsigned int target_freq=
,
>                                                  unsigned int relation)
> @@ -1054,7 +1067,8 @@ static inline int cpufreq_frequency_table_target(st=
ruct cpufreq_policy *policy,
>                 return 0;
>         }
>
> -       if (idx < 0 && efficiencies) {
> +       /* Limit frequency index to honor policy->min/max */
> +       if (!cpufreq_is_in_limits(policy, idx) && efficiencies) {
>                 efficiencies =3D false;
>                 goto retry;
>         }
> --

Applied (with a whitespace adjustment and changelog edits) as 6.9
material, thanks!