Commit 3588c189 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jakub Kicinski

octeon_ep: Fix irq releasing in the error handling path of octep_request_irqs()

When taken, the error handling path does not undo correctly what has
already been allocated.

Introduce a new loop index, 'j', in order to simplify the error handling
path and rewrite part of it.
It is now written with the same logic and intermediate variables used
when resources are allocated. This is much more straightforward.

Fixes: 37d79d05 ("octeon_ep: add Tx/Rx processing and interrupt support")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4d3bf6fb
...@@ -202,7 +202,7 @@ static int octep_request_irqs(struct octep_device *oct) ...@@ -202,7 +202,7 @@ static int octep_request_irqs(struct octep_device *oct)
struct msix_entry *msix_entry; struct msix_entry *msix_entry;
char **non_ioq_msix_names; char **non_ioq_msix_names;
int num_non_ioq_msix; int num_non_ioq_msix;
int ret, i; int ret, i, j;
num_non_ioq_msix = CFG_GET_NON_IOQ_MSIX(oct->conf); num_non_ioq_msix = CFG_GET_NON_IOQ_MSIX(oct->conf);
non_ioq_msix_names = CFG_GET_NON_IOQ_MSIX_NAMES(oct->conf); non_ioq_msix_names = CFG_GET_NON_IOQ_MSIX_NAMES(oct->conf);
...@@ -233,23 +233,23 @@ static int octep_request_irqs(struct octep_device *oct) ...@@ -233,23 +233,23 @@ static int octep_request_irqs(struct octep_device *oct)
} }
/* Request IRQs for Tx/Rx queues */ /* Request IRQs for Tx/Rx queues */
for (i = 0; i < oct->num_oqs; i++) { for (j = 0; j < oct->num_oqs; j++) {
ioq_vector = oct->ioq_vector[i]; ioq_vector = oct->ioq_vector[j];
msix_entry = &oct->msix_entries[i + num_non_ioq_msix]; msix_entry = &oct->msix_entries[j + num_non_ioq_msix];
snprintf(ioq_vector->name, sizeof(ioq_vector->name), snprintf(ioq_vector->name, sizeof(ioq_vector->name),
"%s-q%d", netdev->name, i); "%s-q%d", netdev->name, j);
ret = request_irq(msix_entry->vector, ret = request_irq(msix_entry->vector,
octep_ioq_intr_handler, 0, octep_ioq_intr_handler, 0,
ioq_vector->name, ioq_vector); ioq_vector->name, ioq_vector);
if (ret) { if (ret) {
netdev_err(netdev, netdev_err(netdev,
"request_irq failed for Q-%d; err=%d", "request_irq failed for Q-%d; err=%d",
i, ret); j, ret);
goto ioq_irq_err; goto ioq_irq_err;
} }
cpumask_set_cpu(i % num_online_cpus(), cpumask_set_cpu(j % num_online_cpus(),
&ioq_vector->affinity_mask); &ioq_vector->affinity_mask);
irq_set_affinity_hint(msix_entry->vector, irq_set_affinity_hint(msix_entry->vector,
&ioq_vector->affinity_mask); &ioq_vector->affinity_mask);
...@@ -257,10 +257,13 @@ static int octep_request_irqs(struct octep_device *oct) ...@@ -257,10 +257,13 @@ static int octep_request_irqs(struct octep_device *oct)
return 0; return 0;
ioq_irq_err: ioq_irq_err:
while (i > num_non_ioq_msix) { while (j) {
--i; --j;
irq_set_affinity_hint(oct->msix_entries[i].vector, NULL); ioq_vector = oct->ioq_vector[j];
free_irq(oct->msix_entries[i].vector, oct->ioq_vector[i]); msix_entry = &oct->msix_entries[j + num_non_ioq_msix];
irq_set_affinity_hint(msix_entry->vector, NULL);
free_irq(msix_entry->vector, ioq_vector);
} }
non_ioq_irq_err: non_ioq_irq_err:
while (i) { while (i) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment