Commit 61918e9b authored by Yixing Liu's avatar Yixing Liu Committed by Jason Gunthorpe
Browse files

RDMA/hns: Fix inaccurate prints 

Some %d in print format string should be %u, and some prints miss the
useful errno or are in nonstandard format. Just fix above issues.

Link: https://lore.kernel.org/r/1607650657-35992-11-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>
parent dcdc366a

drivers/infiniband/hw/hns/hns_roce_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ int hns_roce_get_kmem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs, 
	end = start + buf_cnt;

	if (end > buf->npages) {

		dev_err(hr_dev->dev,

			"Failed to check kmem bufs, end %d + %d total %d!\n",

			"failed to check kmem bufs, end %d + %d total %u!\n",

			start, buf_cnt, buf->npages);

		return -EINVAL;

	}
@@ -282,7 +282,7 @@ int hns_roce_get_umem_bufs(struct hns_roce_dev *hr_dev, dma_addr_t *bufs, 
	u64 addr;



	if (page_shift < HNS_HW_PAGE_SHIFT) {

		dev_err(hr_dev->dev, "Failed to check umem page shift %d!\n",

		dev_err(hr_dev->dev, "failed to check umem page shift %u!\n",

			page_shift);

		return -EINVAL;

	}

drivers/infiniband/hw/hns/hns_roce_cq.c

+18 −17
Original line number Diff line number Diff line
@@ -49,29 +49,29 @@ static int alloc_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) 


	ret = hns_roce_mtr_find(hr_dev, &hr_cq->mtr, 0, mtts, ARRAY_SIZE(mtts),

				&dma_handle);

	if (ret < 1) {

		ibdev_err(ibdev, "Failed to find CQ mtr\n");

	if (!ret) {

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

		return -EINVAL;

	}



	cq_table = &hr_dev->cq_table;

	ret = hns_roce_bitmap_alloc(&cq_table->bitmap, &hr_cq->cqn);

	if (ret) {

		ibdev_err(ibdev, "Failed to alloc CQ bitmap, err %d\n", ret);

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

		return ret;

	}



	/* Get CQC memory HEM(Hardware Entry Memory) table */

	ret = hns_roce_table_get(hr_dev, &cq_table->table, hr_cq->cqn);

	if (ret) {

		ibdev_err(ibdev, "Failed to get CQ(0x%lx) context, err %d\n",

		ibdev_err(ibdev, "failed to get CQ(0x%lx) context, ret = %d.\n",

			  hr_cq->cqn, ret);

		goto err_out;

	}



	ret = xa_err(xa_store(&cq_table->array, hr_cq->cqn, hr_cq, GFP_KERNEL));

	if (ret) {

		ibdev_err(ibdev, "Failed to xa_store CQ\n");

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

		goto err_put;

	}
@@ -90,7 +90,7 @@ static int alloc_cqc(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq) 
	hns_roce_free_cmd_mailbox(hr_dev, mailbox);

	if (ret) {

		ibdev_err(ibdev,

			  "Failed to send create cmd for CQ(0x%lx), err %d\n",

			  "failed to send create cmd for CQ(0x%lx), ret = %d.\n",

			  hr_cq->cqn, ret);

		goto err_xa;

	}
@@ -146,7 +146,7 @@ static int alloc_cq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, 
{

	struct ib_device *ibdev = &hr_dev->ib_dev;

	struct hns_roce_buf_attr buf_attr = {};

	int err;

	int ret;



	buf_attr.page_shift = hr_dev->caps.cqe_buf_pg_sz + HNS_HW_PAGE_SHIFT;

	buf_attr.region[0].size = hr_cq->cq_depth * hr_cq->cqe_size;
@@ -154,13 +154,13 @@ static int alloc_cq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq, 
	buf_attr.region_count = 1;

	buf_attr.fixed_page = true;



	err = hns_roce_mtr_create(hr_dev, &hr_cq->mtr, &buf_attr,

	ret = hns_roce_mtr_create(hr_dev, &hr_cq->mtr, &buf_attr,

				  hr_dev->caps.cqe_ba_pg_sz + HNS_HW_PAGE_SHIFT,

				  udata, addr);

	if (err)

		ibdev_err(ibdev, "Failed to alloc CQ mtr, err %d\n", err);

	if (ret)

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



	return err;

	return ret;

}



static void free_cq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_cq *hr_cq)
@@ -254,13 +254,13 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, 
		return -EOPNOTSUPP;



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

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

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

			  cq_entries, hr_dev->caps.max_cqes);

		return -EINVAL;

	}



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

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

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

			  vector, hr_dev->caps.num_comp_vectors);

		return -EINVAL;

	}
