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

Commit aa4eaed7 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Roland Dreier
Browse files

IB/ipath: Lock and count allocated CQs properly 



Signed-off-by: default avatarBryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 11b054fe

drivers/infiniband/hw/ipath/ipath_cq.c

+12 −6
Original line number Original line Diff line number Diff line
@@ -177,11 +177,6 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries, 
		goto done;

		goto done;

	}

	}





	if (dev->n_cqs_allocated == ib_ipath_max_cqs) {

		ret = ERR_PTR(-ENOMEM);

		goto done;

	}



	/* Allocate the completion queue structure. */

	/* Allocate the completion queue structure. */

	cq = kmalloc(sizeof(*cq), GFP_KERNEL);

	cq = kmalloc(sizeof(*cq), GFP_KERNEL);

	if (!cq) {

	if (!cq) {
@@ -237,6 +232,16 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries, 
	} else

	} else

		cq->ip = NULL;

		cq->ip = NULL;





	spin_lock(&dev->n_cqs_lock);

	if (dev->n_cqs_allocated == ib_ipath_max_cqs) {

		spin_unlock(&dev->n_cqs_lock);

		ret = ERR_PTR(-ENOMEM);

		goto bail_wc;

	}



	dev->n_cqs_allocated++;

	spin_unlock(&dev->n_cqs_lock);



	/*

	/*

	 * ib_create_cq() will initialize cq->ibcq except for cq->ibcq.cqe.

	 * ib_create_cq() will initialize cq->ibcq except for cq->ibcq.cqe.

	 * The number of entries should be >= the number requested or return

	 * The number of entries should be >= the number requested or return
@@ -253,7 +258,6 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries, 




	ret = &cq->ibcq;

	ret = &cq->ibcq;





	dev->n_cqs_allocated++;

	goto done;

	goto done;





bail_wc:

bail_wc:
@@ -280,7 +284,9 @@ int ipath_destroy_cq(struct ib_cq *ibcq) 
	struct ipath_cq *cq = to_icq(ibcq);

	struct ipath_cq *cq = to_icq(ibcq);





	tasklet_kill(&cq->comptask);

	tasklet_kill(&cq->comptask);

	spin_lock(&dev->n_cqs_lock);

	dev->n_cqs_allocated--;

	dev->n_cqs_allocated--;

	spin_unlock(&dev->n_cqs_lock);

	if (cq->ip)

	if (cq->ip)

		kref_put(&cq->ip->ref, ipath_release_mmap_info);

		kref_put(&cq->ip->ref, ipath_release_mmap_info);

	else

	else