Commit 5be3bbe7 authored by Chengchang Tang's avatar Chengchang Tang Committed by Zheng Zengkai
Browse files

RDMA/hns: Alloc MTR memory before alloc_mtt() 

driver inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5Y79T



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

MTR memory allocation do not depend on allocation of MTT. And MTT
allocation can be adjusted according to MTR, so make MTR allocation
before MTT allocation.

Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Reviewed-by: default avatarYangyang Li <liyangyang20@huawei.com>
Reviewed-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 47968dd6

drivers/infiniband/hw/hns/hns_roce_mr.c

+20 −15
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ static int mtr_alloc_bufs(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, 
		mtr->umem = NULL;

		mtr->kmem = hns_roce_buf_alloc(hr_dev, total_size,

					       buf_attr->page_shift,

					       mtr->hem_cfg.is_direct ?

					       !mtr_has_mtt(buf_attr) ?

					       HNS_ROCE_BUF_DIRECT : 0);

		if (IS_ERR(mtr->kmem)) {

			ibdev_err(ibdev, "failed to alloc kmem, ret = %ld.\n",
@@ -977,18 +977,27 @@ int hns_roce_mtr_create(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, 
			unsigned int ba_page_shift, struct ib_udata *udata,

			unsigned long user_addr)

{

	u64 pgoff = udata ? user_addr & ~PAGE_MASK : 0;

	struct ib_device *ibdev = &hr_dev->ib_dev;

	int ret;



	ret = mtr_init_buf_cfg(hr_dev, buf_attr, &mtr->hem_cfg,

			       udata ? user_addr & ~PAGE_MASK : 0);

	if (ret)

	if (!buf_attr->mtt_only) {

		ret = mtr_alloc_bufs(hr_dev, mtr, buf_attr, udata, user_addr);

		if (ret) {

			ibdev_err(ibdev,

				  "failed to alloc mtr bufs, ret = %d.\n", ret);

			return ret;

		}

	}



	ret = mtr_init_buf_cfg(hr_dev, buf_attr, &mtr->hem_cfg, pgoff);

	if (ret)

		goto err_init_buf;



	ret = mtr_alloc_mtt(hr_dev, mtr, ba_page_shift);

	if (ret) {

		ibdev_err(ibdev, "failed to alloc mtr mtt, ret = %d.\n", ret);

		return ret;

		goto err_init_buf;

	}



	/* The caller has its own buffer list and invokes the hns_roce_mtr_map()
@@ -1000,22 +1009,18 @@ int hns_roce_mtr_create(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, 
		return 0;

	}



	ret = mtr_alloc_bufs(hr_dev, mtr, buf_attr, udata, user_addr);

	if (ret) {

		ibdev_err(ibdev, "failed to alloc mtr bufs, ret = %d.\n", ret);

		goto err_alloc_mtt;

	}



	/* Write buffer's dma address to MTT */

	ret = mtr_map_bufs(hr_dev, mtr);

	if (ret)

	if (ret) {

		ibdev_err(ibdev, "failed to map mtr bufs, ret = %d.\n", ret);

	else

		goto err_alloc_mtt;

	}

	return 0;



	mtr_free_bufs(hr_dev, mtr);

err_alloc_mtt:

	mtr_free_mtt(hr_dev, mtr);

err_init_buf:

	mtr_free_bufs(hr_dev, mtr);

	return ret;

}