Commit 4f8f0d5e authored by Lijun Ou's avatar Lijun Ou Committed by Jason Gunthorpe
Browse files

RDMA/hns: Package the flow of creating cq 

Moves the related code of creating cq into separate functions in order to
improve comprehensibility.

Link: https://lore.kernel.org/r/1562593285-8037-2-git-send-email-oulijun@huawei.com


Signed-off-by: default avatarLijun Ou <oulijun@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent a5c9c299

drivers/infiniband/hw/hns/hns_roce_cq.c

+124 −62
Original line number Diff line number Diff line
@@ -298,40 +298,22 @@ static void hns_roce_ib_free_cq_buf(struct hns_roce_dev *hr_dev, 
			  &buf->hr_buf);

}



int hns_roce_ib_create_cq(struct ib_cq *ib_cq,

			  const struct ib_cq_init_attr *attr,

			  struct ib_udata *udata)

static int create_user_cq(struct hns_roce_dev *hr_dev,

			  struct hns_roce_cq *hr_cq,

			  struct ib_udata *udata,

			  struct hns_roce_ib_create_cq_resp *resp,

			  struct hns_roce_uar *uar,

			  int cq_entries)

{

	struct hns_roce_dev *hr_dev = to_hr_dev(ib_cq->device);

	struct device *dev = hr_dev->dev;

	struct hns_roce_ib_create_cq ucmd;

	struct hns_roce_ib_create_cq_resp resp = {};

	struct hns_roce_cq *hr_cq = to_hr_cq(ib_cq);

	struct hns_roce_uar *uar = NULL;

	int vector = attr->comp_vector;

	int cq_entries = attr->cqe;

	struct device *dev = hr_dev->dev;

	int ret;

	struct hns_roce_ucontext *context = rdma_udata_to_drv_context(

				   udata, struct hns_roce_ucontext, ibucontext);



	if (cq_entries < 1 || cq_entries > hr_dev->caps.max_cqes) {

		dev_err(dev, "Creat CQ failed. entries=%d, max=%d\n",

			cq_entries, hr_dev->caps.max_cqes);

		return -EINVAL;

	}



	if (hr_dev->caps.min_cqes)

		cq_entries = max(cq_entries, hr_dev->caps.min_cqes);



	cq_entries = roundup_pow_of_two((unsigned int)cq_entries);

	hr_cq->ib_cq.cqe = cq_entries - 1;

	spin_lock_init(&hr_cq->lock);



	if (udata) {

	if (ib_copy_from_udata(&ucmd, udata, sizeof(ucmd))) {

		dev_err(dev, "Failed to copy_from_udata.\n");

			ret = -EFAULT;

			goto err_cq;

		return -EFAULT;

	}



	/* Get user space address, write it into mtt table */
@@ -340,11 +322,11 @@ int hns_roce_ib_create_cq(struct ib_cq *ib_cq, 
				      cq_entries);

	if (ret) {

		dev_err(dev, "Failed to get_cq_umem.\n");

			goto err_cq;

		return ret;

	}



	if ((hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RECORD_DB) &&

		    (udata->outlen >= sizeof(resp))) {

	    (udata->outlen >= sizeof(*resp))) {

		ret = hns_roce_db_map_user(context, udata, ucmd.db_addr,

					   &hr_cq->db);

		if (ret) {
@@ -352,25 +334,40 @@ int hns_roce_ib_create_cq(struct ib_cq *ib_cq, 
			goto err_mtt;

		}

		hr_cq->db_en = 1;

			resp.cap_flags |= HNS_ROCE_SUPPORT_CQ_RECORD_DB;

		resp->cap_flags |= HNS_ROCE_SUPPORT_CQ_RECORD_DB;

	}



	/* Get user space parameters */

	uar = &context->uar;

	} else {



	return 0;



err_mtt:

	hns_roce_mtt_cleanup(hr_dev, &hr_cq->hr_buf.hr_mtt);

	ib_umem_release(hr_cq->umem);



	return ret;

}



static int create_kernel_cq(struct hns_roce_dev *hr_dev,

			    struct hns_roce_cq *hr_cq, struct hns_roce_uar *uar,

			    int cq_entries)

{

	struct device *dev = hr_dev->dev;

	int ret;



	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RECORD_DB) {

		ret = hns_roce_alloc_db(hr_dev, &hr_cq->db, 1);

		if (ret)

				goto err_cq;

			return ret;



		hr_cq->set_ci_db = hr_cq->db.db_record;

		*hr_cq->set_ci_db = 0;

		hr_cq->db_en = 1;

	}



		/* Init mmt table and write buff address to mtt table */

		ret = hns_roce_ib_alloc_cq_buf(hr_dev, &hr_cq->hr_buf,

					       cq_entries);

	/* Init mtt table and write buff address to mtt table */

	ret = hns_roce_ib_alloc_cq_buf(hr_dev, &hr_cq->hr_buf, cq_entries);

	if (ret) {

		dev_err(dev, "Failed to alloc_cq_buf.\n");

		goto err_db;
@@ -379,6 +376,81 @@ int hns_roce_ib_create_cq(struct ib_cq *ib_cq, 
	uar = &hr_dev->priv_uar;

	hr_cq->cq_db_l = hr_dev->reg_base + hr_dev->odb_offset +

			 DB_REG_OFFSET * uar->index;



	return 0;



err_db:

	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RECORD_DB)

		hns_roce_free_db(hr_dev, &hr_cq->db);



	return ret;

}



static void destroy_user_cq(struct hns_roce_dev *hr_dev,

			    struct hns_roce_cq *hr_cq,

			    struct ib_udata *udata,

			    struct hns_roce_ib_create_cq_resp *resp)

{

	struct hns_roce_ucontext *context = rdma_udata_to_drv_context(

				   udata, struct hns_roce_ucontext, ibucontext);



	if ((hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RECORD_DB) &&

	    (udata->outlen >= sizeof(*resp)))

		hns_roce_db_unmap_user(context, &hr_cq->db);



	hns_roce_mtt_cleanup(hr_dev, &hr_cq->hr_buf.hr_mtt);

	ib_umem_release(hr_cq->umem);

}



static void destroy_kernel_cq(struct hns_roce_dev *hr_dev,

			      struct hns_roce_cq *hr_cq)

{

	hns_roce_mtt_cleanup(hr_dev, &hr_cq->hr_buf.hr_mtt);

	hns_roce_ib_free_cq_buf(hr_dev, &hr_cq->hr_buf, hr_cq->ib_cq.cqe);



	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RECORD_DB)

		hns_roce_free_db(hr_dev, &hr_cq->db);

}



int hns_roce_ib_create_cq(struct ib_cq *ib_cq,

			  const struct ib_cq_init_attr *attr,

			  struct ib_udata *udata)

{

	struct hns_roce_dev *hr_dev = to_hr_dev(ib_cq->device);

	struct device *dev = hr_dev->dev;

	struct hns_roce_ib_create_cq_resp resp = {};

	struct hns_roce_cq *hr_cq = to_hr_cq(ib_cq);

	struct hns_roce_uar *uar = NULL;

	int vector = attr->comp_vector;

	int cq_entries = attr->cqe;

	int ret;



	if (cq_entries < 1 || cq_entries > hr_dev->caps.max_cqes) {

		dev_err(dev, "Creat CQ failed. entries=%d, max=%d\n",

			cq_entries, hr_dev->caps.max_cqes);

		return -EINVAL;

	}



	if (hr_dev->caps.min_cqes)

		cq_entries = max(cq_entries, hr_dev->caps.min_cqes);



	cq_entries = roundup_pow_of_two((unsigned int)cq_entries);

	hr_cq->ib_cq.cqe = cq_entries - 1;

	spin_lock_init(&hr_cq->lock);



	if (udata) {

		ret = create_user_cq(hr_dev, hr_cq, udata, &resp, uar,

				     cq_entries);

		if (ret) {

			dev_err(dev, "Create cq failed in user mode!\n");

			goto err_cq;

		}

	} else {

		ret = create_kernel_cq(hr_dev, hr_cq, uar, cq_entries);

		if (ret) {

			dev_err(dev, "Create cq failed in kernel mode!\n");

			goto err_cq;

		}

	}



	/* Allocate cq index, fill cq_context */
@@ -416,20 +488,10 @@ err_cqc: 
	hns_roce_free_cq(hr_dev, hr_cq);



err_dbmap:

	if (udata && (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RECORD_DB) &&

	    (udata->outlen >= sizeof(resp)))

		hns_roce_db_unmap_user(context, &hr_cq->db);



err_mtt:

	hns_roce_mtt_cleanup(hr_dev, &hr_cq->hr_buf.hr_mtt);

	ib_umem_release(hr_cq->umem);

	if (!udata)

		hns_roce_ib_free_cq_buf(hr_dev, &hr_cq->hr_buf,

					hr_cq->ib_cq.cqe);



err_db:

	if (!udata && (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_RECORD_DB))

		hns_roce_free_db(hr_dev, &hr_cq->db);

	if (udata)

		destroy_user_cq(hr_dev, hr_cq, udata, &resp);

	else

		destroy_kernel_cq(hr_dev, hr_cq);



err_cq:

	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE