2021-08-03 09:10:34

by Lukasz Luba

Subject: [PATCH v2] cpufreq: arm_scmi: Fix error path when allocation failed

Stop the initialization when cpumask allocation failed and return an
error.

Fixes: 80a064dbd556 ("scmi-cpufreq: Get opp_shared_cpus from opp-v2 for EM")
Signed-off-by: Lukasz Luba <[email protected]>
---
changes:
v2:
- removed dev_warn() since it's not needed in this case
- adjusted the patch description

drivers/cpufreq/scmi-cpufreq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
index ec9a87ca2dbb..75f818d04b48 100644
--- a/drivers/cpufreq/scmi-cpufreq.c
+++ b/drivers/cpufreq/scmi-cpufreq.c
@@ -134,7 +134,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy)
}

if (!zalloc_cpumask_var(&opp_shared_cpus, GFP_KERNEL))
- ret = -ENOMEM;
+ return -ENOMEM;

/* Obtain CPUs that share SCMI performance controls */
ret = scmi_get_sharing_cpus(cpu_dev, policy->cpus);
--
2.17.1

2021-08-03 22:47:59

by Sudeep Holla

Subject: Re: [PATCH v2] cpufreq: arm_scmi: Fix error path when allocation failed

On Tue, Aug 03, 2021 at 10:07:44AM +0100, Lukasz Luba wrote:
> Stop the initialization when cpumask allocation failed and return an
> error.
>

Good catch!

Reviewed-by: Sudeep Holla <[email protected]>

--
Regards,
Sudeep

2021-08-04 04:34:47

by Viresh Kumar

Subject: Re: [PATCH v2] cpufreq: arm_scmi: Fix error path when allocation failed

On 03-08-21, 10:07, Lukasz Luba wrote:
> Stop the initialization when cpumask allocation failed and return an
> error.
>
> Fixes: 80a064dbd556 ("scmi-cpufreq: Get opp_shared_cpus from opp-v2 for EM")
> Signed-off-by: Lukasz Luba <[email protected]>
> ---
> changes:
> v2:
> - removed dev_warn() since it's not needed in this case
> - adjusted the patch description
>
> drivers/cpufreq/scmi-cpufreq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
> index ec9a87ca2dbb..75f818d04b48 100644
> --- a/drivers/cpufreq/scmi-cpufreq.c
> +++ b/drivers/cpufreq/scmi-cpufreq.c
> @@ -134,7 +134,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy)
> }
>
> if (!zalloc_cpumask_var(&opp_shared_cpus, GFP_KERNEL))
> - ret = -ENOMEM;
> + return -ENOMEM;
>
> /* Obtain CPUs that share SCMI performance controls */
> ret = scmi_get_sharing_cpus(cpu_dev, policy->cpus);

Applied. Thanks.

--
viresh

2021-08-04 11:12:48

by Lukasz Luba

Subject: Re: [PATCH v2] cpufreq: arm_scmi: Fix error path when allocation failed

On 8/4/21 5:02 AM, Viresh Kumar wrote:
> On 03-08-21, 10:07, Lukasz Luba wrote:
>> Stop the initialization when cpumask allocation failed and return an
>> error.
>>
>> Fixes: 80a064dbd556 ("scmi-cpufreq: Get opp_shared_cpus from opp-v2 for EM")
>> Signed-off-by: Lukasz Luba <[email protected]>
>> ---
>> changes:
>> v2:
>> - removed dev_warn() since it's not needed in this case
>> - adjusted the patch description
>>
>> drivers/cpufreq/scmi-cpufreq.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/cpufreq/scmi-cpufreq.c b/drivers/cpufreq/scmi-cpufreq.c
>> index ec9a87ca2dbb..75f818d04b48 100644
>> --- a/drivers/cpufreq/scmi-cpufreq.c
>> +++ b/drivers/cpufreq/scmi-cpufreq.c
>> @@ -134,7 +134,7 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy)
>> }
>>
>> if (!zalloc_cpumask_var(&opp_shared_cpus, GFP_KERNEL))
>> - ret = -ENOMEM;
>> + return -ENOMEM;
>>
>> /* Obtain CPUs that share SCMI performance controls */
>> ret = scmi_get_sharing_cpus(cpu_dev, policy->cpus);
>
> Applied. Thanks.
>

Thank you for taking it.

2021-08-04 11:12:57

by Lukasz Luba

Subject: Re: [PATCH v2] cpufreq: arm_scmi: Fix error path when allocation failed

On 8/3/21 11:41 PM, Sudeep Holla wrote:
> On Tue, Aug 03, 2021 at 10:07:44AM +0100, Lukasz Luba wrote:
>> Stop the initialization when cpumask allocation failed and return an
>> error.
>>
>
> Good catch!
>
> Reviewed-by: Sudeep Holla <[email protected]>
>

Thank you for the review!