Skip to content

Commit

Permalink
verbs: Introduce ibv_import/unimport_pd() verbs
Browse files Browse the repository at this point in the history
Introduce ibv_import/unimport_pd() verbs, this enables an application
who previously imported a device to import a PD from that context and
use this shared object for its needs.

A detailed man page as part of this patch describes the expected usage
and flow.

Signed-off-by: Yishai Hadas <yishaih@mellanox.com>
  • Loading branch information
yishaih committed Jul 9, 2020
1 parent 07e21cd commit 05ae307
Show file tree
Hide file tree
Showing 8 changed files with 108 additions and 0 deletions.
2 changes: 2 additions & 0 deletions debian/libibverbs1.symbols
Expand Up @@ -68,6 +68,7 @@ libibverbs.so.1 libibverbs1 #MINVER#
ibv_get_pkey_index@IBVERBS_1.5 20
ibv_get_sysfs_path@IBVERBS_1.0 1.1.6
ibv_import_device@IBVERBS_1.10 31
ibv_import_pd@IBVERBS_1.10 31
ibv_init_ah_from_wc@IBVERBS_1.1 1.1.6
ibv_modify_qp@IBVERBS_1.0 1.1.6
ibv_modify_qp@IBVERBS_1.1 1.1.6
Expand Down Expand Up @@ -104,6 +105,7 @@ libibverbs.so.1 libibverbs1 #MINVER#
ibv_resize_cq@IBVERBS_1.1 1.1.6
ibv_resolve_eth_l2_from_gid@IBVERBS_1.1 1.2.0
ibv_set_ece@IBVERBS_1.10 31
ibv_unimport_pd@IBVERBS_1.10 31
ibv_wc_status_str@IBVERBS_1.1 1.1.6
mbps_to_ibv_rate@IBVERBS_1.1 1.1.8
mult_to_ibv_rate@IBVERBS_1.0 1.1.6
3 changes: 3 additions & 0 deletions libibverbs/driver.h
Expand Up @@ -318,6 +318,8 @@ struct verbs_context_ops {
void (*free_context)(struct ibv_context *context);
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 pd_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);
Expand Down Expand Up @@ -370,6 +372,7 @@ struct verbs_context_ops {
void *addr, size_t length, int access);
int (*resize_cq)(struct ibv_cq *cq, int cqe);
int (*set_ece)(struct ibv_qp *qp, struct ibv_ece *ece);
void (*unimport_pd)(struct ibv_pd *pd);
};

static inline struct verbs_device *
Expand Down
15 changes: 15 additions & 0 deletions libibverbs/dummy_ops.c
Expand Up @@ -287,6 +287,13 @@ static int get_srq_num(struct ibv_srq *srq, uint32_t *srq_num)
return EOPNOTSUPP;
}

static struct ibv_pd *import_pd(struct ibv_context *context,
uint32_t pd_handle)
{
errno = EOPNOTSUPP;
return NULL;
}

static int modify_cq(struct ibv_cq *cq, struct ibv_modify_cq_attr *attr)
{
return EOPNOTSUPP;
Expand Down Expand Up @@ -460,6 +467,10 @@ static int set_ece(struct ibv_qp *qp, struct ibv_ece *ece)
return EOPNOTSUPP;
}

static void unimport_pd(struct ibv_pd *pd)
{
}

