From: Leon Romanovsky <leonro@xxxxxxxxxxxx>
Give to the user space tools unique identifier for PD, MR, CQ and CM_ID
objects, so they can be able to query on them with .doit callbacks.
QP .doit is not supported yet, till all drivers will be updated
to provide their LQPN to be equal to their restrack ID.
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
---
drivers/infiniband/core/nldev.c | 48 ++++++++++++++++++++++++++++++++
include/uapi/rdma/rdma_netlink.h | 9 ++++++
2 files changed, 57 insertions(+)
diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c
index 1cf74b28d0f2..3b24838fe6e0 100644
--- a/drivers/infiniband/core/nldev.c
+++ b/drivers/infiniband/core/nldev.c
@@ -107,6 +107,10 @@ static const struct nla_policy nldev_policy[RDMA_NLDEV_ATTR_MAX] = {
[RDMA_NLDEV_ATTR_DRIVER_U32] = { .type = NLA_U32 },
[RDMA_NLDEV_ATTR_DRIVER_S64] = { .type = NLA_S64 },
[RDMA_NLDEV_ATTR_DRIVER_U64] = { .type = NLA_U64 },
+ [RDMA_NLDEV_ATTR_RES_PDN] = { .type = NLA_U32 },
+ [RDMA_NLDEV_ATTR_RES_CQN] = { .type = NLA_U32 },
+ [RDMA_NLDEV_ATTR_RES_MRN] = { .type = NLA_U32 },
+ [RDMA_NLDEV_ATTR_RES_CM_IDN] = { .type = NLA_U32 },
};
static int put_driver_name_print_type(struct sk_buff *msg, const char *name,
@@ -369,6 +373,34 @@ static bool fill_res_entry(struct ib_device *dev, struct sk_buff *msg,
return dev->ops.fill_res_entry(msg, res);
}
+static bool fill_res_ids(struct sk_buff *msg, struct rdma_restrack_entry *res)
+{
+ bool ret;
+
+ switch (res->type) {
+ case RDMA_RESTRACK_PD:
+ ret = nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_PDN,
+ rdma_res_to_id(res));
+ break;
+ case RDMA_RESTRACK_CQ:
+ ret = nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_CQN,
+ rdma_res_to_id(res));
+ break;
+ case RDMA_RESTRACK_MR:
+ ret = nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_MRN,
+ rdma_res_to_id(res));
+ break;
+ case RDMA_RESTRACK_CM_ID:
+ ret = nla_put_u32(msg, RDMA_NLDEV_ATTR_RES_CM_IDN,
+ rdma_res_to_id(res));
+ break;
+ default:
+ ret = true;
+ }
+
+ return ret;
+}
+
static int fill_res_qp_entry(struct sk_buff *msg, bool has_cap_net_admin,
struct rdma_restrack_entry *res, uint32_t port)
{
@@ -465,6 +497,9 @@ static int fill_res_cm_id_entry(struct sk_buff *msg, bool has_cap_net_admin,
&cm_id->route.addr.dst_addr))
goto err;
+ if (fill_res_ids(msg, res))
+ goto err;
+
if (fill_res_name_pid(msg, res))
goto err;
@@ -493,6 +528,9 @@ static int fill_res_cq_entry(struct sk_buff *msg, bool has_cap_net_admin,
nla_put_u8(msg, RDMA_NLDEV_ATTR_RES_POLL_CTX, cq->poll_ctx))
goto err;
+ if (fill_res_ids(msg, res))
+ goto err;
+
if (fill_res_name_pid(msg, res))
goto err;
@@ -521,6 +559,9 @@ static int fill_res_mr_entry(struct sk_buff *msg, bool has_cap_net_admin,
RDMA_NLDEV_ATTR_PAD))
goto err;
+ if (fill_res_ids(msg, res))
+ goto err;
+
if (fill_res_name_pid(msg, res))
goto err;
@@ -555,6 +596,9 @@ static int fill_res_pd_entry(struct sk_buff *msg, bool has_cap_net_admin,
pd->unsafe_global_rkey))
goto err;
+ if (fill_res_ids(msg, res))
+ goto err;
+
if (fill_res_name_pid(msg, res))
goto err;
@@ -896,6 +940,7 @@ static const struct nldev_fill_res_entry fill_entries[RDMA_RESTRACK_MAX] = {
.nldev_cmd = RDMA_NLDEV_CMD_RES_CM_ID_GET,
.nldev_attr = RDMA_NLDEV_ATTR_RES_CM_ID,
.entry = RDMA_NLDEV_ATTR_RES_CM_ID_ENTRY,
+ .id = RDMA_NLDEV_ATTR_RES_CM_IDN,
},
[RDMA_RESTRACK_CQ] = {
.fill_res_func = fill_res_cq_entry,
@@ -903,6 +948,7 @@ static const struct nldev_fill_res_entry fill_entries[RDMA_RESTRACK_MAX] = {
.nldev_attr = RDMA_NLDEV_ATTR_RES_CQ,
.flags = NLDEV_PER_DEV,
.entry = RDMA_NLDEV_ATTR_RES_CQ_ENTRY,
+ .id = RDMA_NLDEV_ATTR_RES_CQN,
},
[RDMA_RESTRACK_MR] = {
.fill_res_func = fill_res_mr_entry,
@@ -910,6 +956,7 @@ static const struct nldev_fill_res_entry fill_entries[RDMA_RESTRACK_MAX] = {
.nldev_attr = RDMA_NLDEV_ATTR_RES_MR,
.flags = NLDEV_PER_DEV,
.entry = RDMA_NLDEV_ATTR_RES_MR_ENTRY,
+ .id = RDMA_NLDEV_ATTR_RES_MRN,
},
[RDMA_RESTRACK_PD] = {
.fill_res_func = fill_res_pd_entry,
@@ -917,6 +964,7 @@ static const struct nldev_fill_res_entry fill_entries[RDMA_RESTRACK_MAX] = {
.nldev_attr = RDMA_NLDEV_ATTR_RES_PD,
.flags = NLDEV_PER_DEV,
.entry = RDMA_NLDEV_ATTR_RES_PD_ENTRY,
+ .id = RDMA_NLDEV_ATTR_RES_PDN,
},
};
diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
index 69f5fe81336d..dfcb0bbdade5 100644
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
@@ -417,6 +417,15 @@ enum rdma_nldev_attr {
RDMA_NLDEV_ATTR_DRIVER_S64, /* s64 */
RDMA_NLDEV_ATTR_DRIVER_U64, /* u64 */
+ /*
+ * Indexes to get/set secific entry,
+ * for QP use RDMA_NLDEV_ATTR_RES_LQPN
+ */
+ RDMA_NLDEV_ATTR_RES_PDN, /* u32 */
+ RDMA_NLDEV_ATTR_RES_CQN, /* u32 */
+ RDMA_NLDEV_ATTR_RES_MRN, /* u32 */
+ RDMA_NLDEV_ATTR_RES_CM_IDN, /* u32 */
+
/*
* Always the end
*/
--
2.19.1
