From: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
Some of the drivers do not provide implementations for all ops
eg bind_mw, modify_srq, etc.
Unfortunately the code doesn't always check for NULL, and even if it does
it doesn't always return the correct error code.
Solve this problem globally and permanently by providing dummy ops for
every single function op.
This patch just provides the dummy ops, they will still get overwritten until
all the providers switch to using verbs_set_ops.
Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
---
libibverbs/CMakeLists.txt | 1 +
libibverbs/device.c | 2 +
libibverbs/driver.h | 98 +++++++++
libibverbs/dummy_ops.c | 469 +++++++++++++++++++++++++++++++++++++++++++
libibverbs/ibverbs.h | 1 +
libibverbs/libibverbs.map.in | 1 +
6 files changed, 572 insertions(+)
create mode 100644 libibverbs/dummy_ops.c
diff --git a/libibverbs/CMakeLists.txt b/libibverbs/CMakeLists.txt
index af340a84cbed1c..6b41b875210cfb 100644
--- a/libibverbs/CMakeLists.txt
+++ b/libibverbs/CMakeLists.txt
@@ -28,6 +28,7 @@ rdma_library(ibverbs "${CMAKE_CURRENT_BINARY_DIR}/libibverbs.map"
cmd.c
compat-1_0.c
device.c
+ dummy_ops.c
enum_strs.c
init.c
marshall.c
diff --git a/libibverbs/device.c b/libibverbs/device.c
index db6dae5b25af59..491918b1999fb4 100644
--- a/libibverbs/device.c
+++ b/libibverbs/device.c
@@ -224,6 +224,8 @@ int verbs_init_context(struct verbs_context *context_ex,
return -1;
}
+ verbs_set_ops(context_ex, &verbs_dummy_ops);
+
return 0;
}
diff --git a/libibverbs/driver.h b/libibverbs/driver.h
index 00847a41bc468e..a0728f7c6bc071 100644
--- a/libibverbs/driver.h
+++ b/libibverbs/driver.h
@@ -169,6 +169,102 @@ struct verbs_device {
struct verbs_sysfs_dev *sysfs;
};
+/*
+ * Must change the PRIVATE IBVERBS_PRIVATE_ symbol if this is changed. This is
+ * the union of every op the driver can support. If new elements are added to
+ * this structure then verbs_dummy_ops must also be updated.
+ *
+ * Keep sorted.
+ */
+struct verbs_context_ops {
+ struct ibv_mw *(*alloc_mw)(struct ibv_pd *pd, enum ibv_mw_type type);
+ struct ibv_pd *(*alloc_pd)(struct ibv_context *context);
+ void (*async_event)(struct ibv_async_event *event);
+ int (*attach_mcast)(struct ibv_qp *qp, const union ibv_gid *gid,
+ uint16_t lid);
+ int (*bind_mw)(struct ibv_qp *qp, struct ibv_mw *mw,
+ struct ibv_mw_bind *mw_bind);
+ int (*close_xrcd)(struct ibv_xrcd *xrcd);
+ void (*cq_event)(struct ibv_cq *cq);
+ struct ibv_ah *(*create_ah)(struct ibv_pd *pd,
+ struct ibv_ah_attr *attr);
+ struct ibv_cq *(*create_cq)(struct ibv_context *context, int cqe,
+ struct ibv_comp_channel *channel,
+ int comp_vector);
+ struct ibv_cq_ex *(*create_cq_ex)(
+ struct ibv_context *context,
+ struct ibv_cq_init_attr_ex *init_attr);
+ struct ibv_flow *(*create_flow)(struct ibv_qp *qp,
+ struct ibv_flow_attr *flow_attr);
+ struct ibv_qp *(*create_qp)(struct ibv_pd *pd,
+ struct ibv_qp_init_attr *attr);
+ struct ibv_qp *(*create_qp_ex)(
+ struct ibv_context *context,
+ struct ibv_qp_init_attr_ex *qp_init_attr_ex);
+ struct ibv_rwq_ind_table *(*create_rwq_ind_table)(
+ struct ibv_context *context,
+ struct ibv_rwq_ind_table_init_attr *init_attr);
+ struct ibv_srq *(*create_srq)(struct ibv_pd *pd,
+ struct ibv_srq_init_attr *srq_init_attr);
+ struct ibv_srq *(*create_srq_ex)(
+ struct ibv_context *context,
+ struct ibv_srq_init_attr_ex *srq_init_attr_ex);
+ struct ibv_wq *(*create_wq)(struct ibv_context *context,
+ struct ibv_wq_init_attr *wq_init_attr);
+ int (*dealloc_mw)(struct ibv_mw *mw);
+ int (*dealloc_pd)(struct ibv_pd *pd);
+ int (*dereg_mr)(struct ibv_mr *mr);
+ int (*destroy_ah)(struct ibv_ah *ah);
+ int (*destroy_cq)(struct ibv_cq *cq);
+ int (*destroy_flow)(struct ibv_flow *flow);
+ int (*destroy_qp)(struct ibv_qp *qp);
+ int (*destroy_rwq_ind_table)(struct ibv_rwq_ind_table *rwq_ind_table);
+ int (*destroy_srq)(struct ibv_srq *srq);
+ int (*destroy_wq)(struct ibv_wq *wq);
+ int (*detach_mcast)(struct ibv_qp *qp, const union ibv_gid *gid,
+ uint16_t lid);
+ int (*get_srq_num)(struct ibv_srq *srq, uint32_t *srq_num);
+ int (*modify_cq)(struct ibv_cq *cq, struct ibv_modify_cq_attr *attr);
+ int (*modify_qp)(struct ibv_qp *qp, struct ibv_qp_attr *attr,
+ int attr_mask);
+ int (*modify_srq)(struct ibv_srq *srq, struct ibv_srq_attr *srq_attr,
+ int srq_attr_mask);
+ int (*modify_wq)(struct ibv_wq *wq, struct ibv_wq_attr *wq_attr);
+ struct ibv_qp *(*open_qp)(struct ibv_context *context,
+ struct ibv_qp_open_attr *attr);
+ struct ibv_xrcd *(*open_xrcd)(
+ struct ibv_context *context,
+ struct ibv_xrcd_init_attr *xrcd_init_attr);
+ int (*poll_cq)(struct ibv_cq *cq, int num_entries, struct ibv_wc *wc);
+ int (*post_recv)(struct ibv_qp *qp, struct ibv_recv_wr *wr,
+ struct ibv_recv_wr **bad_wr);
+ int (*post_send)(struct ibv_qp *qp, struct ibv_send_wr *wr,
+ struct ibv_send_wr **bad_wr);
+ int (*post_srq_ops)(struct ibv_srq *srq, struct ibv_ops_wr *op,
+ struct ibv_ops_wr **bad_op);
+ int (*post_srq_recv)(struct ibv_srq *srq, struct ibv_recv_wr *recv_wr,
+ struct ibv_recv_wr **bad_recv_wr);
+ int (*query_device)(struct ibv_context *context,
+ struct ibv_device_attr *device_attr);
+ int (*query_device_ex)(struct ibv_context *context,
+ const struct ibv_query_device_ex_input *input,
+ struct ibv_device_attr_ex *attr,
+ size_t attr_size);
+ int (*query_port)(struct ibv_context *context, uint8_t port_num,
+ struct ibv_port_attr *port_attr);
+ int (*query_qp)(struct ibv_qp *qp, struct ibv_qp_attr *attr,
+ int attr_mask, struct ibv_qp_init_attr *init_attr);
+ int (*query_rt_values)(struct ibv_context *context,
+ struct ibv_values_ex *values);
+ int (*query_srq)(struct ibv_srq *srq, struct ibv_srq_attr *srq_attr);
+ struct ibv_mr *(*reg_mr)(struct ibv_pd *pd, void *addr, size_t length,
+ int access);
+ int (*req_notify_cq)(struct ibv_cq *cq, int solicited_only);
+ int (*rereg_mr)(struct ibv_mr *mr, int flags, struct ibv_pd *pd,
+ void *addr, size_t length, int access);
+ int (*resize_cq)(struct ibv_cq *cq, int cqe);
+};
+
static inline struct verbs_device *
verbs_get_device(const struct ibv_device *dev)
{
@@ -208,6 +304,8 @@ void *_verbs_init_and_alloc_context(struct ibv_device *device, int cmd_fd,
int verbs_init_context(struct verbs_context *context_ex,
struct ibv_device *device, int cmd_fd);
void verbs_uninit_context(struct verbs_context *context);
+void verbs_set_ops(struct verbs_context *vctx,
+ const struct verbs_context_ops *ops);
void verbs_init_cq(struct ibv_cq *cq, struct ibv_context *context,
struct ibv_comp_channel *channel,
diff --git a/libibverbs/dummy_ops.c b/libibverbs/dummy_ops.c
new file mode 100644
index 00000000000000..88689d8aad9183
--- /dev/null
+++ b/libibverbs/dummy_ops.c
@@ -0,0 +1,469 @@
+/*
+ * Copyright (c) 2017 Mellanox Technologies, Inc. All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses. You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include <infiniband/driver.h>
+#include "ibverbs.h"
+#include <errno.h>
+
+static struct ibv_mw *alloc_mw(struct ibv_pd *pd, enum ibv_mw_type type)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_pd *alloc_pd(struct ibv_context *context)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static void async_event(struct ibv_async_event *event)
+{
+}
+
+static int attach_mcast(struct ibv_qp *qp, const union ibv_gid *gid,
+ uint16_t lid)
+{
+ return ENOSYS;
+}
+
+static int bind_mw(struct ibv_qp *qp, struct ibv_mw *mw,
+ struct ibv_mw_bind *mw_bind)
+{
+ return ENOSYS;
+}
+
+static int close_xrcd(struct ibv_xrcd *xrcd)
+{
+ return ENOSYS;
+}
+
+static void cq_event(struct ibv_cq *cq)
+{
+}
+
+static struct ibv_ah *create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_cq *create_cq(struct ibv_context *context, int cqe,
+ struct ibv_comp_channel *channel,
+ int comp_vector)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_cq_ex *create_cq_ex(struct ibv_context *context,
+ struct ibv_cq_init_attr_ex *init_attr)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_flow *create_flow(struct ibv_qp *qp,
+ struct ibv_flow_attr *flow_attr)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_qp *create_qp(struct ibv_pd *pd,
+ struct ibv_qp_init_attr *attr)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_qp *create_qp_ex(struct ibv_context *context,
+ struct ibv_qp_init_attr_ex *qp_init_attr_ex)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_rwq_ind_table *
+create_rwq_ind_table(struct ibv_context *context,
+ struct ibv_rwq_ind_table_init_attr *init_attr)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_srq *create_srq(struct ibv_pd *pd,
+ struct ibv_srq_init_attr *srq_init_attr)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_srq *
+create_srq_ex(struct ibv_context *context,
+ struct ibv_srq_init_attr_ex *srq_init_attr_ex)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_wq *create_wq(struct ibv_context *context,
+ struct ibv_wq_init_attr *wq_init_attr)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static int dealloc_mw(struct ibv_mw *mw)
+{
+ return ENOSYS;
+}
+
+static int dealloc_pd(struct ibv_pd *pd)
+{
+ return ENOSYS;
+}
+
+static int dereg_mr(struct ibv_mr *mr)
+{
+ return ENOSYS;
+}
+
+static int destroy_ah(struct ibv_ah *ah)
+{
+ return ENOSYS;
+}
+
+static int destroy_cq(struct ibv_cq *cq)
+{
+ return ENOSYS;
+}
+
+static int destroy_flow(struct ibv_flow *flow)
+{
+ return ENOSYS;
+}
+
+static int destroy_qp(struct ibv_qp *qp)
+{
+ return ENOSYS;
+}
+
+static int destroy_rwq_ind_table(struct ibv_rwq_ind_table *rwq_ind_table)
+{
+ return ENOSYS;
+}
+
+static int destroy_srq(struct ibv_srq *srq)
+{
+ return ENOSYS;
+}
+
+static int destroy_wq(struct ibv_wq *wq)
+{
+ return ENOSYS;
+}
+
+static int detach_mcast(struct ibv_qp *qp, const union ibv_gid *gid,
+ uint16_t lid)
+{
+ return ENOSYS;
+}
+
+static int get_srq_num(struct ibv_srq *srq, uint32_t *srq_num)
+{
+ return ENOSYS;
+}
+
+static int modify_cq(struct ibv_cq *cq, struct ibv_modify_cq_attr *attr)
+{
+ return ENOSYS;
+}
+
+static int modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr, int attr_mask)
+{
+ return ENOSYS;
+}
+
+static int modify_srq(struct ibv_srq *srq, struct ibv_srq_attr *srq_attr,
+ int srq_attr_mask)
+{
+ return ENOSYS;
+}
+
+static int modify_wq(struct ibv_wq *wq, struct ibv_wq_attr *wq_attr)
+{
+ return ENOSYS;
+}
+
+static struct ibv_qp *open_qp(struct ibv_context *context,
+ struct ibv_qp_open_attr *attr)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static struct ibv_xrcd *open_xrcd(struct ibv_context *context,
+ struct ibv_xrcd_init_attr *xrcd_init_attr)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static int poll_cq(struct ibv_cq *cq, int num_entries, struct ibv_wc *wc)
+{
+ return ENOSYS;
+}
+
+static int post_recv(struct ibv_qp *qp, struct ibv_recv_wr *wr,
+ struct ibv_recv_wr **bad_wr)
+{
+ return ENOSYS;
+}
+
+static int post_send(struct ibv_qp *qp, struct ibv_send_wr *wr,
+ struct ibv_send_wr **bad_wr)
+{
+ return ENOSYS;
+}
+
+static int post_srq_ops(struct ibv_srq *srq, struct ibv_ops_wr *op,
+ struct ibv_ops_wr **bad_op)
+{
+ return ENOSYS;
+}
+
+static int post_srq_recv(struct ibv_srq *srq, struct ibv_recv_wr *recv_wr,
+ struct ibv_recv_wr **bad_recv_wr)
+{
+ return ENOSYS;
+}
+
+static int query_device(struct ibv_context *context,
+ struct ibv_device_attr *device_attr)
+{
+ return ENOSYS;
+}
+
+static int query_device_ex(struct ibv_context *context,
+ const struct ibv_query_device_ex_input *input,
+ struct ibv_device_attr_ex *attr, size_t attr_size)
+{
+ return ENOSYS;
+}
+
+static int query_port(struct ibv_context *context, uint8_t port_num,
+ struct ibv_port_attr *port_attr)
+{
+ return ENOSYS;
+}
+
+static int query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr, int attr_mask,
+ struct ibv_qp_init_attr *init_attr)
+{
+ return ENOSYS;
+}
+
+static int query_rt_values(struct ibv_context *context,
+ struct ibv_values_ex *values)
+{
+ return ENOSYS;
+}
+
+static int query_srq(struct ibv_srq *srq, struct ibv_srq_attr *srq_attr)
+{
+ return ENOSYS;
+}
+
+static struct ibv_mr *reg_mr(struct ibv_pd *pd, void *addr, size_t length,
+ int access)
+{
+ errno = ENOSYS;
+ return NULL;
+}
+
+static int req_notify_cq(struct ibv_cq *cq, int solicited_only)
+{
+ return ENOSYS;
+}
+
+static int rereg_mr(struct ibv_mr *mr, int flags, struct ibv_pd *pd, void *addr,
+ size_t length, int access)
+{
+ errno = ENOSYS;
+ return IBV_REREG_MR_ERR_INPUT;
+}
+
+static int resize_cq(struct ibv_cq *cq, int cqe)
+{
+ return ENOSYS;
+}
+
+/*
+ * Ops in verbs_dummy_ops simply return an ENOSYS error code when called, or
+ * do nothing. They are placed in the ops structures if the provider does not
+ * provide an op for the function.
+ *
+ * NOTE: This deliberately does not use named initializers to trigger a
+ * '-Wmissing-field-initializers' warning if the struct is changed without
+ * changing this.
+ *
+ * Keep sorted.
+ */
+const struct verbs_context_ops verbs_dummy_ops = {
+ alloc_mw,
+ alloc_pd,
+ async_event,
+ attach_mcast,
+ bind_mw,
+ close_xrcd,
+ cq_event,
+ create_ah,
+ create_cq,
+ create_cq_ex,
+ create_flow,
+ create_qp,
+ create_qp_ex,
+ create_rwq_ind_table,
+ create_srq,
+ create_srq_ex,
+ create_wq,
+ dealloc_mw,
+ dealloc_pd,
+ dereg_mr,
+ destroy_ah,
+ destroy_cq,
+ destroy_flow,
+ destroy_qp,
+ destroy_rwq_ind_table,
+ destroy_srq,
+ destroy_wq,
+ detach_mcast,
+ get_srq_num,
+ modify_cq,
+ modify_qp,
+ modify_srq,
+ modify_wq,
+ open_qp,
+ open_xrcd,
+ poll_cq,
+ post_recv,
+ post_send,
+ post_srq_ops,
+ post_srq_recv,
+ query_device,
+ query_device_ex,
+ query_port,
+ query_qp,
+ query_rt_values,
+ query_srq,
+ reg_mr,
+ req_notify_cq,
+ rereg_mr,
+ resize_cq,
+};
+
+/*
+ * Set the ops in a context. If the function pointer in op is NULL then it is
+ * not set. This allows the providers to call the function multiple times in
+ * order to have variations of the ops for different HW configurations.
+ */
+void verbs_set_ops(struct verbs_context *vctx,
+ const struct verbs_context_ops *ops)
+{
+ struct ibv_context_ops *ctx = &vctx->context.ops;
+
+#define SET_OP(ptr, name) \
+ do { \
+ if (ops->name) \
+ (ptr)->name = ops->name; \
+ } while (0)
+
+#define SET_OP2(ptr, iname, name) \
+ do { \
+ if (ops->name) \
+ (ptr)->iname = ops->name; \
+ } while (0)
+
+ SET_OP(ctx, alloc_mw);
+ SET_OP(ctx, alloc_pd);
+ SET_OP(ctx, async_event);
+ SET_OP(ctx, attach_mcast);
+ SET_OP(ctx, bind_mw);
+ SET_OP(vctx, close_xrcd);
+ SET_OP(ctx, cq_event);
+ SET_OP(ctx, create_ah);
+ SET_OP(ctx, create_cq);
+ SET_OP(vctx, create_cq_ex);
+ SET_OP2(vctx, ibv_create_flow, create_flow);
+ SET_OP(ctx, create_qp);
+ SET_OP(vctx, create_qp_ex);
+ SET_OP(vctx, create_rwq_ind_table);
+ SET_OP(ctx, create_srq);
+ SET_OP(vctx, create_srq_ex);
+ SET_OP(vctx, create_wq);
+ SET_OP(ctx, dealloc_mw);
+ SET_OP(ctx, dealloc_pd);
+ SET_OP(ctx, dereg_mr);
+ SET_OP(ctx, destroy_ah);
+ SET_OP(ctx, destroy_cq);
+ SET_OP2(vctx, ibv_destroy_flow, destroy_flow);
+ SET_OP(ctx, destroy_qp);
+ SET_OP(vctx, destroy_rwq_ind_table);
+ SET_OP(ctx, destroy_srq);
+ SET_OP(vctx, destroy_wq);
+ SET_OP(ctx, detach_mcast);
+ SET_OP(vctx, get_srq_num);
+ SET_OP(vctx, modify_cq);
+ SET_OP(ctx, modify_qp);
+ SET_OP(ctx, modify_srq);
+ SET_OP(vctx, modify_wq);
+ SET_OP(vctx, open_qp);
+ SET_OP(vctx, open_xrcd);
+ SET_OP(ctx, poll_cq);
+ SET_OP(ctx, post_recv);
+ SET_OP(ctx, post_send);
+ SET_OP(vctx, post_srq_ops);
+ SET_OP(ctx, post_srq_recv);
+ SET_OP(ctx, query_device);
+ SET_OP(vctx, query_device_ex);
+ SET_OP(ctx, query_port);
+ SET_OP(ctx, query_qp);
+ SET_OP(vctx, query_rt_values);
+ SET_OP(ctx, query_srq);
+ SET_OP(ctx, reg_mr);
+ SET_OP(ctx, req_notify_cq);
+ SET_OP(ctx, rereg_mr);
+ SET_OP(ctx, resize_cq);
+
+#undef SET_OP
+#undef SET_OP2
+}
diff --git a/libibverbs/ibverbs.h b/libibverbs/ibverbs.h
index 74f2ab81f5a95c..2da44967c4f1c0 100644
--- a/libibverbs/ibverbs.h
+++ b/libibverbs/ibverbs.h
@@ -50,6 +50,7 @@ struct ibv_abi_compat_v2 {
};
extern int abi_ver;
+extern const struct verbs_context_ops verbs_dummy_ops;
int ibverbs_get_device_list(struct list_head *list);
int ibverbs_init(void);
diff --git a/libibverbs/libibverbs.map.in b/libibverbs/libibverbs.map.in
index b787b051b4c381..e71376a67e9206 100644
--- a/libibverbs/libibverbs.map.in
+++ b/libibverbs/libibverbs.map.in
@@ -163,6 +163,7 @@ IBVERBS_PRIVATE_@IBVERBS_PABI_VERSION@ {
ibv_query_gid_type;
ibv_register_driver;
verbs_register_driver_@IBVERBS_PABI_VERSION@;
+ verbs_set_ops;
verbs_uninit_context;
verbs_init_cq;
ibv_cmd_modify_cq;
--
2.15.1
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
