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

RDMA/hns: Dump whole QP/CQ/MR resource in raw 

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



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

Currently, we have dumped some fields in the QP/CQ/MR resource. This
information is not enough. It is very inconvenient to continue to
expand on the current field, and it will also introduce some trouble
to parse this raw data.

This patch dump whole resource in raw to avoid the above problems.

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

drivers/infiniband/hw/hns/hns_roce_restrack.c

+3 −70
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ int hns_roce_fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ib_cq) 
	struct hns_roce_dev *hr_dev = to_hr_dev(ib_cq->device);

	struct hns_roce_cq *hr_cq = to_hr_cq(ib_cq);

	struct hns_roce_v2_cq_context context;

	u32 data[MAX_ENTRY_NUM] = {};

	int offset = 0;

	int ret;



	if (!hr_dev->hw->query_cqc)
@@ -58,23 +56,7 @@ int hns_roce_fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ib_cq) 
	if (ret)

		return -EINVAL;



	data[offset++] = hr_reg_read(&context, CQC_CQ_ST);

	data[offset++] = hr_reg_read(&context, CQC_SHIFT);

	data[offset++] = hr_reg_read(&context, CQC_CQE_SIZE);

	data[offset++] = hr_reg_read(&context, CQC_CQE_CNT);

	data[offset++] = hr_reg_read(&context, CQC_CQ_PRODUCER_IDX);

	data[offset++] = hr_reg_read(&context, CQC_CQ_CONSUMER_IDX);

	data[offset++] = hr_reg_read(&context, CQC_DB_RECORD_EN);

	data[offset++] = hr_reg_read(&context, CQC_ARM_ST);

	data[offset++] = hr_reg_read(&context, CQC_CMD_SN);

	data[offset++] = hr_reg_read(&context, CQC_CEQN);

	data[offset++] = hr_reg_read(&context, CQC_CQ_MAX_CNT);

	data[offset++] = hr_reg_read(&context, CQC_CQ_PERIOD);

	data[offset++] = hr_reg_read(&context, CQC_CQE_HOP_NUM);

	data[offset++] = hr_reg_read(&context, CQC_CQE_BAR_PG_SZ);

	data[offset++] = hr_reg_read(&context, CQC_CQE_BUF_PG_SZ);



	ret = nla_put(msg, RDMA_NLDEV_ATTR_RES_RAW, offset * sizeof(u32), data);

	ret = nla_put(msg, RDMA_NLDEV_ATTR_RES_RAW, sizeof(context), &context);



	return ret;

}
@@ -118,8 +100,6 @@ int hns_roce_fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ib_qp) 
	struct hns_roce_dev *hr_dev = to_hr_dev(ib_qp->device);

	struct hns_roce_qp *hr_qp = to_hr_qp(ib_qp);

	struct hns_roce_v2_qp_context context;

	u32 data[MAX_ENTRY_NUM] = {};

	int offset = 0;

	int ret;



	if (!hr_dev->hw->query_qpc)
