Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8b6c47a authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Roland Dreier
Browse files

IB/qib: Fix debugfs ordering issue with multiple HCAs 



The debugfs init code was incorrectly called before the idr mechanism
is used to get the unit number, so the dd->unit hasn't been
initialized.  This caused the unit relative directory creation to fail
after the first.

This patch moves the init for the debugfs stuff until after all of the
failures and after the unit number has been determined.

A bug in unwind code in qib_alloc_devdata() is also fixed.

Cc: <stable@vger.kernel.org>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent a2cb0eb8

drivers/infiniband/hw/qib/qib_init.c

+11 −14
Original line number Diff line number Diff line
@@ -1097,14 +1097,10 @@ struct qib_devdata *qib_alloc_devdata(struct pci_dev *pdev, size_t extra) 
	int ret;



	dd = (struct qib_devdata *) ib_alloc_device(sizeof(*dd) + extra);

	if (!dd) {

		dd = ERR_PTR(-ENOMEM);

		goto bail;

	}

	if (!dd)

		return ERR_PTR(-ENOMEM);



#ifdef CONFIG_DEBUG_FS

	qib_dbg_ibdev_init(&dd->verbs_dev);

#endif

	INIT_LIST_HEAD(&dd->list);



	idr_preload(GFP_KERNEL);

	spin_lock_irqsave(&qib_devs_lock, flags);
@@ -1121,11 +1117,6 @@ struct qib_devdata *qib_alloc_devdata(struct pci_dev *pdev, size_t extra) 
	if (ret < 0) {

		qib_early_err(&pdev->dev,

			      "Could not allocate unit ID: error %d\n", -ret);

#ifdef CONFIG_DEBUG_FS

		qib_dbg_ibdev_exit(&dd->verbs_dev);

#endif

		ib_dealloc_device(&dd->verbs_dev.ibdev);

		dd = ERR_PTR(ret);

		goto bail;

	}
@@ -1139,9 +1130,15 @@ struct qib_devdata *qib_alloc_devdata(struct pci_dev *pdev, size_t extra) 
			qib_early_err(&pdev->dev,

				"Could not alloc cpulist info, cpu affinity might be wrong\n");

	}



bail:

#ifdef CONFIG_DEBUG_FS

	qib_dbg_ibdev_init(&dd->verbs_dev);

#endif

	return dd;

bail:

	if (!list_empty(&dd->list))

		list_del_init(&dd->list);

	ib_dealloc_device(&dd->verbs_dev.ibdev);

	return ERR_PTR(ret);;

}



/*