Skip to content

Commit 3e89d78

Browse files
Wenpeng Liangrleon
Wenpeng Liang
authored and
rleon
committed
RDMA/hns: Support QP's restrack raw ops for hns driver
The QP raw restrack attributes come from the queue context maintained by the ROCEE. For example: $ rdma res show qp link hns_0 -jp -dd -r [ { "ifindex": 4, "ifname": "hns_0", "data": [ 2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0, 5,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,255,156,0,0,63,156,0,0, 7,0,0,0,1,0,0,0,9,0,0,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,63,156,0, 0,0,0,0,0 ] } ] Link: https://lore.kernel.org/r/20220822104455.2311053-6-liangwenpeng@huawei.com Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com> Signed-off-by: Leon Romanovsky <leon@kernel.org>
1 parent e198d65 commit 3e89d78

File tree

4 files changed

+65
-6
lines changed

4 files changed

+65
-6
lines changed

‎drivers/infiniband/hw/hns/hns_roce_device.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,7 @@ struct hns_roce_hw {
895895
void (*cleanup_eq)(struct hns_roce_dev *hr_dev);
896896
int (*write_srqc)(struct hns_roce_srq *srq, void *mb_buf);
897897
int (*query_cqc)(struct hns_roce_dev *hr_dev, u32 cqn, void *buffer);
898+
int (*query_qpc)(struct hns_roce_dev *hr_dev, u32 qpn, void *buffer);
898899
const struct ib_device_ops *hns_roce_dev_ops;
899900
const struct ib_device_ops *hns_roce_dev_srq_ops;
900901
};
@@ -1226,6 +1227,7 @@ void hns_roce_exit(struct hns_roce_dev *hr_dev);
12261227
int hns_roce_fill_res_cq_entry(struct sk_buff *msg, struct ib_cq *ib_cq);
12271228
int hns_roce_fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ib_cq);
12281229
int hns_roce_fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ib_qp);
1230+
int hns_roce_fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ib_qp);
12291231
struct hns_user_mmap_entry *
12301232
hns_roce_user_mmap_entry_insert(struct ib_ucontext *ucontext, u64 address,
12311233
size_t length,

‎drivers/infiniband/hw/hns/hns_roce_hw_v2.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5307,9 +5307,8 @@ static int to_ib_qp_st(enum hns_roce_v2_qp_state state)
53075307
return (state < ARRAY_SIZE(map)) ? map[state] : -1;
53085308
}
53095309

5310-
static int hns_roce_v2_query_qpc(struct hns_roce_dev *hr_dev,
5311-
struct hns_roce_qp *hr_qp,
5312-
struct hns_roce_v2_qp_context *hr_context)
5310+
static int hns_roce_v2_query_qpc(struct hns_roce_dev *hr_dev, u32 qpn,
5311+
void *buffer)
53135312
{
53145313
struct hns_roce_cmd_mailbox *mailbox;
53155314
int ret;
@@ -5319,11 +5318,11 @@ static int hns_roce_v2_query_qpc(struct hns_roce_dev *hr_dev,
53195318
return PTR_ERR(mailbox);
53205319

53215320
ret = hns_roce_cmd_mbox(hr_dev, 0, mailbox->dma, HNS_ROCE_CMD_QUERY_QPC,
5322-
hr_qp->qpn);
5321+
qpn);
53235322
if (ret)
53245323
goto out;
53255324

5326-
memcpy(hr_context, mailbox->buf, hr_dev->caps.qpc_sz);
5325+
memcpy(buffer, mailbox->buf, hr_dev->caps.qpc_sz);
53275326

53285327
out:
53295328
hns_roce_free_cmd_mailbox(hr_dev, mailbox);
@@ -5353,7 +5352,7 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,
53535352
goto done;
53545353
}
53555354

5356-
ret = hns_roce_v2_query_qpc(hr_dev, hr_qp, &context);
5355+
ret = hns_roce_v2_query_qpc(hr_dev, hr_qp->qpn, &context);
53575356
if (ret) {
53585357
ibdev_err(ibdev, "failed to query QPC, ret = %d.\n", ret);
53595358
ret = -EINVAL;
@@ -6645,6 +6644,7 @@ static const struct hns_roce_hw hns_roce_hw_v2 = {
66456644
.cleanup_eq = hns_roce_v2_cleanup_eq_table,
66466645
.write_srqc = hns_roce_v2_write_srqc,
66476646
.query_cqc = hns_roce_v2_query_cqc,
6647+
.query_qpc = hns_roce_v2_query_qpc,
66486648
.hns_roce_dev_ops = &hns_roce_v2_dev_ops,
66496649
.hns_roce_dev_srq_ops = &hns_roce_v2_dev_srq_ops,
66506650
};

‎drivers/infiniband/hw/hns/hns_roce_main.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,7 @@ static const struct ib_device_ops hns_roce_dev_restrack_ops = {
569569
.fill_res_cq_entry = hns_roce_fill_res_cq_entry,
570570
.fill_res_cq_entry_raw = hns_roce_fill_res_cq_entry_raw,
571571
.fill_res_qp_entry = hns_roce_fill_res_qp_entry,
572+
.fill_res_qp_entry_raw = hns_roce_fill_res_qp_entry_raw,
572573
};
573574

574575
static int hns_roce_register_device(struct hns_roce_dev *hr_dev)

‎drivers/infiniband/hw/hns/hns_roce_restrack.c‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,59 @@ int hns_roce_fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ib_qp)
112112

