[v2] cpufreq: Support per-policy performance boost

[PATCH v2] cpufreq: Support per-policy performance boost

Posted by Jie Zhan 2 years ago

The boost control currently applies to the whole system.  However, users
may prefer to boost a subset of cores in order to provide prioritized
performance to workloads running on the boosted cores.

Enable per-policy boost by adding a 'boost' sysfs interface under each
policy path.  This can be found at:

	/sys/devices/system/cpu/cpufreq/policy<*>/boost

Same to the global boost switch, writing 1/0 to the per-policy 'boost'
enables/disables boost on a cpufreq policy respectively.

The user view of global and per-policy boost controls should be:

1. Enabling global boost initially enables boost on all policies, and
per-policy boost can then be enabled or disabled individually, given that
the platform does support so.

2. Disabling global boost makes the per-policy boost interface illegal.

Signed-off-by: Jie Zhan <zhanjie9@hisilicon.com>
Reviewed-by: Wei Xu <xuwei5@hisilicon.com>
---
A possible question could be: why not just limiting 'scaling_max_freq'?
Well, the fundamental difference is that per-policy boost could be more
user-friendly.  When global boost is enabled, it is not straightforward
to figure out the base frequency for setting 'scaling_max_freq' to a
non-boost value. Also, this is supposed to take effect on the physical
upper frequency limit, reflected through 'cpuinfo_max_freq'.

v1->v2:
- Rename the interface from 'local_boost' to 'boost'.
- Illegalize writing 0 to per-policy even if global boost is off.
- Show the per-policy 'boost' file only when ->set_boost() is available.

v1: https://lore.kernel.org/linux-pm/20230724075827.4160512-1-zhanjie9@hisilicon.com/

 drivers/cpufreq/cpufreq.c | 43 +++++++++++++++++++++++++++++++++++++++
 include/linux/cpufreq.h   |  3 +++
 2 files changed, 46 insertions(+)

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 50bbc969ffe5..81e21fa070e1 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -86,6 +86,7 @@ static void cpufreq_governor_limits(struct cpufreq_policy *policy);
 static int cpufreq_set_policy(struct cpufreq_policy *policy,
 			      struct cpufreq_governor *new_gov,
 			      unsigned int new_pol);
+static bool cpufreq_boost_supported(void);
 
 /*
  * Two notifier lists: the "policy" list is involved in the
@@ -621,6 +622,40 @@ static ssize_t store_boost(struct kobject *kobj, struct kobj_attribute *attr,
 }
 define_one_global_rw(boost);
 
+static ssize_t show_local_boost(struct cpufreq_policy *policy, char *buf)
+{
+	return sysfs_emit(buf, "%d\n", policy->boost_enabled);
+}
+
+static ssize_t store_local_boost(struct cpufreq_policy *policy,
+				 const char *buf, size_t count)
+{
+	int ret, enable;
+
+	ret = kstrtoint(buf, 10, &enable);
+	if (ret || enable < 0 || enable > 1)
+		return -EINVAL;
+
+	if (!cpufreq_driver->boost_enabled)
+		return -EINVAL;
+
+	if (policy->boost_enabled == enable)
+		return count;
+
+	cpus_read_lock();
+	ret = cpufreq_driver->set_boost(policy, enable);
+	cpus_read_unlock();
+
+	if (ret)
+		return ret;
+
+	policy->boost_enabled = enable;
+
+	return count;
+}
+
+static struct freq_attr local_boost = __ATTR(boost, 0644, show_local_boost, store_local_boost);
+
 static struct cpufreq_governor *find_governor(const char *str_governor)
 {
 	struct cpufreq_governor *t;
@@ -1055,6 +1090,12 @@ static int cpufreq_add_dev_interface(struct cpufreq_policy *policy)
 			return ret;
 	}
 
+	if (cpufreq_boost_supported()) {
+		ret = sysfs_create_file(&policy->kobj, &local_boost.attr);
+		if (ret)
+			return ret;
+	}
+
 	return 0;
 }
 
@@ -2716,6 +2757,8 @@ int cpufreq_boost_trigger_state(int state)
 		ret = cpufreq_driver->set_boost(policy, state);
 		if (ret)
 			goto err_reset_state;
+
+		policy->boost_enabled = state;
 	}
 	cpus_read_unlock();
 
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 172ff51c1b2a..fa02f2fa88c4 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -140,6 +140,9 @@ struct cpufreq_policy {
 	 */
 	bool			dvfs_possible_from_any_cpu;
 
