arch_topology: Make cpu_capacity sysfs node as ready-only
Subsystems (2)
PATCH v2 1/1 arch_topology: Make cpu_capacity sysfs node as ready-only
If user updates any cpu's cpu_capacity, then the new value is going to be applied to all its online sibling cpus. But this need not to be correct always, as sibling cpus (in ARM, same micro architecture cpus) would have different cpu_capacity with different performance characteristics. So, updating the user supplied cpu_capacity to all cpu siblings is not correct.
And another problem is, current code assumes that 'all cpus in a cluster or with same package_id (core_siblings), would have same cpu_capacity'. But with commit '5bdd2b3f0f8 ("arm64: topology: add support to remove cpu topology sibling masks")', when a cpu hotplugged out, the cpu information gets cleared in its sibling cpus. So, user supplied cpu_capacity would be applied to only online sibling cpus at the time. After that, if any cpu hotplugged in, it would have different cpu_capacity than its siblings, which breaks the above assumption.
So, instead of mucking around the core sibling mask for user supplied value, use device-tree to set cpu capacity. And make the cpu_capacity node as read-only to know the asymmetry between cpus in the system. While at it, remove cpu_scale_mutex usage, which used for sysfs write protection.
drivers/base/arch_topology.c +1 -35
@@ -7,7 +7,6 @@*/ #include <linux/acpi.h> -#include <linux/arch_topology.h> #include <linux/cpu.h> #include <linux/cpufreq.h> #include <linux/device.h>
@@ -31,7 +30,6 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,per_cpu (freq_scale, i) = scale; } -static DEFINE_MUTEX (cpu_scale_mutex); DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;void topology_set_cpu_scale (unsigned int cpu,unsigned long capacity)
@@ -51,37 +49,7 @@ static ssize_t cpu_capacity_show(struct device *dev,static void update_topology_flags_workfn (struct work_struct *work); static DECLARE_WORK(update_topology_flags_work, update_topology_flags_workfn); -static ssize_t cpu_capacity_store (struct device *dev, -struct device_attribute *attr, -const char *buf, -size_t count) -{ - struct cpu *cpu = container_of(dev, struct cpu, dev); -int this_cpu = cpu->dev.id; -int i; -unsigned long new_capacity; -ssize_t ret; - -if (!count) -return 0 ; - - ret =kstrtoul (buf,0 , &new_capacity); -if (ret) -return ret; -if (new_capacity >SCHED_CAPACITY_SCALE ) -return -EINVAL ; - -mutex_lock (&cpu_scale_mutex); -for_each_cpu (i, &cpu_topology[this_cpu].core_sibling) -topology_set_cpu_scale (i, new_capacity); -mutex_unlock (&cpu_scale_mutex); - -schedule_work (&update_topology_flags_work); - -return count; -} - -static DEVICE_ATTR_RW (cpu_capacity); +static DEVICE_ATTR_RO (cpu_capacity);static int register_cpu_capacity_sysctl (void ) {
@@ -141,7 +109,6 @@ void topology_normalize_cpu_scale(void)return ;pr_debug ("cpu_capacity: capacity_scale=%u\n" , capacity_scale); -mutex_lock (&cpu_scale_mutex);for_each_possible_cpu (cpu) {pr_debug ("cpu_capacity: cpu=%d raw_capacity=%u\n" , cpu, raw_capacity[cpu]);
@@ -151,7 +118,6 @@ void topology_normalize_cpu_scale(void)pr_debug ("cpu_capacity: CPU%d cpu_capacity=%lu\n" , cpu,topology_get_cpu_scale (NULL , cpu)); } -mutex_unlock (&cpu_scale_mutex); }bool __init topology_parse_cpu_capacity (struct device_node *cpu_node,int cpu)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Thanks for making the change suggested.
Should not this be v3.
Please add version detail properly including what changes you made in which version after ---, that makes the patch easy to review.
Thanks.
Mukesh
Quoted 103 lines · Lingutla Chandrasekhar
If user updates any cpu's
cpu_capacity, then the new value is going to be applied to all its online sibling cpus. But this need not to be correct always, as sibling cpus (in ARM, same micro architecture cpus) would have differentcpu_capacitywith different performance characteristics. So, updating the user suppliedcpu_capacityto all cpu siblings is not correct.And another problem is, current code assumes that 'all cpus in a cluster or with same
package_id(core_siblings), would have samecpu_capacity'. But with commit '5bdd2b3f0f8("arm64: topology: add support to remove cpu topology sibling masks")', when a cpu hotplugged out, the cpu information gets cleared in its sibling cpus. So, user suppliedcpu_capacitywould be applied to only online sibling cpus at the time. After that, if any cpu hotplugged in, it would have differentcpu_capacitythan its siblings, which breaks the above assumption.So, instead of mucking around the core sibling mask for user supplied value, use device-tree to set cpu capacity. And make the
cpu_capacitynode as read-only to know the asymmetry between cpus in the system. While at it, removecpu_scale_mutexusage, which used for sysfs write protection.Tested-by Dietmar Eggemann <[email protected]>Tested-by Quentin Perret <[email protected]>Reviewed-by Quentin Perret <[email protected]>Acked-by Sudeep Holla <[email protected]>Signed-off-by Lingutla Chandrasekhar <[email protected]>drivers/base/arch_topology.c +1
-35@@ -7,7 +7,6 @@*/ #include <linux/acpi.h> -#include <linux/arch_topology.h> #include <linux/cpu.h> #include <linux/cpufreq.h> #include <linux/device.h> @@ -31,7 +30,6 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,per_cpu (freq_scale, i) = scale; } -static DEFINE_MUTEX (cpu_scale_mutex); DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;void topology_set_cpu_scale (unsigned int cpu,unsigned long capacity)@@ -51,37 +49,7 @@ static ssize_t cpu_capacity_show(struct device *dev,static void update_topology_flags_workfn (struct work_struct *work); static DECLARE_WORK(update_topology_flags_work, update_topology_flags_workfn); -static ssize_t cpu_capacity_store (struct device *dev, -struct device_attribute *attr, -const char *buf, -size_t count) -{ - struct cpu *cpu = container_of(dev, struct cpu, dev); -int this_cpu = cpu->dev.id; -int i; -unsigned long new_capacity; -ssize_t ret; - -if (!count) -return 0 ; - - ret =kstrtoul (buf,0 , &new_capacity); -if (ret) -return ret; -if (new_capacity >SCHED_CAPACITY_SCALE ) -return -EINVAL ; - -mutex_lock (&cpu_scale_mutex); -for_each_cpu (i, &cpu_topology[this_cpu].core_sibling) -topology_set_cpu_scale (i, new_capacity); -mutex_unlock (&cpu_scale_mutex); - -schedule_work (&update_topology_flags_work); - -return count; -} - -static DEVICE_ATTR_RW (cpu_capacity); +static DEVICE_ATTR_RO (cpu_capacity);static int register_cpu_capacity_sysctl (void ) {@@ -141,7 +109,6 @@ void topology_normalize_cpu_scale(void)return ;pr_debug ("cpu_capacity: capacity_scale=%u\n" , capacity_scale); -mutex_lock (&cpu_scale_mutex);for_each_possible_cpu (cpu) {pr_debug ("cpu_capacity: cpu=%d raw_capacity=%u\n" , cpu, raw_capacity[cpu]);@@ -151,7 +118,6 @@ void topology_normalize_cpu_scale(void)pr_debug ("cpu_capacity: CPU%d cpu_capacity=%lu\n" , cpu,topology_get_cpu_scale (NULL , cpu)); } -mutex_unlock (&cpu_scale_mutex); }bool __init topology_parse_cpu_capacity (struct device_node *cpu_node,int cpu)
Greg KH
maintainerQuoted 22 lines · Lingutla Chandrasekhar
If user updates any cpu's
cpu_capacity, then the new value is going to be applied to all its online sibling cpus. But this need not to be correct always, as sibling cpus (in ARM, same micro architecture cpus) would have differentcpu_capacitywith different performance characteristics. So, updating the user suppliedcpu_capacityto all cpu siblings is not correct.And another problem is, current code assumes that 'all cpus in a cluster or with same
package_id(core_siblings), would have samecpu_capacity'. But with commit '5bdd2b3f0f8("arm64: topology: add support to remove cpu topology sibling masks")', when a cpu hotplugged out, the cpu information gets cleared in its sibling cpus. So, user suppliedcpu_capacitywould be applied to only online sibling cpus at the time. After that, if any cpu hotplugged in, it would have differentcpu_capacitythan its siblings, which breaks the above assumption.So, instead of mucking around the core sibling mask for user supplied value, use device-tree to set cpu capacity. And make the
cpu_capacitynode as read-only to know the asymmetry between cpus in the system. While at it, removecpu_scale_mutexusage, which used for sysfs write protection.
Quoted 5 lines
Tested-by Dietmar Eggemann <[email protected]>Tested-by Quentin Perret <[email protected]>Reviewed-by Quentin Perret <[email protected]>Acked-by Sudeep Holla <[email protected]>Signed-off-by Lingutla Chandrasekhar <[email protected]>
I see 3 "v2" patches in my queue, all different :(
Also, you need to list what changed below the --- line as the documentation says to do so. Please fix up and resend v3.
thanks,
greg k-h