113113
return -EMSGSIZE;
114114
}
115+
116+
int hns_roce_fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ib_qp)
117+
{
118+
struct hns_roce_dev *hr_dev = to_hr_dev(ib_qp->device);
119+
struct hns_roce_qp *hr_qp = to_hr_qp(ib_qp);
120+
struct hns_roce_v2_qp_context context;
121+
u32 data[MAX_ENTRY_NUM] = {};
122+
int offset = 0;
123+
int ret;
124+
125+
if (!hr_dev->hw->query_qpc)
126+
return -EINVAL;
127+
128+
ret = hr_dev->hw->query_qpc(hr_dev, hr_qp->qpn, &context);
129+
if (ret)
130+
return -EINVAL;
131+
132+
data[offset++] = hr_reg_read(&context, QPC_QP_ST);
133+
data[offset++] = hr_reg_read(&context, QPC_ERR_TYPE);
134+
data[offset++] = hr_reg_read(&context, QPC_CHECK_FLG);
135+
data[offset++] = hr_reg_read(&context, QPC_SRQ_EN);
136+
data[offset++] = hr_reg_read(&context, QPC_SRQN);
137+
data[offset++] = hr_reg_read(&context, QPC_QKEY_XRCD);
138+
data[offset++] = hr_reg_read(&context, QPC_TX_CQN);
139+
data[offset++] = hr_reg_read(&context, QPC_RX_CQN);
140+
data[offset++] = hr_reg_read(&context, QPC_SQ_PRODUCER_IDX);
141+
data[offset++] = hr_reg_read(&context, QPC_SQ_CONSUMER_IDX);
142+
data[offset++] = hr_reg_read(&context, QPC_RQ_RECORD_EN);
143+
data[offset++] = hr_reg_read(&context, QPC_RQ_PRODUCER_IDX);
144+
data[offset++] = hr_reg_read(&context, QPC_RQ_CONSUMER_IDX);
145+
data[offset++] = hr_reg_read(&context, QPC_SQ_SHIFT);
146+
data[offset++] = hr_reg_read(&context, QPC_RQWS);
147+
data[offset++] = hr_reg_read(&context, QPC_RQ_SHIFT);
148+
data[offset++] = hr_reg_read(&context, QPC_SGE_SHIFT);
149+
data[offset++] = hr_reg_read(&context, QPC_SQ_HOP_NUM);
150+
data[offset++] = hr_reg_read(&context, QPC_RQ_HOP_NUM);
151+
data[offset++] = hr_reg_read(&context, QPC_SGE_HOP_NUM);
152+
data[offset++] = hr_reg_read(&context, QPC_WQE_SGE_BA_PG_SZ);
153+
data[offset++] = hr_reg_read(&context, QPC_WQE_SGE_BUF_PG_SZ);
154+
data[offset++] = hr_reg_read(&context, QPC_RETRY_NUM_INIT);
155+
data[offset++] = hr_reg_read(&context, QPC_RETRY_CNT);
156+
data[offset++] = hr_reg_read(&context, QPC_SQ_CUR_PSN);
157+
data[offset++] = hr_reg_read(&context, QPC_SQ_MAX_PSN);
158+
data[offset++] = hr_reg_read(&context, QPC_SQ_FLUSH_IDX);
159+
data[offset++] = hr_reg_read(&context, QPC_SQ_MAX_IDX);
160+
data[offset++] = hr_reg_read(&context, QPC_SQ_TX_ERR);
161+
data[offset++] = hr_reg_read(&context, QPC_SQ_RX_ERR);
162+
data[offset++] = hr_reg_read(&context, QPC_RQ_RX_ERR);
163+
data[offset++] = hr_reg_read(&context, QPC_RQ_TX_ERR);
164+
data[offset++] = hr_reg_read(&context, QPC_RQ_CQE_IDX);
165+
data[offset++] = hr_reg_read(&context, QPC_RQ_RTY_TX_ERR);
166+
167+
ret = nla_put(msg, RDMA_NLDEV_ATTR_RES_RAW, offset * sizeof(u32), data);
168+
169+
return ret;
170+
}

0 commit comments

Comments
 (0)