Commit 1cd0cd53 authored by wangsirong's avatar wangsirong Committed by Zheng Zengkai
Browse files

RDMA/hns: Reorganize hns_roce_create_cq() 

mainline inclusion
from mainline-v5.13-rc1
commit d102a6e3
category: bugfix
bugzilla: 174002
CVE:NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d102a6e3748474074d0610bc144979a20e328c3e

----------------------------------------------------------------------

Encapsulate two subprocesses into functions.

Link: https://lore.kernel.org/r/1616815294-13434-3-git-send-email-liweihang@huawei.com


Signed-off-by: default avatarYixing Liu <liuyixing1@huawei.com>
Signed-off-by: default avatarWeihang Li <liweihang@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarwangsirong <wangsirong@huawei.com>

Reviewed-by: default avatarChunZhi Hu <huchunzhi@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 1381d036

drivers/infiniband/hw/hns/hns_roce_cq.c

+61 −27
Original line number Diff line number Diff line
@@ -276,6 +276,57 @@ static void free_cq_db(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, 
	}

}



static int verify_cq_create_attr(struct hns_roce_dev *hr_dev,

				 const struct ib_cq_init_attr *attr)

{

	struct ib_device *ibdev = &hr_dev->ib_dev;



	if (!attr->cqe || attr->cqe > hr_dev->caps.max_cqes) {

		ibdev_err(ibdev, "failed to check CQ count %u, max = %u.\n",

			  attr->cqe, hr_dev->caps.max_cqes);

		return -EINVAL;

	}



	if (attr->comp_vector >= hr_dev->caps.num_comp_vectors) {

		ibdev_err(ibdev, "failed to check CQ vector = %u, max = %d.\n",

			  attr->comp_vector, hr_dev->caps.num_comp_vectors);

		return -EINVAL;

	}



	return 0;

}



static int get_cq_ucmd(struct hns_roce_cq *hr_cq, struct ib_udata *udata,

		       struct hns_roce_ib_create_cq *ucmd)

{

	struct ib_device *ibdev = hr_cq->ib_cq.device;

	int ret;



	ret = ib_copy_from_udata(ucmd, udata, min(udata->inlen, sizeof(*ucmd)));

	if (ret) {

		ibdev_err(ibdev, "failed to copy CQ udata, ret = %d.\n", ret);

		return ret;

	}



	return 0;

}



static void set_cq_param(struct hns_roce_cq *hr_cq, u32 cq_entries, int vector,

			 struct hns_roce_ib_create_cq *ucmd)

{

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



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

	cq_entries = roundup_pow_of_two(cq_entries);

	hr_cq->ib_cq.cqe = cq_entries - 1; /* used as cqe index */

	hr_cq->cq_depth = cq_entries;

	hr_cq->vector = vector;



	spin_lock_init(&hr_cq->lock);

	INIT_LIST_HEAD(&hr_cq->sq_list);

	INIT_LIST_HEAD(&hr_cq->rq_list);

}



static void set_cqe_size(struct hns_roce_cq *hr_cq, struct ib_udata *udata,

			 struct hns_roce_ib_create_cq *ucmd)

{
@@ -299,40 +350,23 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, 
	struct hns_roce_cq *hr_cq = to_hr_cq(ib_cq);

	struct ib_device *ibdev = &hr_dev->ib_dev;

	struct hns_roce_ib_create_cq ucmd = {};

	int vector = attr->comp_vector;

	u32 cq_entries = attr->cqe;

	int ret;



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

		ibdev_err(ibdev, "Failed to check CQ count %d max = %u\n",

			  cq_entries, hr_dev->caps.max_cqes);

		return -EINVAL;

	}

	if (attr->flags)

		return -EOPNOTSUPP;



	if (vector >= hr_dev->caps.num_comp_vectors) {

		ibdev_err(ibdev, "Failed to check CQ vector=%d max=%d\n",

			  vector, hr_dev->caps.num_comp_vectors);

		return -EINVAL;

	}



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

	cq_entries = roundup_pow_of_two(cq_entries);

	hr_cq->ib_cq.cqe = cq_entries - 1; /* used as cqe index */

	hr_cq->cq_depth = cq_entries;

	hr_cq->vector = vector;

	spin_lock_init(&hr_cq->lock);

	INIT_LIST_HEAD(&hr_cq->sq_list);

	INIT_LIST_HEAD(&hr_cq->rq_list);

	ret = verify_cq_create_attr(hr_dev, attr);

	if (ret)

		return ret;



	if (udata) {

		ret = ib_copy_from_udata(&ucmd, udata,

					 min(udata->inlen, sizeof(ucmd)));

		if (ret) {

			ibdev_err(ibdev, "failed to copy CQ udata, ret = %d.\n",

				  ret);

		ret = get_cq_ucmd(hr_cq, udata, &ucmd);

		if (ret)

			return ret;



	}

	}



	set_cq_param(hr_cq, attr->cqe, attr->comp_vector, &ucmd);



	set_cqe_size(hr_cq, udata, &ucmd);