RE: [EXT] Re: [PATCH 1/2] net/iucv: Improve unlocking in iucv_enable()

From: Suman Ghosh
Date: Tue Jan 02 2024 - 03:28:08 EST


>>> if (cpumask_empty(&iucv_buffer_cpumask))
>>> /* No cpu could declare an iucv buffer. */
>>> goto out;
>>> +
>>> + rc = 0;
>>> +unlock:
>>> cpus_read_unlock();
>>> - return 0;
>>> + return rc;
>>> +
>>> out:
>>> kfree(iucv_path_table);
>>> iucv_path_table = NULL;
>>> - cpus_read_unlock();
>>> - return rc;
>>> + goto unlock;
>> [Suman] This looks confusing. What is the issue with retaining the
>original change?
>
>I propose to reduce the number of cpus_read_unlock() calls (in the
>source code).
>
>Regards,
>Markus
[Suman] Then I think we should do something like this. Changing the code flow back-and-forth using "goto" does not seem correct.

static int iucv_enable(void)
{
size_t alloc_size;
int cpu, rc = 0;

cpus_read_lock();
alloc_size = iucv_max_pathid * sizeof(struct iucv_path);
iucv_path_table = kzalloc(alloc_size, GFP_KERNEL);
if (!iucv_path_table) {
rc = -ENOMEM;
goto out;
}

/* Declare per cpu buffers. */
for_each_online_cpu(cpu)
smp_call_function_single(cpu, iucv_declare_cpu, NULL, 1);
if (cpumask_empty(&iucv_buffer_cpumask))
/* No cpu could declare an iucv buffer. */
rc = -EIO;

out:
if (rc) {
kfree(iucv_path_table); //kfree is itself NULL protected. So, kzalloc failure should also be handled.
iucv_path_table = NULL;
}

cpus_read_unlock();
return rc;
}