/*
* Ops in verbs_dummy_ops simply return an EOPNOTSUPP error code when called, or
* do nothing. They are placed in the ops structures if the provider does not
Expand Down Expand Up @@ -514,6 +525,7 @@ const struct verbs_context_ops verbs_dummy_ops = {
free_context,
free_dm,
get_srq_num,
import_pd,
modify_cq,
modify_flow_action_esp,
modify_qp,
Expand Down Expand Up @@ -541,6 +553,7 @@ const struct verbs_context_ops verbs_dummy_ops = {
rereg_mr,
resize_cq,
set_ece,
unimport_pd,
};

/*
Expand Down Expand Up @@ -632,6 +645,7 @@ void verbs_set_ops(struct verbs_context *vctx,
SET_PRIV_OP_IC(ctx, free_context);
SET_OP(vctx, free_dm);
SET_OP(vctx, get_srq_num);
SET_PRIV_OP_IC(vctx, import_pd);
SET_OP(vctx, modify_cq);
SET_OP(vctx, modify_flow_action_esp);
SET_PRIV_OP(ctx, modify_qp);
Expand Down Expand Up @@ -659,6 +673,7 @@ void verbs_set_ops(struct verbs_context *vctx,
SET_PRIV_OP(ctx, rereg_mr);
SET_PRIV_OP(ctx, resize_cq);
SET_PRIV_OP_IC(vctx, set_ece);
SET_PRIV_OP_IC(vctx, unimport_pd);

#undef SET_OP
#undef SET_OP2
Expand Down
2 changes: 2 additions & 0 deletions libibverbs/libibverbs.map.in
Expand Up @@ -134,8 +134,10 @@ IBVERBS_1.9 {
IBVERBS_1.10 {
global:
ibv_import_device;
ibv_import_pd;
ibv_query_ece;
ibv_set_ece;
ibv_unimport_pd;
} IBVERBS_1.9;

/* If any symbols in this stanza change ABI then the entire staza gets a new symbol
Expand Down
2 changes: 2 additions & 0 deletions libibverbs/man/CMakeLists.txt
Expand Up @@ -38,6 +38,7 @@ rdma_man_pages(
ibv_get_pkey_index.3.md
ibv_get_srq_num.3.md
ibv_import_device.3.md
ibv_import_pd.3.md
ibv_inc_rkey.3.md
ibv_modify_qp.3
ibv_modify_qp_rate_limit.3
Expand Down Expand Up @@ -101,6 +102,7 @@ rdma_alias_man_pages(
ibv_get_async_event.3 ibv_ack_async_event.3
ibv_get_cq_event.3 ibv_ack_cq_events.3
ibv_get_device_list.3 ibv_free_device_list.3
ibv_import_pd.3 ibv_unimport_pd.3
ibv_open_device.3 ibv_close_device.3
ibv_open_xrcd.3 ibv_close_xrcd.3
ibv_rate_to_mbps.3 mbps_to_ibv_rate.3
Expand Down
59 changes: 59 additions & 0 deletions libibverbs/man/ibv_import_pd.3.md
@@ -0,0 +1,59 @@
---
date: 2020-5-3
footer: libibverbs
header: "Libibverbs Programmer's Manual"
layout: page
license: 'Licensed under the OpenIB.org BSD license (FreeBSD Variant) - See COPYING.md'
section: 3
title: ibv_import_pd, ibv_unimport_pd
---

# NAME

ibv_import_pd - import a PD from a given ibv_context

ibv_unimport_pd - unimport a PD

# SYNOPSIS

```c
#include <infiniband/verbs.h>

struct ibv_pd *ibv_import_pd(struct ibv_context *context, uint32_t pd_handle);
void ibv_unimport_pd(struct ibv_pd *pd)

```
# DESCRIPTION
**ibv_import_pd()** returns a protection domain (PD) that is associated with the given
*pd_handle* in the given *context*.
The input *pd_handle* value must be a valid kernel handle for a PD object in the given *context*.
It can be achieved from the original PD by getting its ibv_pd->handle member value.
The returned *ibv_pd* can be used in all verbs that get a protection domain.
**ibv_unimport_pd()** unimport the PD.
Once the PD usage has been ended ibv_dealloc_pd() or ibv_unimport_pd() should be called.
The first one will go to the kernel to destroy the object once the second one way cleanup what
ever is needed/opposite of the import without calling the kernel.
This is the responsibility of the application to coordinate between all ibv_context(s) that use this PD.
Once destroy is done no other process can touch the object except for unimport. All users of the context must
collaborate to ensure this.
# RETURN VALUE
**ibv_import_pd()** returns a pointer to the allocated PD, or NULL if the request fails.
# SEE ALSO
**ibv_alloc_pd**(3),
**ibv_dealloc_pd**(3),
# AUTHOR
Yishai Hadas <yishaih@mellanox.com>
14 changes: 14 additions & 0 deletions libibverbs/verbs.c
Expand Up @@ -352,6 +352,20 @@ struct ibv_mr *ibv_reg_mr_iova2(struct ibv_pd *pd, void *addr, size_t length,
return ibv_reg_mr_iova(pd, addr, length, iova, access);
}


struct ibv_pd *ibv_import_pd(struct ibv_context *context,
uint32_t pd_handle)
{
return get_ops(context)->import_pd(context, pd_handle);
}


void ibv_unimport_pd(struct ibv_pd *pd)
{
get_ops(pd->context)->unimport_pd(pd);
}


LATEST_SYMVER_FUNC(ibv_rereg_mr, 1_1, "IBVERBS_1.1",
int,
struct ibv_mr *mr, int flags,
Expand Down
11 changes: 11 additions & 0 deletions libibverbs/verbs.h
Expand Up @@ -2246,6 +2246,17 @@ int ibv_close_device(struct ibv_context *context);
*/
struct ibv_context *ibv_import_device(int cmd_fd);

/**
* ibv_import_pd - Import a protetion domain
*/
struct ibv_pd *ibv_import_pd(struct ibv_context *context,
uint32_t pd_handle);

/**
* ibv_unimport_pd - Unimport a protetion domain
*/
void ibv_unimport_pd(struct ibv_pd *pd);

/**
* ibv_get_async_event - Get next async event
* @event: Pointer to use to return async event
Expand Down

0 comments on commit 05ae307

Please sign in to comment.