2020-10-13 11:20:47

by Jing Xiangfeng

Subject: [PATCH] thunderbolt: Add the missed ida_simple_remove() in ring_request_msix()

ring_request_msix() misses to call ida_simple_remove() in an error path.
Add the missed function call to fix it.

Fixes: 046bee1f9ab8 ("thunderbolt: Add MSI-X support")
Signed-off-by: Jing Xiangfeng <[email protected]>
---
drivers/thunderbolt/nhi.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index 5f7489fa1327..7732e7a9942f 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -406,8 +406,10 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend)
ring->vector = ret;

ring->irq = pci_irq_vector(ring->nhi->pdev, ring->vector);
- if (ring->irq < 0)
+ if (ring->irq < 0) {
+ ida_simple_remove(&nhi->msix_ida, ret);
return ring->irq;
+ }

irqflags = no_suspend ? IRQF_NO_SUSPEND : 0;
return request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring);
--
2.17.1

2020-10-13 12:08:40

by Andy Shevchenko

Subject: Re: [PATCH] thunderbolt: Add the missed ida_simple_remove() in ring_request_msix()

On Tue, Oct 13, 2020 at 10:45:18AM +0800, Jing Xiangfeng wrote:
> ring_request_msix() misses to call ida_simple_remove() in an error path.
> Add the missed function call to fix it.

...

> ring->irq = pci_irq_vector(ring->nhi->pdev, ring->vector);
> - if (ring->irq < 0)
> + if (ring->irq < 0) {
> + ida_simple_remove(&nhi->msix_ida, ret);
> return ring->irq;
> + }
>
> irqflags = no_suspend ? IRQF_NO_SUSPEND : 0;
> return request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring);

According to your logic don't you need it here as well?

--
With Best Regards,
Andy Shevchenko

2020-10-13 16:28:12

by Jing Xiangfeng

Subject: Re: [PATCH] thunderbolt: Add the missed ida_simple_remove() in ring_request_msix()

On 2020/10/13 19:43, Andy Shevchenko wrote:
> On Tue, Oct 13, 2020 at 10:45:18AM +0800, Jing Xiangfeng wrote:
>> ring_request_msix() misses to call ida_simple_remove() in an error path.
>> Add the missed function call to fix it.
> ...
>
>> ring->irq = pci_irq_vector(ring->nhi->pdev, ring->vector);
>> - if (ring->irq < 0)
>> + if (ring->irq < 0) {
>> + ida_simple_remove(&nhi->msix_ida, ret);
>> return ring->irq;
>> + }
>>
>> irqflags = no_suspend ? IRQF_NO_SUSPEND : 0;
>> return request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring);
> According to your logic don't you need it here as well?
Hm indeed. Will fix too.

Thanks for your review.
>