@@ -129,42 +109,7 @@ int hns_roce_fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ib_qp) 
	if (ret)

		return -EINVAL;



	data[offset++] = hr_reg_read(&context, QPC_QP_ST);

	data[offset++] = hr_reg_read(&context, QPC_ERR_TYPE);

	data[offset++] = hr_reg_read(&context, QPC_CHECK_FLG);

	data[offset++] = hr_reg_read(&context, QPC_SRQ_EN);

	data[offset++] = hr_reg_read(&context, QPC_SRQN);

	data[offset++] = hr_reg_read(&context, QPC_QKEY_XRCD);

	data[offset++] = hr_reg_read(&context, QPC_TX_CQN);

	data[offset++] = hr_reg_read(&context, QPC_RX_CQN);

	data[offset++] = hr_reg_read(&context, QPC_SQ_PRODUCER_IDX);

	data[offset++] = hr_reg_read(&context, QPC_SQ_CONSUMER_IDX);

	data[offset++] = hr_reg_read(&context, QPC_RQ_RECORD_EN);

	data[offset++] = hr_reg_read(&context, QPC_RQ_PRODUCER_IDX);

	data[offset++] = hr_reg_read(&context, QPC_RQ_CONSUMER_IDX);

	data[offset++] = hr_reg_read(&context, QPC_SQ_SHIFT);

	data[offset++] = hr_reg_read(&context, QPC_RQWS);

	data[offset++] = hr_reg_read(&context, QPC_RQ_SHIFT);

	data[offset++] = hr_reg_read(&context, QPC_SGE_SHIFT);

	data[offset++] = hr_reg_read(&context, QPC_SQ_HOP_NUM);

	data[offset++] = hr_reg_read(&context, QPC_RQ_HOP_NUM);

	data[offset++] = hr_reg_read(&context, QPC_SGE_HOP_NUM);

	data[offset++] = hr_reg_read(&context, QPC_WQE_SGE_BA_PG_SZ);

	data[offset++] = hr_reg_read(&context, QPC_WQE_SGE_BUF_PG_SZ);

	data[offset++] = hr_reg_read(&context, QPC_RETRY_NUM_INIT);

	data[offset++] = hr_reg_read(&context, QPC_RETRY_CNT);

	data[offset++] = hr_reg_read(&context, QPC_SQ_CUR_PSN);

	data[offset++] = hr_reg_read(&context, QPC_SQ_MAX_PSN);

	data[offset++] = hr_reg_read(&context, QPC_SQ_FLUSH_IDX);

	data[offset++] = hr_reg_read(&context, QPC_SQ_MAX_IDX);

	data[offset++] = hr_reg_read(&context, QPC_SQ_TX_ERR);

	data[offset++] = hr_reg_read(&context, QPC_SQ_RX_ERR);

	data[offset++] = hr_reg_read(&context, QPC_RQ_RX_ERR);

	data[offset++] = hr_reg_read(&context, QPC_RQ_TX_ERR);

	data[offset++] = hr_reg_read(&context, QPC_RQ_CQE_IDX);

	data[offset++] = hr_reg_read(&context, QPC_RQ_RTY_TX_ERR);



	ret = nla_put(msg, RDMA_NLDEV_ATTR_RES_RAW, offset * sizeof(u32), data);

	ret = nla_put(msg, RDMA_NLDEV_ATTR_RES_RAW, sizeof(context), &context);



	return ret;

}
@@ -204,8 +149,6 @@ int hns_roce_fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ib_mr) 
	struct hns_roce_dev *hr_dev = to_hr_dev(ib_mr->device);

	struct hns_roce_mr *hr_mr = to_hr_mr(ib_mr);

	struct hns_roce_v2_mpt_entry context;

	u32 data[MAX_ENTRY_NUM] = {};

	int offset = 0;

	int ret;



	if (!hr_dev->hw->query_mpt)
@@ -215,17 +158,7 @@ int hns_roce_fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ib_mr) 
	if (ret)

		return -EINVAL;



	data[offset++] = hr_reg_read(&context, MPT_ST);

	data[offset++] = hr_reg_read(&context, MPT_PD);

	data[offset++] = hr_reg_read(&context, MPT_LKEY);

	data[offset++] = hr_reg_read(&context, MPT_LEN_L);

	data[offset++] = hr_reg_read(&context, MPT_LEN_H);

	data[offset++] = hr_reg_read(&context, MPT_PBL_SIZE);

	data[offset++] = hr_reg_read(&context, MPT_PBL_HOP_NUM);

	data[offset++] = hr_reg_read(&context, MPT_PBL_BA_PG_SZ);

	data[offset++] = hr_reg_read(&context, MPT_PBL_BUF_PG_SZ);



	ret = nla_put(msg, RDMA_NLDEV_ATTR_RES_RAW, offset * sizeof(u32), data);

	ret = nla_put(msg, RDMA_NLDEV_ATTR_RES_RAW, sizeof(context), &context);



	return ret;

}