kevin/linux
1
Fork 0
Code

powercap: DTPM: Fix missing cpufreq_cpu_put() calls

Browse Source 
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: 0aea2e4ec2 ("powercap/dtpm_cpu: Reset per_cpu variable in the release function")
Fixes: 0e8f68d7f0 ("powercap/drivers/dtpm: Add CPU energy model based support")
Cc: v5.16+ <stable@vger.kernel.org> # v5.16+
Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Lukasz Luba 2023-12-01 12:32:05 +00:00 committed by Rafael J. Wysocki
parent 33cc938e65
commit bdefd9913b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/powercap/dtpm_cpu.c
View File

@ -140,6 +140,8 @@ static void pd_release(struct dtpm *dtpm)
if (policy) { if (policy) {
for_each_cpu(dtpm_cpu->cpu, policy->related_cpus) for_each_cpu(dtpm_cpu->cpu, policy->related_cpus)
per_cpu(dtpm_per_cpu, dtpm_cpu->cpu) = NULL; per_cpu(dtpm_per_cpu, dtpm_cpu->cpu) = NULL;
cpufreq_cpu_put(policy);
} }
kfree(dtpm_cpu); kfree(dtpm_cpu);
@ -191,12 +193,16 @@ static int __dtpm_cpu_setup(int cpu, struct dtpm *parent)
return 0; return 0;
pd = em_cpu_get(cpu); pd = em_cpu_get(cpu);
if (!pd || em_is_artificial(pd)) if (!pd || em_is_artificial(pd)) {
return -EINVAL; ret = -EINVAL;
goto release_policy;
}
dtpm_cpu = kzalloc(sizeof(*dtpm_cpu), GFP_KERNEL); dtpm_cpu = kzalloc(sizeof(*dtpm_cpu), GFP_KERNEL);
if (!dtpm_cpu) if (!dtpm_cpu) {
return -ENOMEM; ret = -ENOMEM;
goto release_policy;
}
dtpm_init(&dtpm_cpu->dtpm, &dtpm_ops); dtpm_init(&dtpm_cpu->dtpm, &dtpm_ops);
dtpm_cpu->cpu = cpu; dtpm_cpu->cpu = cpu;
@ -216,6 +222,7 @@ static int __dtpm_cpu_setup(int cpu, struct dtpm *parent)
if (ret) if (ret)
goto out_dtpm_unregister; goto out_dtpm_unregister;
cpufreq_cpu_put(policy);
return 0; return 0;
out_dtpm_unregister: out_dtpm_unregister:
@ -227,6 +234,8 @@ out_kfree_dtpm_cpu:
per_cpu(dtpm_per_cpu, cpu) = NULL; per_cpu(dtpm_per_cpu, cpu) = NULL;
kfree(dtpm_cpu); kfree(dtpm_cpu);
release_policy:
cpufreq_cpu_put(policy);
return ret; return ret;
} }