+	/* Per policy boost enabled flag. */
+	bool			boost_enabled;
+
 	 /* Cached frequency lookup from cpufreq_driver_resolve_freq. */
 	unsigned int cached_target_freq;
 	unsigned int cached_resolved_idx;
-- 
2.30.0

Re: [PATCH v2] cpufreq: Support per-policy performance boost

Posted by Viresh Kumar 2 years ago

On 22-08-23, 20:48, Jie Zhan wrote:
> The boost control currently applies to the whole system.  However, users
> may prefer to boost a subset of cores in order to provide prioritized
> performance to workloads running on the boosted cores.
> 
> Enable per-policy boost by adding a 'boost' sysfs interface under each
> policy path.  This can be found at:
> 
> 	/sys/devices/system/cpu/cpufreq/policy<*>/boost
> 
> Same to the global boost switch, writing 1/0 to the per-policy 'boost'
> enables/disables boost on a cpufreq policy respectively.
> 
> The user view of global and per-policy boost controls should be:
> 
> 1. Enabling global boost initially enables boost on all policies, and
> per-policy boost can then be enabled or disabled individually, given that
> the platform does support so.
> 
> 2. Disabling global boost makes the per-policy boost interface illegal.
> 
> Signed-off-by: Jie Zhan <zhanjie9@hisilicon.com>
> Reviewed-by: Wei Xu <xuwei5@hisilicon.com>
> ---
> A possible question could be: why not just limiting 'scaling_max_freq'?
> Well, the fundamental difference is that per-policy boost could be more
> user-friendly.  When global boost is enabled, it is not straightforward
> to figure out the base frequency for setting 'scaling_max_freq' to a
> non-boost value. Also, this is supposed to take effect on the physical
> upper frequency limit, reflected through 'cpuinfo_max_freq'.
> 
> v1->v2:
> - Rename the interface from 'local_boost' to 'boost'.
> - Illegalize writing 0 to per-policy even if global boost is off.
> - Show the per-policy 'boost' file only when ->set_boost() is available.
> 
> v1: https://lore.kernel.org/linux-pm/20230724075827.4160512-1-zhanjie9@hisilicon.com/

Looks good now, thanks.

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

-- 
viresh

Re: [PATCH v2] cpufreq: Support per-policy performance boost

Posted by Jie Zhan 2 years ago


On 25/08/2023 14:39, Viresh Kumar wrote:
> Looks good now, thanks.
>
> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
>
Many thanks!

Jie

Re: [PATCH v2] cpufreq: Support per-policy performance boost

Posted by Rafael J. Wysocki 2 years ago

On Tue, Aug 29, 2023 at 9:11 AM Jie Zhan <zhanjie9@hisilicon.com> wrote:
>
>
>
> On 25/08/2023 14:39, Viresh Kumar wrote:
> > Looks good now, thanks.
> >
> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
> >
> Many thanks!

Applied as 6.6-rc material, thanks!

Re: [PATCH v2] cpufreq: Support per-policy performance boost

Posted by Jie Zhan 2 years ago


On 30/08/2023 02:52, Rafael J. Wysocki wrote:
> On Tue, Aug 29, 2023 at 9:11 AM Jie Zhan <zhanjie9@hisilicon.com> wrote:
>>
>>
>> On 25/08/2023 14:39, Viresh Kumar wrote:
>>> Looks good now, thanks.
>>>
>>> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
>>>
>> Many thanks!
> Applied as 6.6-rc material, thanks!
>
Thanks, Rafael!

Re: [PATCH v2] cpufreq: Support per-policy performance boost

Posted by Rafael J. Wysocki 2 years ago

On Tue, Aug 22, 2023 at 2:51 PM Jie Zhan <zhanjie9@hisilicon.com> wrote:
>
> The boost control currently applies to the whole system.  However, users
> may prefer to boost a subset of cores in order to provide prioritized
> performance to workloads running on the boosted cores.
>
> Enable per-policy boost by adding a 'boost' sysfs interface under each
> policy path.  This can be found at:
>
>         /sys/devices/system/cpu/cpufreq/policy<*>/boost
>
> Same to the global boost switch, writing 1/0 to the per-policy 'boost'
> enables/disables boost on a cpufreq policy respectively.
>
> The user view of global and per-policy boost controls should be:
>
> 1. Enabling global boost initially enables boost on all policies, and
> per-policy boost can then be enabled or disabled individually, given that
> the platform does support so.
>
> 2. Disabling global boost makes the per-policy boost interface illegal.
>
> Signed-off-by: Jie Zhan <zhanjie9@hisilicon.com>
> Reviewed-by: Wei Xu <xuwei5@hisilicon.com>

