Commit bdefd991 authored by Lukasz Luba's avatar Lukasz Luba Committed by Rafael J. Wysocki
Browse files

powercap: DTPM: Fix missing cpufreq_cpu_put() calls 



The policy returned by cpufreq_cpu_get() has to be released with
the help of cpufreq_cpu_put() to balance its kobject reference counter
properly.

Add the missing calls to cpufreq_cpu_put() in the code.

Fixes: 0aea2e4e ("powercap/dtpm_cpu: Reset per_cpu variable in the release function")
Fixes: 0e8f68d7 ("powercap/drivers/dtpm: Add CPU energy model based support")
Cc: v5.16+ <stable@vger.kernel.org> # v5.16+
Signed-off-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 33cc938e

drivers/powercap/dtpm_cpu.c

+13 −4
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ static void pd_release(struct dtpm *dtpm) 
	if (policy) {

		for_each_cpu(dtpm_cpu->cpu, policy->related_cpus)

			per_cpu(dtpm_per_cpu, dtpm_cpu->cpu) = NULL;



		cpufreq_cpu_put(policy);

	}

	

	kfree(dtpm_cpu);
@@ -191,12 +193,16 @@ static int __dtpm_cpu_setup(int cpu, struct dtpm *parent) 
		return 0;



	pd = em_cpu_get(cpu);

	if (!pd || em_is_artificial(pd))

		return -EINVAL;

	if (!pd || em_is_artificial(pd)) {

		ret = -EINVAL;

		goto release_policy;

	}



	dtpm_cpu = kzalloc(sizeof(*dtpm_cpu), GFP_KERNEL);

	if (!dtpm_cpu)

		return -ENOMEM;

	if (!dtpm_cpu) {

		ret = -ENOMEM;

		goto release_policy;

	}



	dtpm_init(&dtpm_cpu->dtpm, &dtpm_ops);

	dtpm_cpu->cpu = cpu;
@@ -216,6 +222,7 @@ static int __dtpm_cpu_setup(int cpu, struct dtpm *parent) 
	if (ret)

		goto out_dtpm_unregister;



	cpufreq_cpu_put(policy);

	return 0;



out_dtpm_unregister:
@@ -227,6 +234,8 @@ static int __dtpm_cpu_setup(int cpu, struct dtpm *parent) 
		per_cpu(dtpm_per_cpu, cpu) = NULL;

	kfree(dtpm_cpu);



release_policy:

	cpufreq_cpu_put(policy);

	return ret;

}