Skip to content

Commit 3d67e7e

Browse files
Wenpeng Liangrleon
authored andcommitted
RDMA/hns: Support MR's restrack raw ops for hns driver
The MR raw restrack attributes come from the queue context maintained by the ROCEE. For example: $ rdma res show mr dev hns_0 mrn 6 -dd -jp -r [ { "ifindex": 4, "ifname": "hns_0", "data": [ 1,0,0,0,2,0,0,0,0,3,0,0,0,0,2,0,0,0,0,0,32,0,0,0,2,0,0,0, 2,0,0,0,0,0,0,0 ] } ] Link: https://lore.kernel.org/r/20220822104455.2311053-8-liangwenpeng@huawei.com Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com> Signed-off-by: Leon Romanovsky <leon@kernel.org>
1 parent dc9981e commit 3d67e7e

File tree

5 files changed

+66
-1
lines changed

5 files changed

+66
-1
lines changed

drivers/infiniband/hw/hns/hns_roce_device.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -896,6 +896,7 @@ struct hns_roce_hw {
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);
898898
int (*query_qpc)(struct hns_roce_dev *hr_dev, u32 qpn, void *buffer);
899+
int (*query_mpt)(struct hns_roce_dev *hr_dev, u32 key, void *buffer);
899900
const struct ib_device_ops *hns_roce_dev_ops;
900901
const struct ib_device_ops *hns_roce_dev_srq_ops;
901902
};
@@ -1229,6 +1230,7 @@ int hns_roce_fill_res_cq_entry_raw(struct sk_buff *msg, struct ib_cq *ib_cq);
12291230
int hns_roce_fill_res_qp_entry(struct sk_buff *msg, struct ib_qp *ib_qp);
12301231
int hns_roce_fill_res_qp_entry_raw(struct sk_buff *msg, struct ib_qp *ib_qp);
12311232
int hns_roce_fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ib_mr);
1233+
int hns_roce_fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ib_mr);
12321234
struct hns_user_mmap_entry *
12331235
hns_roce_user_mmap_entry_insert(struct ib_ucontext *ucontext, u64 address,
12341236
size_t length,

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5802,6 +5802,35 @@ static int hns_roce_v2_query_cqc(struct hns_roce_dev *hr_dev, u32 cqn,
58025802
return ret;
58035803
}
58045804

5805+
static int hns_roce_v2_query_mpt(struct hns_roce_dev *hr_dev, u32 key,
5806+
void *buffer)
5807+
{
5808+
struct hns_roce_v2_mpt_entry *context;
5809+
struct hns_roce_cmd_mailbox *mailbox;
5810+
int ret;
5811+
5812+
mailbox = hns_roce_alloc_cmd_mailbox(hr_dev);
5813+
if (IS_ERR(mailbox))
5814+
return PTR_ERR(mailbox);
5815+
5816+
context = mailbox->buf;
5817+
ret = hns_roce_cmd_mbox(hr_dev, 0, mailbox->dma, HNS_ROCE_CMD_QUERY_MPT,
5818+
key_to_hw_index(key));
5819+
if (ret) {
5820+
ibdev_err(&hr_dev->ib_dev,
5821+
"failed to process cmd when querying MPT, ret = %d.\n",
5822+
ret);
5823+
goto err_mailbox;
5824+
}
5825+
5826+
memcpy(buffer, context, sizeof(*context));
5827+
5828+
err_mailbox:
5829+
hns_roce_free_cmd_mailbox(hr_dev, mailbox);
5830+
5831+
return ret;
5832+
}
5833+
58055834
static void hns_roce_irq_work_handle(struct work_struct *work)
58065835
{
58075836
struct hns_roce_work *irq_work =
@@ -6645,6 +6674,7 @@ static const struct hns_roce_hw hns_roce_hw_v2 = {
66456674
.write_srqc = hns_roce_v2_write_srqc,
66466675
.query_cqc = hns_roce_v2_query_cqc,
66476676
.query_qpc = hns_roce_v2_query_qpc,
6677+
.query_mpt = hns_roce_v2_query_mpt,
66486678
.hns_roce_dev_ops = &hns_roce_v2_dev_ops,
66496679
.hns_roce_dev_srq_ops = &hns_roce_v2_dev_srq_ops,
66506680
};

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,8 @@ struct hns_roce_v2_mpt_entry {
758758
#define MPT_INNER_PA_VLD MPT_FIELD_LOC(71, 71)
759759
#define MPT_MW_BIND_QPN MPT_FIELD_LOC(95, 72)
760760
#define MPT_BOUND_LKEY MPT_FIELD_LOC(127, 96)
761-
#define MPT_LEN MPT_FIELD_LOC(191, 128)
761+
#define MPT_LEN_L MPT_FIELD_LOC(159, 128)
762+
#define MPT_LEN_H MPT_FIELD_LOC(191, 160)
762763
#define MPT_LKEY MPT_FIELD_LOC(223, 192)
763764
#define MPT_VA MPT_FIELD_LOC(287, 224)
764765
#define MPT_PBL_SIZE MPT_FIELD_LOC(319, 288)

drivers/infiniband/hw/hns/hns_roce_main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@ static const struct ib_device_ops hns_roce_dev_restrack_ops = {
571571
.fill_res_qp_entry = hns_roce_fill_res_qp_entry,
572572
.fill_res_qp_entry_raw = hns_roce_fill_res_qp_entry_raw,
573573
.fill_res_mr_entry = hns_roce_fill_res_mr_entry,
574+
.fill_res_mr_entry_raw = hns_roce_fill_res_mr_entry_raw,
574575
};
575576

576577
static int hns_roce_register_device(struct hns_roce_dev *hr_dev)

drivers/infiniband/hw/hns/hns_roce_restrack.c

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,3 +198,34 @@ int hns_roce_fill_res_mr_entry(struct sk_buff *msg, struct ib_mr *ib_mr)
198198

199199
return -EMSGSIZE;
200200
}
201+
202+
int hns_roce_fill_res_mr_entry_raw(struct sk_buff *msg, struct ib_mr *ib_mr)
203+
{
204+
struct hns_roce_dev *hr_dev = to_hr_dev(ib_mr->device);
205+
struct hns_roce_mr *hr_mr = to_hr_mr(ib_mr);
206+
struct hns_roce_v2_mpt_entry context;
207+
u32 data[MAX_ENTRY_NUM] = {};
208+
int offset = 0;
209+
int ret;
210+
211+
if (!hr_dev->hw->query_mpt)
212+
return -EINVAL;
213+
214+
ret = hr_dev->hw->query_mpt(hr_dev, hr_mr->key, &context);
215+
if (ret)
216+
return -EINVAL;
217+
218+
data[offset++] = hr_reg_read(&context, MPT_ST);
219+
data[offset++] = hr_reg_read(&context, MPT_PD);
220+
data[offset++] = hr_reg_read(&context, MPT_LKEY);
221+
data[offset++] = hr_reg_read(&context, MPT_LEN_L);
222+
data[offset++] = hr_reg_read(&context, MPT_LEN_H);
223+
data[offset++] = hr_reg_read(&context, MPT_PBL_SIZE);
224+
data[offset++] = hr_reg_read(&context, MPT_PBL_HOP_NUM);
225+
data[offset++] = hr_reg_read(&context, MPT_PBL_BA_PG_SZ);
226+
data[offset++] = hr_reg_read(&context, MPT_PBL_BUF_PG_SZ);
227+
228+
ret = nla_put(msg, RDMA_NLDEV_ATTR_RES_RAW, offset * sizeof(u32), data);
229+
230+
return ret;
231+
}

0 commit comments

Comments
 (0)