-Bottom: 8f54664c1ae0c2059bd040a5eb02d960e77020b9
-Top: 50fe62a5135102a5b41345c318cadbad44e6e872
+Bottom: ff25a98f5caa5889dfa52d7e2a6a9aa3e69b3ee5
+Top: ff25a98f5caa5889dfa52d7e2a6a9aa3e69b3ee5
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-09-07 14:38:07 -0700
---
-diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
-index f22f287..38933aa 100644
---- a/include/infiniband/driver.h
-+++ b/include/infiniband/driver.h
-@@ -53,6 +53,17 @@
- */
- #define IBV_DEVICE_LIBRARY_EXTENSION rdmav2
-
-+enum verbs_xrcd_mask {
-+ VERBS_XRCD_HANDLE = 1 << 0,
-+ VERBS_XRCD_RESERVED = 1 << 1
-+};
-+
-+struct verbs_xrcd {
-+ struct ibv_xrcd xrcd;
-+ uint64_t comp_mask;
-+ uint32_t handle;
-+};
-+
- typedef struct ibv_device *(*ibv_driver_init_func)(const char *uverbs_sys_path,
- int abi_version);
- typedef struct verbs_device *(*verbs_driver_init_func)(const char *uverbs_sys_path,
-@@ -78,6 +89,11 @@ int ibv_cmd_alloc_pd(struct ibv_context *context, struct ibv_pd *pd,
- struct ibv_alloc_pd *cmd, size_t cmd_size,
- struct ibv_alloc_pd_resp *resp, size_t resp_size);
- int ibv_cmd_dealloc_pd(struct ibv_pd *pd);
-+int ibv_cmd_open_xrcd(struct ibv_context *context, struct verbs_xrcd *xrcd,
-+ int fd, int oflags,
-+ struct ibv_open_xrcd *cmd, size_t cmd_size,
-+ struct ibv_open_xrcd_resp *resp, size_t resp_size);
-+int ibv_cmd_close_xrcd(struct verbs_xrcd *xrcd);
- #define IBV_CMD_REG_MR_HAS_RESP_PARAMS
- int ibv_cmd_reg_mr(struct ibv_pd *pd, void *addr, size_t length,
- uint64_t hca_va, int access,
-diff --git a/include/infiniband/kern-abi.h b/include/infiniband/kern-abi.h
-index 619ea7e..d7c673f 100644
---- a/include/infiniband/kern-abi.h
-+++ b/include/infiniband/kern-abi.h
-@@ -85,7 +85,9 @@ enum {
- IB_USER_VERBS_CMD_MODIFY_SRQ,
- IB_USER_VERBS_CMD_QUERY_SRQ,
- IB_USER_VERBS_CMD_DESTROY_SRQ,
-- IB_USER_VERBS_CMD_POST_SRQ_RECV
-+ IB_USER_VERBS_CMD_POST_SRQ_RECV,
-+ IB_USER_VERBS_CMD_OPEN_XRCD,
-+ IB_USER_VERBS_CMD_CLOSE_XRCD,
- };
-
- /*
-@@ -246,6 +248,27 @@ struct ibv_dealloc_pd {
- __u32 pd_handle;
- };
-
-+struct ibv_open_xrcd {
-+ __u32 command;
-+ __u16 in_words;
-+ __u16 out_words;
-+ __u64 response;
-+ __u32 fd;
-+ __u32 oflags;
-+ __u64 driver_data[0];
-+};
-+
-+struct ibv_open_xrcd_resp {
-+ __u32 xrcd_handle;
-+};
-+
-+struct ibv_close_xrcd {
-+ __u32 command;
-+ __u16 in_words;
-+ __u16 out_words;
-+ __u32 xrcd_handle;
-+};
-+
- struct ibv_reg_mr {
- __u32 command;
- __u16 in_words;
-@@ -804,6 +827,8 @@ enum {
- * trick opcodes in IBV_INIT_CMD() doesn't break.
- */
- IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL_V2 = -1,
-+ IB_USER_VERBS_CMD_OPEN_XRCD_V2 = -1,
-+ IB_USER_VERBS_CMD_CLOSE_XRCD_V2 = -1,
- };
-
- struct ibv_destroy_cq_v1 {
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index cd7f916..ca330e0 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
-@@ -1,6 +1,6 @@
- /*
- * Copyright (c) 2004, 2005 Topspin Communications. All rights reserved.
-- * Copyright (c) 2004 Intel Corporation. All rights reserved.
-+ * Copyright (c) 2004, 2011-2012 Intel Corporation. All rights reserved.
- * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2005 PathScale, Inc. All rights reserved.
- *
-@@ -39,6 +39,7 @@
- #include <stdint.h>
- #include <pthread.h>
- #include <stddef.h>
-+#include <errno.h>
-
- #ifdef __cplusplus
- # define BEGIN_C_DECLS extern "C" {
-@@ -312,6 +313,10 @@ struct ibv_pd {
- uint32_t handle;
- };
-
-+struct ibv_xrcd {
-+ struct ibv_context *context;
-+};
-+
- enum ibv_rereg_mr_flags {
- IBV_REREG_MR_CHANGE_TRANSLATION = (1 << 0),
- IBV_REREG_MR_CHANGE_PD = (1 << 1),
-@@ -728,11 +733,13 @@ struct ibv_context {
- };
-
- struct verbs_context {
--
- /* "grows up" - new fields go here
- int (*drv_new_func1) (); new corresponding provider call of func1
- int (*lib_new_func1) (); New library call func1
- */
-+ struct ibv_xrcd * (*open_xrcd)(struct ibv_context *context,
-+ int fd, int oflags);
-+ int (*close_xrcd)(struct ibv_xrcd *xrcd);
- size_t sz; /* Set by library on struct allocation,must be
- * located right before struct ibv_context
- */
-@@ -746,6 +753,11 @@ static inline struct verbs_context *verbs_get_ctx(
- NULL : container_of(ctx, struct verbs_context, context);
- }
-
-+#define verbs_get_ctx_op(ctx, op) ({ \
-+ struct verbs_context *vctx = verbs_get_ctx(ctx); \
-+ (!vctx || (vctx->sz < sizeof(*vctx) - offsetof(struct verbs_context, op)) || \
-+ !vctx->op) ? NULL : vctx; })
-+
- static inline struct verbs_device *verbs_get_device(
- const struct ibv_device *dev)
- {
-@@ -831,7 +843,7 @@ static inline int ___ibv_query_port(struct ibv_context *context,
- uint8_t port_num,
- struct ibv_port_attr *port_attr)
- {
-- /* For compatability when running with old libibverbs */
-+ /* For compatibility when running with old libibverbs */
- port_attr->link_layer = IBV_LINK_LAYER_UNSPECIFIED;
- port_attr->reserved = 0;
-
-@@ -864,6 +876,29 @@ struct ibv_pd *ibv_alloc_pd(struct ibv_context *context);
- int ibv_dealloc_pd(struct ibv_pd *pd);
-
- /**
-+ * ibv_open_xrcd - Open an extended connection domain
-+ */
-+static inline struct ibv_xrcd *
-+ibv_open_xrcd(struct ibv_context *context, int fd, int oflags)
-+{
-+ struct verbs_context *vctx = verbs_get_ctx_op(context, open_xrcd);
-+ if (!vctx) {
-+ errno = ENOSYS;
-+ return NULL;
-+ }
-+ return vctx->open_xrcd(context, fd, oflags);
-+}
-+
-+/**
-+ * ibv_close_xrcd - Close an extended connection domain
-+ */
-+static inline int ibv_close_xrcd(struct ibv_xrcd *xrcd)
-+{
-+ struct verbs_context *vctx = verbs_get_ctx(xrcd->context);
-+ return vctx->close_xrcd(xrcd);
-+}
-+
-+/**
- * ibv_reg_mr - Register a memory region
- */
- struct ibv_mr *ibv_reg_mr(struct ibv_pd *pd, void *addr,
-diff --git a/src/cmd.c b/src/cmd.c
-index dab8930..f9beded 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -194,6 +194,40 @@ int ibv_cmd_dealloc_pd(struct ibv_pd *pd)
- return 0;
- }
-
-+int ibv_cmd_open_xrcd(struct ibv_context *context, struct verbs_xrcd *xrcd,
-+ int fd, int oflags,
-+ struct ibv_open_xrcd *cmd, size_t cmd_size,
-+ struct ibv_open_xrcd_resp *resp, size_t resp_size)
-+{
-+ IBV_INIT_CMD_RESP(cmd, cmd_size, OPEN_XRCD, resp, resp_size);
-+
-+ cmd->fd = fd;
-+ cmd->oflags = oflags;
-+ if (write(context->cmd_fd, cmd, cmd_size) != cmd_size)
-+ return errno;
-+
-+ VALGRIND_MAKE_MEM_DEFINED(resp, resp_size);
-+
-+ xrcd->xrcd.context = context;
-+ xrcd->comp_mask = VERBS_XRCD_HANDLE;
-+ xrcd->handle = resp->xrcd_handle;
-+
-+ return 0;
-+}
-+
-+int ibv_cmd_close_xrcd(struct verbs_xrcd *xrcd)
-+{
-+ struct ibv_close_xrcd cmd;
-+
-+ IBV_INIT_CMD(&cmd, sizeof cmd, CLOSE_XRCD);
-+ cmd.xrcd_handle = xrcd->handle;
-+
-+ if (write(xrcd->xrcd.context->cmd_fd, &cmd, sizeof cmd) != sizeof cmd)
-+ return errno;
-+
-+ return 0;
-+}
-+
- int ibv_cmd_reg_mr(struct ibv_pd *pd, void *addr, size_t length,
- uint64_t hca_va, int access,
- struct ibv_mr *mr, struct ibv_reg_mr *cmd,
-diff --git a/src/libibverbs.map b/src/libibverbs.map
-index ee9adea..9a15f3f 100644
---- a/src/libibverbs.map
-+++ b/src/libibverbs.map
-@@ -97,4 +97,8 @@ IBVERBS_1.1 {
- ibv_port_state_str;
- ibv_event_type_str;
- ibv_wc_status_str;
-+
-+ ibv_cmd_open_xrcd;
-+ ibv_cmd_close_xrcd;
-+
- } IBVERBS_1.0;
+