Unverified Commit 8ab53135 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2782 cpufreq: Abort show()/store() for half-initialized policies 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjie Ruan <ruanjinjie@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2Z5I6NNCB2OJLC67LEU7HEAGSTHDJNNR/ 
Fix cpu offline but cat scaling_cur_freq is the same as online bug.

Schspa Shi (2):
  cpufreq: Abort show()/store() for half-initialized policies
  cpufreq: make interface functions and lock holding state clear


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I8EI9L 
 
Link:https://gitee.com/openeuler/kernel/pulls/2782

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents bcf0a9c4 b5f506af

drivers/cpufreq/cpufreq.c

+10 −7
Original line number Diff line number Diff line
@@ -946,12 +946,13 @@ static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf) 
{

	struct cpufreq_policy *policy = to_policy(kobj);

	struct freq_attr *fattr = to_attr(attr);

	ssize_t ret;

	ssize_t ret = -EBUSY;



	if (!fattr->show)

		return -EIO;



	down_read(&policy->rwsem);

	if (likely(!policy_is_inactive(policy)))

		ret = fattr->show(policy, buf);

	up_read(&policy->rwsem);
@@ -963,7 +964,7 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr, 
{

	struct cpufreq_policy *policy = to_policy(kobj);

	struct freq_attr *fattr = to_attr(attr);

	ssize_t ret = -EINVAL;

	ssize_t ret = -EBUSY;



	if (!fattr->store)

		return -EIO;
@@ -977,6 +978,7 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr, 


	if (cpu_online(policy->cpu)) {

		down_write(&policy->rwsem);

		if (likely(!policy_is_inactive(policy)))

			ret = fattr->store(policy, buf, count);

		up_write(&policy->rwsem);

	}
@@ -1335,12 +1337,12 @@ static int cpufreq_online(unsigned int cpu) 
		down_write(&policy->rwsem);

		policy->cpu = cpu;

		policy->governor = NULL;

		up_write(&policy->rwsem);

	} else {

		new_policy = true;

		policy = cpufreq_policy_alloc(cpu);

		if (!policy)

			return -ENOMEM;

		down_write(&policy->rwsem);

	}



	if (!new_policy && cpufreq_driver->online) {
@@ -1380,7 +1382,6 @@ static int cpufreq_online(unsigned int cpu) 
		cpumask_copy(policy->related_cpus, policy->cpus);

	}



	down_write(&policy->rwsem);

	/*

	 * affected cpus must always be the one, which are online. We aren't

	 * managing offline cpus here.
@@ -1515,7 +1516,7 @@ static int cpufreq_online(unsigned int cpu) 
	for_each_cpu(j, policy->real_cpus)

		remove_cpu_dev_symlink(policy, get_cpu_device(j));



	up_write(&policy->rwsem);

	cpumask_clear(policy->cpus);



out_offline_policy:

	if (cpufreq_driver->offline)
@@ -1526,6 +1527,8 @@ static int cpufreq_online(unsigned int cpu) 
		cpufreq_driver->exit(policy);



out_free_policy:

	up_write(&policy->rwsem);



	cpufreq_policy_free(policy);

	return ret;

}