Second step in sharing an IB object is to import the exported object.
A new IB verb is introduced to import an IB object from one context
(identified by it's fd) to a second one.
Importing an IB object increases the reference count of that object in
the kernel.
Signed-off-by: Yuval Shaia <yuval.shaia@xxxxxxxxxx>
Signed-off-by: Shamir Rabinovitch <shamir.rabinovitch@xxxxxxxxxx>
Signed-off-by: Shamir Rabinovitch <srabinov7@xxxxxxxxx>
---
kernel-headers/rdma/ib_user_verbs.h | 16 ++++++++++++++++
libibverbs/cmd.c | 18 ++++++++++++++++++
libibverbs/driver.h | 6 ++++++
libibverbs/dummy_ops.c | 9 +++++++++
libibverbs/kern-abi.h | 2 +-
libibverbs/libibverbs.map.in | 2 ++
libibverbs/verbs.h | 20 ++++++++++++++++++++
7 files changed, 72 insertions(+), 1 deletion(-)
diff --git a/kernel-headers/rdma/ib_user_verbs.h b/kernel-headers/rdma/ib_user_verbs.h
index 0474c740..872298bf 100644
--- a/kernel-headers/rdma/ib_user_verbs.h
+++ b/kernel-headers/rdma/ib_user_verbs.h
@@ -88,6 +88,8 @@ enum ib_uverbs_write_cmds {
IB_USER_VERBS_CMD_CLOSE_XRCD,
IB_USER_VERBS_CMD_CREATE_XSRQ,
IB_USER_VERBS_CMD_OPEN_QP,
+ IB_USER_VERBS_CMD_IMPORT_FROM_FD,
+ IB_USER_VERBS_CMD_IMPORT_PD = IB_USER_VERBS_CMD_IMPORT_FROM_FD,
};
enum {
@@ -1299,6 +1301,20 @@ struct ib_uverbs_ex_modify_cq {
__u32 reserved;
};
+struct ib_uverbs_import_pd {
+ __aligned_u64 response;
+ __u32 fd;
+ __u32 handle;
+ __u16 type;
+ __u8 reserved[6];
+};
+
+struct ib_uverbs_import_fr_fd_resp {
+ union {
+ struct ib_uverbs_alloc_pd_resp alloc_pd;
+ } u;
+};
+
#define IB_DEVICE_NAME_MAX 64
#endif /* IB_USER_VERBS_H */
diff --git a/libibverbs/cmd.c b/libibverbs/cmd.c
index 3936e69b..75efcf75 100644
--- a/libibverbs/cmd.c
+++ b/libibverbs/cmd.c
@@ -294,6 +294,24 @@ int ibv_cmd_alloc_pd(struct ibv_context *context, struct ibv_pd *pd,
return 0;
}
+int ibv_cmd_import_pd(struct ibv_context *context, struct ibv_pd *pd,
+ struct ibv_import_pd *cmd, size_t cmd_size,
+ struct ib_uverbs_import_fr_fd_resp *resp,
+ size_t resp_size)
+{
+ int ret;
+
+ ret = execute_cmd_write(context, IB_USER_VERBS_CMD_IMPORT_PD, cmd,
+ cmd_size, resp, resp_size);
+ if (ret)
+ return ret;
+
+ pd->handle = resp->u.alloc_pd.pd_handle;
+ pd->context = context;
+
+ return 0;
+}
+
int ibv_cmd_open_xrcd(struct ibv_context *context, struct verbs_xrcd *xrcd,
int vxrcd_size,
struct ibv_xrcd_init_attr *attr,
diff --git a/libibverbs/driver.h b/libibverbs/driver.h
index 88ed2b5e..f2e2f11c 100644
--- a/libibverbs/driver.h
+++ b/libibverbs/driver.h
@@ -317,6 +317,8 @@ struct verbs_context_ops {
uint16_t lid);
int (*free_dm)(struct ibv_dm *dm);
int (*get_srq_num)(struct ibv_srq *srq, uint32_t *srq_num);
+ struct ibv_pd *(*import_pd)(struct ibv_context *context, uint32_t fd,
+ uint32_t handle);
int (*modify_cq)(struct ibv_cq *cq, struct ibv_modify_cq_attr *attr);
int (*modify_flow_action_esp)(struct ibv_flow_action *action,
struct ibv_flow_action_esp_attr *attr);
@@ -456,6 +458,10 @@ int ibv_cmd_alloc_pd(struct ibv_context *context, struct ibv_pd *pd,
struct ibv_alloc_pd *cmd, size_t cmd_size,
struct ib_uverbs_alloc_pd_resp *resp, size_t resp_size);
int ibv_cmd_dealloc_pd(struct ibv_pd *pd);
+int ibv_cmd_import_pd(struct ibv_context *context, struct ibv_pd *pd,
+ struct ibv_import_pd *cmd, size_t cmd_size,
+ struct ib_uverbs_import_fr_fd_resp *resp,
+ size_t resp_size);
int ibv_cmd_open_xrcd(struct ibv_context *context, struct verbs_xrcd *xrcd,
int vxrcd_size,
struct ibv_xrcd_init_attr *attr,
diff --git a/libibverbs/dummy_ops.c b/libibverbs/dummy_ops.c
index 6560371a..295e0732 100644
--- a/libibverbs/dummy_ops.c
+++ b/libibverbs/dummy_ops.c
@@ -282,6 +282,13 @@ static int get_srq_num(struct ibv_srq *srq, uint32_t *srq_num)
return ENOSYS;
}
+static struct ibv_pd *import_pd(struct ibv_context *context, uint32_t fd,
+ uint32_t handle)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
static int modify_cq(struct ibv_cq *cq, struct ibv_modify_cq_attr *attr)
{
return ENOSYS;
@@ -487,6 +494,7 @@ const struct verbs_context_ops verbs_dummy_ops = {
detach_mcast,
free_dm,
get_srq_num,
+ import_pd,
modify_cq,
modify_flow_action_esp,
modify_qp,
@@ -627,6 +635,7 @@ void verbs_set_ops(struct verbs_context *vctx,
SET_OP(ctx, req_notify_cq);
SET_PRIV_OP(ctx, rereg_mr);
SET_PRIV_OP(ctx, resize_cq);
+ SET_OP(vctx, import_pd);
#undef SET_OP
#undef SET_OP2
diff --git a/libibverbs/kern-abi.h b/libibverbs/kern-abi.h
index dc2f33d3..714be0c8 100644
--- a/libibverbs/kern-abi.h
+++ b/libibverbs/kern-abi.h
@@ -207,7 +207,7 @@ DECLARE_CMD(IB_USER_VERBS_CMD_REG_MR, ibv_reg_mr, ib_uverbs_reg_mr);
DECLARE_CMDX(IB_USER_VERBS_CMD_REQ_NOTIFY_CQ, ibv_req_notify_cq, ib_uverbs_req_notify_cq, empty);
DECLARE_CMD(IB_USER_VERBS_CMD_REREG_MR, ibv_rereg_mr, ib_uverbs_rereg_mr);
DECLARE_CMD(IB_USER_VERBS_CMD_RESIZE_CQ, ibv_resize_cq, ib_uverbs_resize_cq);
-
+DECLARE_CMDX(IB_USER_VERBS_CMD_IMPORT_PD, ibv_import_pd, ib_uverbs_import_pd, ib_uverbs_import_fr_fd_resp);
DECLARE_CMD_EX(IB_USER_VERBS_EX_CMD_CREATE_CQ, ibv_create_cq_ex, ib_uverbs_ex_create_cq);
DECLARE_CMD_EX(IB_USER_VERBS_EX_CMD_CREATE_FLOW, ibv_create_flow, ib_uverbs_create_flow);
DECLARE_CMD_EX(IB_USER_VERBS_EX_CMD_CREATE_QP, ibv_create_qp_ex, ib_uverbs_ex_create_qp);
diff --git a/libibverbs/libibverbs.map.in b/libibverbs/libibverbs.map.in
index c1b4537a..6fff7065 100644
--- a/libibverbs/libibverbs.map.in
+++ b/libibverbs/libibverbs.map.in
@@ -114,6 +114,7 @@ IBVERBS_1.5 {
IBVERBS_1.6 {
global:
ibv_qp_to_qp_ex;
+ ibv_import_pd;
} IBVERBS_1.5;
IBVERBS_1.7 {
@@ -164,6 +165,7 @@ IBVERBS_PRIVATE_@IBVERBS_PABI_VERSION@ {
ibv_cmd_detach_mcast;
ibv_cmd_free_dm;
ibv_cmd_get_context;
+ ibv_cmd_import_pd;
ibv_cmd_modify_flow_action_esp;
ibv_cmd_modify_qp;
ibv_cmd_modify_qp_ex;
diff --git a/libibverbs/verbs.h b/libibverbs/verbs.h
index eb9df3a4..f3f7200a 100644
--- a/libibverbs/verbs.h
+++ b/libibverbs/verbs.h
@@ -2015,6 +2015,8 @@ struct ibv_values_ex {
struct verbs_context {
/* "grows up" - new fields go here */
+ struct ibv_pd *(*import_pd)(struct ibv_context *context, uint32_t fd,
+ uint32_t handle);
int (*query_port)(struct ibv_context *context, uint8_t port_num,
struct ibv_port_attr *port_attr,
size_t port_attr_len);
@@ -3285,6 +3287,24 @@ static inline uint32_t ibv_mr_to_handle(struct ibv_mr *mr)
return mr->handle;
}
+static inline struct ibv_pd *ibv_import_pd(struct ibv_context *context,
+ uint32_t fd, uint32_t handle)
+{
+ struct verbs_context *vctx = verbs_get_ctx_op(context, import_pd);
+ struct ibv_pd *pd;
+
+ if (!vctx) {
+ errno = ENOSYS;
+ return NULL;
+ }
+
+ pd = vctx->import_pd(context, fd, handle);
+ if (pd)
+ pd->context = context;
+
+ return pd;
+}
+
#ifdef __cplusplus
}
#endif
--
2.20.1