Viresh, you had comments on the previous version of this.  Does it
look better now?

> ---
> A possible question could be: why not just limiting 'scaling_max_freq'?
> Well, the fundamental difference is that per-policy boost could be more
> user-friendly.  When global boost is enabled, it is not straightforward
> to figure out the base frequency for setting 'scaling_max_freq' to a
> non-boost value. Also, this is supposed to take effect on the physical
> upper frequency limit, reflected through 'cpuinfo_max_freq'.
>
> v1->v2:
> - Rename the interface from 'local_boost' to 'boost'.
> - Illegalize writing 0 to per-policy even if global boost is off.
> - Show the per-policy 'boost' file only when ->set_boost() is available.
>
> v1: https://lore.kernel.org/linux-pm/20230724075827.4160512-1-zhanjie9@hisilicon.com/
>
>  drivers/cpufreq/cpufreq.c | 43 +++++++++++++++++++++++++++++++++++++++
>  include/linux/cpufreq.h   |  3 +++
>  2 files changed, 46 insertions(+)
>
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index 50bbc969ffe5..81e21fa070e1 100644
> --- a/drivers/cpufreq/cpufreq.c
> +++ b/drivers/cpufreq/cpufreq.c
> @@ -86,6 +86,7 @@ static void cpufreq_governor_limits(struct cpufreq_policy *policy);
>  static int cpufreq_set_policy(struct cpufreq_policy *policy,
>                               struct cpufreq_governor *new_gov,
>                               unsigned int new_pol);
> +static bool cpufreq_boost_supported(void);
>
>  /*
>   * Two notifier lists: the "policy" list is involved in the
> @@ -621,6 +622,40 @@ static ssize_t store_boost(struct kobject *kobj, struct kobj_attribute *attr,
>  }
>  define_one_global_rw(boost);
>
> +static ssize_t show_local_boost(struct cpufreq_policy *policy, char *buf)
> +{
> +       return sysfs_emit(buf, "%d\n", policy->boost_enabled);
> +}
> +
> +static ssize_t store_local_boost(struct cpufreq_policy *policy,
> +                                const char *buf, size_t count)
> +{
> +       int ret, enable;
> +
> +       ret = kstrtoint(buf, 10, &enable);
> +       if (ret || enable < 0 || enable > 1)
> +               return -EINVAL;
> +
> +       if (!cpufreq_driver->boost_enabled)
> +               return -EINVAL;
> +
> +       if (policy->boost_enabled == enable)
> +               return count;
> +
> +       cpus_read_lock();
> +       ret = cpufreq_driver->set_boost(policy, enable);
> +       cpus_read_unlock();
> +
> +       if (ret)
> +               return ret;
> +
> +       policy->boost_enabled = enable;
> +
> +       return count;
> +}
> +
> +static struct freq_attr local_boost = __ATTR(boost, 0644, show_local_boost, store_local_boost);
> +
>  static struct cpufreq_governor *find_governor(const char *str_governor)
>  {
>         struct cpufreq_governor *t;
> @@ -1055,6 +1090,12 @@ static int cpufreq_add_dev_interface(struct cpufreq_policy *policy)
>                         return ret;
>         }
>
> +       if (cpufreq_boost_supported()) {
> +               ret = sysfs_create_file(&policy->kobj, &local_boost.attr);
> +               if (ret)
> +                       return ret;
> +       }
> +
>         return 0;
>  }
>
> @@ -2716,6 +2757,8 @@ int cpufreq_boost_trigger_state(int state)
>                 ret = cpufreq_driver->set_boost(policy, state);
>                 if (ret)
>                         goto err_reset_state;
> +
> +               policy->boost_enabled = state;
>         }
>         cpus_read_unlock();
>
> diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
> index 172ff51c1b2a..fa02f2fa88c4 100644
> --- a/include/linux/cpufreq.h
> +++ b/include/linux/cpufreq.h
> @@ -140,6 +140,9 @@ struct cpufreq_policy {
>          */
>         bool                    dvfs_possible_from_any_cpu;
>
> +       /* Per policy boost enabled flag. */
> +       bool                    boost_enabled;
> +
>          /* Cached frequency lookup from cpufreq_driver_resolve_freq. */
>         unsigned int cached_target_freq;
>         unsigned int cached_resolved_idx;
> --
> 2.30.0
>