Commit e671f0ec authored by Wenpeng Liang's avatar Wenpeng Liang Committed by Jason Gunthorpe
Browse files

RDMA/hns: Add the check of the CQE size of the user space 

If the CQE size of the user space is not the size supported by the
hardware, the creation of CQ should be stopped.

Fixes: 09a5f210 ("RDMA/hns: Add support for CQE in size of 64 Bytes")
Link: https://lore.kernel.org/r/20210927125557.15031-3-liangwenpeng@huawei.com


Signed-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent cc26aee1

drivers/infiniband/hw/hns/hns_roce_cq.c

+22 −9
Original line number Diff line number Diff line
@@ -326,19 +326,30 @@ static void set_cq_param(struct hns_roce_cq *hr_cq, u32 cq_entries, int vector, 
	INIT_LIST_HEAD(&hr_cq->rq_list);

}



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

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

			struct hns_roce_ib_create_cq *ucmd)

{

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



	if (udata) {

		if (udata->inlen >= offsetofend(typeof(*ucmd), cqe_size))

	if (!udata) {

		hr_cq->cqe_size = hr_dev->caps.cqe_sz;

		return 0;

	}



	if (udata->inlen >= offsetofend(typeof(*ucmd), cqe_size)) {

		if (ucmd->cqe_size != HNS_ROCE_V2_CQE_SIZE &&

		    ucmd->cqe_size != HNS_ROCE_V3_CQE_SIZE) {

			ibdev_err(&hr_dev->ib_dev,

				  "invalid cqe size %u.\n", ucmd->cqe_size);

			return -EINVAL;

		}



		hr_cq->cqe_size = ucmd->cqe_size;

		else

			hr_cq->cqe_size = HNS_ROCE_V2_CQE_SIZE;

	} else {

		hr_cq->cqe_size = hr_dev->caps.cqe_sz;

		hr_cq->cqe_size = HNS_ROCE_V2_CQE_SIZE;

	}



	return 0;

}



int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr,
@@ -366,7 +377,9 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, 


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



	set_cqe_size(hr_cq, udata, &ucmd);

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

	if (ret)

		return ret;



	ret = alloc_cq_buf(hr_dev, hr_cq, udata, ucmd.buf_addr);

	if (ret) {