[PATCH v2] vdpa: solidrun: Free IRQs after request failure

[PATCH v2] vdpa: solidrun: Free IRQs after request failure

[Xiong Weimin]

Unwind IRQs already requested by snet_request_irqs() before returning a
VQ IRQ request error so a later DRIVER_OK retry starts from a clean
state. The IRQs are requested and freed while the PCI device remains
bound, so the driver cannot wait for devres cleanup at detach time.

Fixes: 51a8f9d7f587 ("virtio: vdpa: new SolidNET DPU driver.")
Cc: stable@vger.kernel.org # v6.3+
Signed-off-by: Xiong Weimin <xiongweimin@kylinos.cn>
---
v2:
- Keep the config IRQ request failure as a direct return
- Free already requested IRQs only after a VQ IRQ request failure
- Add Fixes and Cc: stable tags

 drivers/vdpa/solidrun/snet_main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/vdpa/solidrun/snet_main.c b/drivers/vdpa/solidrun/snet_main.c
index 28d55315d..3e2cea1e4 100644
--- a/drivers/vdpa/solidrun/snet_main.c
+++ b/drivers/vdpa/solidrun/snet_main.c
@@ -418,11 +418,15 @@ static int snet_request_irqs(struct pci_dev *pdev, struct snet *snet)
 				       snet->vqs[i]->irq_name, snet->vqs[i]);
 		if (ret) {
 			SNET_ERR(pdev, "Failed to request IRQ\n");
-			return ret;
+			goto err_free_irqs;
 		}
 		snet->vqs[i]->irq = irq;
 	}
 	return 0;
+
+err_free_irqs:
+	snet_free_irqs(snet);
+	return ret;
 }
 
 static void snet_set_status(struct vdpa_device *vdev, u8 status)
-- 
2.43.0

Re: [PATCH v2] vdpa: solidrun: Free IRQs after request failure

[Markus Elfring]

> Unwind IRQs already requested by snet_request_irqs() before returning a
> VQ IRQ request error so a later DRIVER_OK retry starts from a clean
> state. The IRQs are requested and freed while the PCI device remains
> bound, so the driver cannot wait for devres cleanup at detach time.

I suggest to avoid duplicate SNET_ERR() calls for the implementation
of the function “snet_request_irqs”.
https://elixir.bootlin.com/linux/v7.2-rc5/source/drivers/vdpa/solidrun/snet_main.c#L400-L426

Regards,
Markus