Skip to contentSkip to conversation

RDMA/efa: Reset device on probe failure

PATCH Applied Michael Margolin 3 participants 4 messages Dec 25, 2024 – Dec 30, 2024

Subsystems (2)
lore
Share & tools
lore

Michael Margolin

author maintainer
#0 lore raw

PATCH 1/1 RDMA/efa: Reset device on probe failure

Make sure the device is being reset on driver exit whatever the reason is, to keep the device aligned and allow it to close shared resources (e.g. admin queue).

---
 drivers/infiniband/hw/efa/efa_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/infiniband/hw/efa/efa_main.c +4 -4
index ad225823e6f2..0b102089e0ab 100644
@@ -470,7 +470,6 @@ static void efa_ib_device_remove(struct efa_dev *dev)
 	ibdev_info(&dev->ibdev, "Unregister ib device\n");
 	ib_unregister_device(&dev->ibdev);
 	efa_destroy_eqs(dev);
-	efa_com_dev_reset(&dev->edev, EFA_REGS_RESET_NORMAL);
 	efa_release_doorbell_bar(dev);
 }
 
@@ -643,12 +642,13 @@ static struct efa_dev *efa_probe_device(struct pci_dev *pdev)
 	return ERR_PTR(err);
 }
 
-static void efa_remove_device(struct pci_dev *pdev)
+static void efa_remove_device(struct pci_dev *pdev, bool on_error)
 {
 	struct efa_dev *dev = pci_get_drvdata(pdev);
 	struct efa_com_dev *edev;
 
 	edev = &dev->edev;
+	efa_com_dev_reset(edev, on_error ? EFA_REGS_RESET_INIT_ERR : EFA_REGS_RESET_NORMAL);
 	efa_com_admin_destroy(edev);
 	efa_free_irq(dev, &dev->admin_irq);
 	efa_disable_msix(dev);
@@ -676,7 +676,7 @@ static int efa_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	return 0;
 
 err_remove_device:
-	efa_remove_device(pdev);
+	efa_remove_device(pdev, true);
 	return err;
 }
 
@@ -685,7 +685,7 @@ static void efa_remove(struct pci_dev *pdev)
 	struct efa_dev *dev = pci_get_drvdata(pdev);
 
 	efa_ib_device_remove(dev);
-	efa_remove_device(pdev);
+	efa_remove_device(pdev, false);
 }
 
 static void efa_shutdown(struct pci_dev *pdev)
Signature · 1 line
2.40.1
reviewer
#1 lore raw

drivers/infiniband/hw/efa/efa_main.c static void efa_remove(struct pci_dev *pdev) · line 687

Quoted 12 lines · Michael Margolin

Make sure the device is being reset on driver exit whatever the reason is, to keep the device aligned and allow it to close shared resources (e.g. admin queue).

---

drivers/infiniband/hw/efa/efa_main.c +0 -0
@@ -685,7 +685,7 @@ static void efa_remove(struct pci_dev *pdev)
 	struct efa_dev *dev = pci_get_drvdata(pdev);
 
 	efa_ib_device_remove(dev);

This already calls efa_com_dev_reset(), you now perform double reset in the normal remove flow.

Quoted 3 lines
drivers/infiniband/hw/efa/efa_main.c +1 -1
-	efa_remove_device(pdev);
+	efa_remove_device(pdev, false);
 }
reviewer Reviewed-by
#2 lore raw
Quoted 12 lines · Gal Pressman
Quoted 11 lines · Michael Margolin

Make sure the device is being reset on driver exit whatever the reason is, to keep the device aligned and allow it to close shared resources (e.g. admin queue).

---

(quoted diff) +0 -0
@@ -685,7 +685,7 @@ static void efa_remove(struct pci_dev *pdev)
 	struct efa_dev *dev = pci_get_drvdata(pdev);
 
Quoted 4 lines

drivers/infiniband/hw/efa/efa_main.c static void efa_remove(struct pci_dev *pdev) · line 687

Quoted 1 line
drivers/infiniband/hw/efa/efa_main.c +0 -0
 	efa_ib_device_remove(dev);

This already calls efa_com_dev_reset(), you now perform double reset in the normal remove flow.

Sorry, I obviously missed the part that removed it from efa_ib_device_remove().

Quoted 4 lines
Quoted 4 lines
drivers/infiniband/hw/efa/efa_main.c +1 -1
-	efa_remove_device(pdev);
+	efa_remove_device(pdev, false);
 }