@@ -278,7 +278,7 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, 
		ret = ib_copy_from_udata(&ucmd, udata,

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

		if (ret) {

			ibdev_err(ibdev, "Failed to copy CQ udata, err %d\n",

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

				  ret);

			return ret;

		}
@@ -288,19 +288,20 @@ int hns_roce_create_cq(struct ib_cq *ib_cq, const struct ib_cq_init_attr *attr, 


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

	if (ret) {

		ibdev_err(ibdev, "Failed to alloc CQ buf, err %d\n", ret);

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

		return ret;

	}



	ret = alloc_cq_db(hr_dev, hr_cq, udata, ucmd.db_addr, &resp);

	if (ret) {

		ibdev_err(ibdev, "Failed to alloc CQ db, err %d\n", ret);

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

		goto err_cq_buf;

	}



	ret = alloc_cqc(hr_dev, hr_cq);

	if (ret) {

		ibdev_err(ibdev, "Failed to alloc CQ context, err %d\n", ret);

		ibdev_err(ibdev,

			  "failed to alloc CQ context, ret = %d.\n", ret);

		goto err_cq_db;

	}

drivers/infiniband/hw/hns/hns_roce_hem.c

+9 −9
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static int get_hem_table_config(struct hns_roce_dev *hr_dev, 
		mhop->hop_num = hr_dev->caps.gmv_hop_num;

		break;

	default:

		dev_err(dev, "Table %d not support multi-hop addressing!\n",

		dev_err(dev, "table %u not support multi-hop addressing!\n",

			type);

		return -EINVAL;

	}
@@ -243,7 +243,7 @@ int hns_roce_calc_hem_mhop(struct hns_roce_dev *hr_dev, 
		mhop->l0_idx = table_idx;

		break;

	default:

		dev_err(dev, "Table %d not support hop_num = %d!\n",

		dev_err(dev, "table %u not support hop_num = %u!\n",

			table->type, mhop->hop_num);

		return -EINVAL;

	}
@@ -449,13 +449,13 @@ static int calc_hem_config(struct hns_roce_dev *hr_dev, 
		index->buf = l0_idx;

		break;

	default:

		ibdev_err(ibdev, "Table %d not support mhop.hop_num = %d!\n",

		ibdev_err(ibdev, "table %u not support mhop.hop_num = %u!\n",

			  table->type, mhop->hop_num);

		return -EINVAL;

	}



	if (unlikely(index->buf >= table->num_hem)) {

		ibdev_err(ibdev, "Table %d exceed hem limt idx %llu,max %lu!\n",

		ibdev_err(ibdev, "table %u exceed hem limt idx %llu, max %lu!\n",

			  table->type, index->buf, table->num_hem);

		return -EINVAL;

	}
@@ -725,15 +725,15 @@ static void clear_mhop_hem(struct hns_roce_dev *hr_dev, 
			step_idx = hop_num;



		if (hr_dev->hw->clear_hem(hr_dev, table, obj, step_idx))

			ibdev_warn(ibdev, "Clear hop%d HEM failed.\n", hop_num);

			ibdev_warn(ibdev, "failed to clear hop%u HEM.\n", hop_num);



		if (index->inited & HEM_INDEX_L1)

			if (hr_dev->hw->clear_hem(hr_dev, table, obj, 1))

				ibdev_warn(ibdev, "Clear HEM step 1 failed.\n");

				ibdev_warn(ibdev, "failed to clear HEM step 1.\n");



		if (index->inited & HEM_INDEX_L0)

			if (hr_dev->hw->clear_hem(hr_dev, table, obj, 0))

				ibdev_warn(ibdev, "Clear HEM step 0 failed.\n");

				ibdev_warn(ibdev, "failed to clear HEM step 0.\n");

	}

}
@@ -1249,7 +1249,7 @@ static int hem_list_alloc_mid_bt(struct hns_roce_dev *hr_dev, 
	}



	if (offset < r->offset) {

		dev_err(hr_dev->dev, "invalid offset %d,min %d!\n",

		dev_err(hr_dev->dev, "invalid offset %d, min %u!\n",

			offset, r->offset);

		return -EINVAL;

	}

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+15 −15
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static int check_send_valid(struct hns_roce_dev *hr_dev, 
	} else if (unlikely(hr_qp->state == IB_QPS_RESET ||

		   hr_qp->state == IB_QPS_INIT ||

		   hr_qp->state == IB_QPS_RTR)) {

		ibdev_err(ibdev, "failed to post WQE, QP state %d!\n",

		ibdev_err(ibdev, "failed to post WQE, QP state %hhu!\n",

			  hr_qp->state);

		return -EINVAL;

	} else if (unlikely(hr_dev->state >= HNS_ROCE_DEVICE_STATE_RST_DOWN)) {
@@ -680,7 +680,7 @@ static int hns_roce_v2_post_send(struct ib_qp *ibqp, 
		wqe_idx = (qp->sq.head + nreq) & (qp->sq.wqe_cnt - 1);



		if (unlikely(wr->num_sge > qp->sq.max_gs)) {

			ibdev_err(ibdev, "num_sge=%d > qp->sq.max_gs=%d\n",

			ibdev_err(ibdev, "num_sge = %d > qp->sq.max_gs = %u.\n",

				  wr->num_sge, qp->sq.max_gs);

			ret = -EINVAL;

			*bad_wr = wr;
@@ -765,7 +765,7 @@ static int hns_roce_v2_post_recv(struct ib_qp *ibqp, 
		wqe_idx = (hr_qp->rq.head + nreq) & (hr_qp->rq.wqe_cnt - 1);



		if (unlikely(wr->num_sge > hr_qp->rq.max_gs)) {

			ibdev_err(ibdev, "rq:num_sge=%d >= qp->sq.max_gs=%d\n",

			ibdev_err(ibdev, "num_sge = %d >= max_sge = %u.\n",

				  wr->num_sge, hr_qp->rq.max_gs);

			ret = -EINVAL;

			*bad_wr = wr;
@@ -1950,7 +1950,7 @@ static void calc_pg_sz(u32 obj_num, u32 obj_size, u32 hop_num, u32 ctx_bt_num, 
		obj_per_chunk = ctx_bt_num * obj_per_chunk_default;

		break;

	default:

		pr_err("Table %d not support hop_num = %d!\n", hem_type,

		pr_err("table %u not support hop_num = %u!\n", hem_type,

		       hop_num);

		return;

	}
@@ -3683,7 +3683,7 @@ static int get_op_for_set_hem(struct hns_roce_dev *hr_dev, u32 type, 
		break;

	default:

		dev_warn(hr_dev->dev,

			 "Table %d not to be written by mailbox!\n", type);

			 "table %u not to be written by mailbox!\n", type);

		return -EINVAL;

	}
@@ -3819,7 +3819,7 @@ static int hns_roce_v2_clear_hem(struct hns_roce_dev *hr_dev, 
	case HEM_TYPE_GMV:

		return 0;

	default:

		dev_warn(dev, "Table %d not to be destroyed by mailbox!\n",

		dev_warn(dev, "table %u not to be destroyed by mailbox!\n",

			 table->type);

		return 0;

	}
@@ -4411,7 +4411,7 @@ static int modify_qp_rtr_to_rts(struct ib_qp *ibqp, 


	ret = config_qp_sq_buf(hr_dev, hr_qp, context, qpc_mask);

	if (ret) {

		ibdev_err(ibdev, "failed to config sq buf, ret %d\n", ret);

		ibdev_err(ibdev, "failed to config sq buf, ret = %d.\n", ret);

		return ret;

	}
@@ -4902,7 +4902,7 @@ static int hns_roce_v2_modify_qp(struct ib_qp *ibqp, 
	/* SW pass context to HW */

	ret = hns_roce_v2_qp_modify(hr_dev, context, qpc_mask, hr_qp);

	if (ret) {

		ibdev_err(ibdev, "failed to modify QP, ret = %d\n", ret);

		ibdev_err(ibdev, "failed to modify QP, ret = %d.\n", ret);

		goto out;

	}
@@ -4995,7 +4995,7 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, 


	ret = hns_roce_v2_query_qpc(hr_dev, hr_qp, &context);

	if (ret) {

		ibdev_err(ibdev, "failed to query QPC, ret = %d\n", ret);

		ibdev_err(ibdev, "failed to query QPC, ret = %d.\n", ret);

		ret = -EINVAL;

		goto out;

	}
@@ -5118,7 +5118,7 @@ static int hns_roce_v2_destroy_qp_common(struct hns_roce_dev *hr_dev, 
					    hr_qp->state, IB_QPS_RESET);

		if (ret)

			ibdev_err(ibdev,

				  "failed to modify QP to RST, ret = %d\n",

				  "failed to modify QP to RST, ret = %d.\n",

				  ret);

	}
@@ -5157,7 +5157,7 @@ static int hns_roce_v2_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) 
	ret = hns_roce_v2_destroy_qp_common(hr_dev, hr_qp, udata);

	if (ret)

		ibdev_err(&hr_dev->ib_dev,

			  "failed to destroy QP 0x%06lx, ret = %d\n",

			  "failed to destroy QP, QPN = 0x%06lx, ret = %d.\n",

			  hr_qp->qpn, ret);



	hns_roce_qp_destroy(hr_dev, hr_qp, udata);
@@ -5180,7 +5180,7 @@ static int hns_roce_v2_qp_flow_control_init(struct hns_roce_dev *hr_dev, 
	hns_roce_cmq_setup_basic_desc(&desc, HNS_ROCE_OPC_RESET_SCCC, false);

	ret =  hns_roce_cmq_send(hr_dev, &desc, 1);

	if (ret) {

		ibdev_err(ibdev, "failed to reset SCC ctx, ret = %d\n", ret);

		ibdev_err(ibdev, "failed to reset SCC ctx, ret = %d.\n", ret);

		goto out;

	}
@@ -5190,7 +5190,7 @@ static int hns_roce_v2_qp_flow_control_init(struct hns_roce_dev *hr_dev, 
	clr->qpn = cpu_to_le32(hr_qp->qpn);

	ret =  hns_roce_cmq_send(hr_dev, &desc, 1);

	if (ret) {

		ibdev_err(ibdev, "failed to clear SCC ctx, ret = %d\n", ret);

		ibdev_err(ibdev, "failed to clear SCC ctx, ret = %d.\n", ret);

		goto out;

	}
@@ -5439,7 +5439,7 @@ static int hns_roce_v2_modify_cq(struct ib_cq *cq, u16 cq_count, u16 cq_period) 
	hns_roce_free_cmd_mailbox(hr_dev, mailbox);

	if (ret)

		ibdev_err(&hr_dev->ib_dev,

			  "failed to process cmd when modifying CQ, ret = %d\n",

			  "failed to process cmd when modifying CQ, ret = %d.\n",

			  ret);



	return ret;

drivers/infiniband/hw/hns/hns_roce_mr.c

+5 −5
Original line number Diff line number Diff line
@@ -185,14 +185,14 @@ static int hns_roce_mr_enable(struct hns_roce_dev *hr_dev, 
	else

		ret = hr_dev->hw->frmr_write_mtpt(hr_dev, mailbox->buf, mr);

	if (ret) {

		dev_err(dev, "Write mtpt fail!\n");

		dev_err(dev, "failed to write mtpt, ret = %d.\n", ret);

		goto err_page;

	}



	ret = hns_roce_hw_create_mpt(hr_dev, mailbox,

				     mtpt_idx & (hr_dev->caps.num_mtpts - 1));

	if (ret) {

		dev_err(dev, "CREATE_MPT failed (%d)\n", ret);

		dev_err(dev, "failed to create mpt, ret = %d.\n", ret);

		goto err_page;

	}
@@ -496,7 +496,7 @@ int hns_roce_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents, 


	ret = ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, hns_roce_set_page);

	if (ret < 1) {

		ibdev_err(ibdev, "failed to store sg pages %d %d, cnt = %d.\n",

		ibdev_err(ibdev, "failed to store sg pages %u %u, cnt = %d.\n",

			  mr->npages, mr->pbl_mtr.hem_cfg.buf_pg_count, ret);

		goto err_page_list;

	}
@@ -850,7 +850,7 @@ int hns_roce_mtr_map(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, 
		if (r->offset + r->count > page_cnt) {

			err = -EINVAL;

			ibdev_err(ibdev,

				  "Failed to check mtr%d end %d + %d, max %d\n",

				  "failed to check mtr%u end %u + %u, max %u.\n",

				  i, r->offset, r->count, page_cnt);

			return err;

		}
@@ -858,7 +858,7 @@ int hns_roce_mtr_map(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr, 
		err = mtr_map_region(hr_dev, mtr, &pages[r->offset], r);

		if (err) {

			ibdev_err(ibdev,

				  "Failed to map mtr%d offset %d, err %d\n",

				  "failed to map mtr%u offset %u, ret = %d.\n",

				  i, r->offset, err);

			return err;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE