PSARC/2015/479 PSIF Solaris IB HCA Driver
22111504 RFE for libsif integration into userland gate
# This patch does the src changes specific to solaris.
# It is developed By solaris PSIF team. We plan to have a common upstream repo
# and submit these changes to it, but do not yet have a target date of doing it.
diff -r 1584d5cbb44d src/cq.c
--- a/src/cq.c Wed Feb 10 12:40:22 2016 +0530
+++ b/src/cq.c Wed Mar 09 22:17:00 2016 +0530
@@ -43,7 +43,9 @@
#include <strings.h>
#include <pthread.h>
#include <errno.h>
+#if !(defined(__SVR4) && defined(__sun))
#include <endian.h>
+#endif
#include <string.h>
#include "sif.h"
@@ -57,6 +59,13 @@
#include "sif_int_user.h"
#include "cq.h"
+#ifdef _ILP32
+int sif_poll_cq(struct ibv_cq *ibcq, int num_entries, struct ibv_wc *wc)
+{
+ sif_log(to_sctx(ibcq->context), SIF_INFO, "poll_cq not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+#else
static inline int cq_length(struct sif_cq *cq, u32 head, u32 tail)
{
return (int)(tail + cq->entries - head) & cq->mask;
@@ -139,7 +148,7 @@
qp->sq.sw->head_seq = sq_seq_num;
sif_log(uc, SIF_CQ,
- "wr_id 0x%lx on qp/sq %d sq_seq_num %d",
+ "wr_id 0x%"PRIx64" on qp/sq %d sq_seq_num %d",
wc->wr_id, cqe->qp, sq_seq_num);
if (uc->debug_mask & SIF_SQSOVRN)
@@ -154,9 +163,11 @@
*/
struct sif_rq *find_rq(struct sif_qp *qp, struct sif_cq *cq)
{
+#ifdef HAVE_VERBS_REGISTER_DRIVER
if (qp->verbs_qp.qp.qp_type == IBV_QPT_XRC_RECV)
return cq->xsrq;
else
+#endif
return qp->rq;
}
@@ -198,18 +209,23 @@
struct ibv_query_qp cmd;
int ret = 0;
+#ifdef HAVE_VERBS_REGISTER_DRIVER
+ struct ibv_qp *ibv_qp = &qp->verbs_qp.qp;
+#else
+ struct ibv_qp *ibv_qp = &qp->ibv_qp;
+#endif
memset(&attr, 0, sizeof(attr));
memset(&init_attr, 0, sizeof(init_attr));
- ret = ibv_cmd_query_qp(&qp->verbs_qp.qp, &attr, IBV_QP_STATE, &init_attr,
+ ret = ibv_cmd_query_qp(ibv_qp, &attr, IBV_QP_STATE, &init_attr,
&cmd, sizeof cmd);
if (!ret && attr.qp_state == IBV_QPS_ERR) {
- if (flush_qp(&qp->verbs_qp.qp, &attr, FLUSH_RQ))
+ if (flush_qp(ibv_qp, &attr, FLUSH_RQ))
sif_log(uc, SIF_INFO,"failed to flush RQ, QP %d", wc->qp_num);
}
}
#endif
/* TBD: Handle sg list case */
- sif_log(uc, SIF_CQ,"wr_id 0x%lx queue len %d", wc->wr_id, rq_len);
+ sif_log(uc, SIF_CQ,"wr_id 0x%"PRIx64" queue len %d", wc->wr_id, rq_len);
return 0;
}
@@ -253,7 +269,7 @@
*/
sif_log(uc, log_level,
"error compl on cq %d, seq_num %d qpn 0x%x, "
- "wc_id %Ld status %s(%d), vendor_err 0x%x",
+ "wc_id %"SIFPRIx64" status %s(%d), vendor_err 0x%x",
cq->index, lcqe.seq_num, qpn, lcqe.wc_id.rq_id,
string_enum_psif_wc_status(lcqe.status),
lcqe.status, lcqe.vendor_err);
@@ -282,7 +298,7 @@
default:
sif_log(uc, SIF_WCE,
"unknown opcode on cq %d, seq_num %d qpn 0x%x, "
- "wc_id %Ld status %s(%d), vendor_err 0x%x",
+ "wc_id %"SIFPRIx64" status %s(%d), vendor_err 0x%x",
cq->index, lcqe.seq_num, qpn, lcqe.wc_id.rq_id,
string_enum_psif_wc_status(lcqe.status),
lcqe.status, lcqe.vendor_err);
@@ -437,3 +453,4 @@
npolled, polled_value);
return !ret ? npolled : ret;
}
+#endif
diff -r 1584d5cbb44d src/encoding.h
--- a/src/encoding.h Wed Feb 10 12:40:22 2016 +0530
+++ b/src/encoding.h Wed Mar 09 22:17:00 2016 +0530
@@ -37,16 +37,25 @@
#define _SIF_ENCODING_H
#include <sys/types.h>
+#if !(defined(__SVR4) && defined(__sun))
#include "kernel_types.h"
+#endif
#include "psif_hw_data.h"
#define true 1
#define false 0
#define bool int
+#if defined(__SVR4) && defined(__sun)
+#include <sys/atomic.h>
+typedef volatile uint32_t atomic_t;
+#define atomic_inc_return(ptr) atomic_inc_32_nv(ptr)
+#define atomic_dec_return(ptr) atomic_dec_32_nv(ptr)
+#else
typedef volatile __u32 atomic_t;
#define atomic_inc_return(ptr) __sync_add_and_fetch(ptr, 1)
#define atomic_dec_return(ptr) __sync_sub_and_fetch(ptr, 1)
+#endif
#if 1
#define SIF_INFO 0x1L
@@ -85,10 +94,17 @@
#endif
#define min(x,y) ((x) > (y) ? (y) : (x))
+#if defined(__SVR4) && defined(__sun)
+#define cpu_to_be32 htonl
+#define cpu_to_be64 htonll
+#define be32_to_cpu ntohl
+#define be64_to_cpu ntohll
+#else
#define cpu_to_be32 htobe32
#define cpu_to_be64 htobe64
#define be32_to_cpu be32toh
#define be64_to_cpu be64toh
+#endif
#ifdef __x86_64
#undef wmb
diff -r 1584d5cbb44d src/hwprint.c
--- a/src/hwprint.c Wed Feb 10 12:40:22 2016 +0530
+++ b/src/hwprint.c Wed Mar 09 22:17:00 2016 +0530
@@ -34,6 +34,8 @@
* hwprint.c: User level wrapper for hardware (generated) struct print support
*/
#include <sys/types.h>
+#if !(defined(__SVR4) && defined(__sun))
#define OS_PRIx64 "lx"
+#endif
#include "sif.h"
#include "psif_hw_print.c"
diff -r 1584d5cbb44d src/mr.c
--- a/src/mr.c Wed Feb 10 12:40:22 2016 +0530
+++ b/src/mr.c Wed Mar 09 22:17:00 2016 +0530
@@ -45,7 +45,33 @@
#include "sif_abi.h"
#include "mr.h"
#include <assert.h>
+#include <errno.h>
+#ifdef _ILP32
+struct ibv_mr *sif_reg_mr(struct ibv_pd *ibpd, void *addr,
+ size_t length, int access)
+{
+ sif_log(to_sctx(ibpd->context), SIF_INFO, "reg_mr not supported for 32-bit. Please use 64-bit Application");
+ errno = ENOTSUP;
+ return NULL;
+}
+
+struct ibv_mr *sif_rereg_mr(struct ibv_mr *ibmr, int flags,
+ struct ibv_pd *ibpd, void *addr, size_t length,
+ int access)
+{
+ sif_log(to_sctx(ibpd->context), SIF_INFO, "rereg_mr not supported for 32-bit. Please use 64-bit Application");
+ errno = ENOTSUP;
+ return NULL;
+}
+
+int sif_dereg_mr(struct ibv_mr *ibmr)
+{
+ sif_log(to_sctx(ibmr->context), SIF_INFO,"dereg_mr not supported for 32-bit. Please use 64-bit Application");
+ return ENOTSUP;
+}
+
+#else
struct ibv_mr *sif_reg_mr(struct ibv_pd *ibpd, void *addr,
size_t length, int access)
{
@@ -103,7 +129,7 @@
sctx->bypass_mr_ref = malloc(ref_sz);
if (!sctx->bypass_mr_ref) {
sif_log(sctx, SIF_INFO,
- "Failed to allocate 0x%lx bytes of storage for bypass MR references\n",
+ "Failed to allocate 0x%zx bytes of storage for bypass MR references\n",
ref_sz);
ret = ENOMEM;
goto bypass_ref_alloc_failed;
@@ -168,6 +194,38 @@
free(mr);
return 0;
}
+#endif
+
+#if defined(__SVR4) && defined(__sun)
+/*
+ * Libibverbs will not validate the function ptr for non-NULL value for fmr
+ * callbacks.If undefined, application will core dump if it uses any of
+ * these calls.
+ */
+struct ibv_mr *sif_reg_mr_relaxed(struct ibv_pd *ibpd, void *addr, size_t length, int access)
+{
+ struct sif_context *sctx = to_sctx(ibpd->context);
+
+ sif_log(sctx, SIF_INFO, "sif_reg_relaxed_mr Not Implemented");
+ errno = ENOTSUP;
+
+ return NULL;
+}
+
+int sif_dereg_mr_relaxed(struct ibv_mr *ibmr)
+{
+ struct sif_context *sctx = to_sctx(ibmr->context);
+ sif_log(sctx, SIF_INFO, "sif_dereg_relaxed_mr Not Implemented");
+ return ENOTSUP;
+}
+
+int sif_flush_relaxed_mr(struct ibv_pd *ibpd)
+{
+ struct sif_context *sctx = to_sctx(ibpd->context);
+ sif_log(sctx, SIF_INFO, "sif_flush_relaxed_mr Not Implemented");
+ return ENOTSUP;
+}
+#endif
struct ibv_mw *sif_alloc_mw(struct ibv_pd *ibpd, enum ibv_mw_type type)
{
diff -r 1584d5cbb44d src/sif.c
--- a/src/sif.c Wed Feb 10 12:40:22 2016 +0530
+++ b/src/sif.c Wed Mar 09 22:17:00 2016 +0530
@@ -44,6 +44,7 @@
#include <sys/mman.h>
#include <pthread.h>
#include <string.h>
+#include <infiniband/verbs.h>
#ifndef HAVE_IBV_READ_SYSFS_FILE
#include <sys/types.h>
@@ -76,6 +77,8 @@
HCA(SUN, PSIF_VF),
HCA(SUN, SIBS_PF),
HCA(SUN, SIBS_VF),
+ HCA(SUN, SIBS2_PF),
+ HCA(SUN, SIBS2_VF),
};
static struct ibv_context_ops sif_ctx_ops = {
@@ -90,6 +93,12 @@
.rereg_mr = sif_rereg_mr,
.dereg_mr = sif_dereg_mr,
+#if defined(__SVR4) && defined(__sun)
+ .reg_mr_relaxed= sif_reg_mr_relaxed,
+ .dereg_mr_relaxed = sif_dereg_mr_relaxed,
+ .flush_relaxed_mr = sif_flush_relaxed_mr,
+#endif
+
.alloc_mw = sif_alloc_mw,
.bind_mw = sif_bind_mw,
.dealloc_mw = sif_dealloc_mw,
@@ -159,6 +168,16 @@
struct sif_device *sdev = to_sdev(ibdev);
char value[20];
char param_path[IBV_SYSFS_PATH_MAX];
+#if defined(__SVR4) && defined(__sun)
+/*
+ * See CR 22214822,22245798:collect buffer mode disabled for solaris
+ * SQ gives better performance on SPARC mode for
+ * smaller message sizes.
+ */
+ const char *cb_mode;
+ int mode;
+ const char *user_cb_disable;
+#endif
const char* dbm;
const char *cfum;
const char *odm;
@@ -170,6 +189,9 @@
#ifdef HAVE_VERBS_REGISTER_DRIVER
context = to_sctx(ibv_ctx);
+#if defined(__SVR4) && defined(__sun)
+ ibv_ctx->device = &v_device->device;
+#endif
#else
context = malloc(sizeof(*context));
if (!context)
@@ -177,23 +199,20 @@
/* The sif specific part needs to be zeroed out */
memset(context, 0, sizeof(*context));
ibv_ctx = &context->ibv_ctx;
+#if defined(__SVR4) && defined(__sun)
+ context->ibv_ctx.device = ibdev;
+#endif
#endif
/* Satisfy valgrind */
memset(&cmd,0,sizeof(cmd));
- /* Memory is allocated zeroed out by libsif */
-
- if (!sdev->min_resp_ms) {
- if (ibv_read_sysfs_file(sdev->verbs_dev.device.ibdev_path, "min_resp_ms",
- value, sizeof value) < 0)
- sdev->min_resp_ms = 500;
- else
- sscanf(value, "%li", &sdev->min_resp_ms);
- }
-
/* Re-read the current kernel default flags */
+#ifdef HAVE_VERBS_REGISTER_DRIVER
sprintf(param_path, "%s/device/driver/module/parameters", sdev->verbs_dev.device.ibdev_path);
+#else
+ sprintf(param_path, "%s/device/driver/module/parameters", sdev->ibv_dev.ibdev_path);
+#endif
if (ibv_read_sysfs_file(param_path, "vendor_flags",
value, sizeof value) < 0)
context->kernel_flags = 0;
@@ -207,8 +226,13 @@
(SIF_UVERBS_ABI_MINOR_VERSION & 0xff);
ibv_ctx->cmd_fd = cmd_fd;
+#if defined(__SVR4) && defined(__sun)
+ ret = ibv_cmd_get_context(ibv_ctx, &cmd.ibv_cmd,
+ sizeof cmd.ibv_cmd, &resp.ibv_resp, sizeof resp);
+#else
ret = ibv_cmd_get_context(ibv_ctx, &cmd.ibv_cmd,
sizeof cmd, &resp.ibv_resp, sizeof resp);
+#endif
if (ret)
goto err_free;
@@ -230,6 +254,18 @@
context->opt_disable_mask = odm ? strtoll(odm, NULL, 0) : 0;
disa_x_wc = context->opt_disable_mask & SOD_EXPLICIT_WC;
+#if defined(__SVR4) && defined(__sun)
+ user_cb_disable = getenv("SIF_DISABLE_USER_CB");
+ context->user_cb_disable = user_cb_disable ? strtoll(user_cb_disable, NULL, 0) : 0;
+ /*
+ * SQ mode is the default mode on solaris
+ * set env variable SIF_CB_MODE = 1 to change to cb_mode
+ */
+ cb_mode = getenv("SIF_CB_MODE");
+ mode = cb_mode ? strtol(cb_mode, NULL, 0) : 0;
+ context->default_flags |= mode? 0: SQ_mode;
+ sif_log(context, SIF_INFO, "Mode: %s", mode? "CB/SQ": "SQ");
+#endif
probe_cpu_features();
sif_log(context, SIF_VERBS, "CPU features detected: %s",
cpu_features_to_str(feature_mnemonics_size, feature_mnemonics));
@@ -369,6 +405,12 @@
dev->abi_version = abi_version;
dev->min_resp_ms = 0; /* Will be set by the first allocated context */
+#if defined(__SVR4) && defined(__sun)
+ /*
+ * SIFMT_BYPASS mode is not supported for userspace on Solaris, mr_size is
+ * not required */
+ dev->mr_size = 4096;
+#else
if (ibv_read_sysfs_file("/sys/module/sif", "parameters/mr_size",
value, sizeof value) < 0) {
fprintf(stderr, "Failed to read mr_size\n");
@@ -376,6 +418,7 @@
return NULL;
}
sscanf(value, "%i", &dev->mr_size);
+#endif
#ifndef HAVE_VERBS_REGISTER_DRIVER
dev->ibv_dev.ops = sif_dev_ops;
diff -r 1584d5cbb44d src/sif.h.in
--- a/src/sif.h.in Wed Feb 10 12:40:22 2016 +0530
+++ b/src/sif.h.in Wed Mar 09 22:17:00 2016 +0530
@@ -34,6 +34,9 @@
* sif.h.in: TBD: **insert desc here**
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
#ifndef _SIF_H
#define _SIF_H
#if defined(__cplusplus)
@@ -54,6 +57,8 @@
#define PCI_DEVICE_ID_PSIF_VF 0x2089
#define PCI_DEVICE_ID_SIBS_PF 0x2188
#define PCI_DEVICE_ID_SIBS_VF 0x2189
+#define PCI_DEVICE_ID_SIBS2_PF 0x2198
+#define PCI_DEVICE_ID_SIBS2_VF 0x2199
#endif
#define HIDDEN __attribute__((visibility ("hidden")))
@@ -64,6 +69,19 @@
#define SOD_EXPLICIT_WC 0x1
#define SOD_WC_TO_SQ 0x2
+#if defined(__SVR4) && defined(__sun)
+#define SIF_PAGE_SHIFT 12
+#define SIF_PAGE_SIZE (1 << SIF_PAGE_SHIFT)
+
+#define SIF_DOORBELL_IOCTL 30464
+#define container_of(ptr, type, member) ({ \
+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
+ (type *)( (char *)__mptr - offsetof(type,member) );})
+#define SIFPRIx64 PRIx64
+#include "sif_user.h"
+#else
+#define SIFPRIx64 "llx"
+
enum sif_vendor_flags
{
MMU_special = 0x1, /* Use special mmu setup in associated mappings
@@ -102,9 +120,10 @@
FLUSH_SQ,
FLUSH_RQ
};
+#endif
struct sif_device {
- struct verbs_device verbs_dev;
+ struct @SIF_GET_STRUCT@_device @SIF_GET_STRUCT@_dev;
uint16_t abi_version;
uint32_t mr_size; /* Maximal number of MRs in the system */
uint64_t min_resp_ms; /* Universal timeout scaling for sif */
@@ -160,7 +179,7 @@
struct sif_rq {
struct sif_map m;
- struct verbs_srq verbs_srq; /* Only used if this RQ is used a SRQ */
+ struct @SIF_GET_STRUCT@_srq @SIF_GET_STRUCT@_srq; /* Only used if this RQ is used a SRQ */
uint32_t index;
uint32_t entries;
uint32_t mask; /* entries - 1 for modulo using & */
@@ -185,7 +204,7 @@
};
struct sif_context {
- struct verbs_context verbs_ctx;
+ struct @SIF_GET_STRUCT@_context @SIF_GET_STRUCT@_ctx;
enum sif_vendor_flags default_flags;
enum sif_vendor_flags kernel_flags; /* Vendor flags set by the kernel */
enum sif_mem_type mem_type;
@@ -198,6 +217,9 @@
struct sif_mr **bypass_mr_ref;
int bypass_cnt; /* Number of bypass MRs initiated - to avoid slow lookup unless bypass */
uint64_t debug_mask;
+#if defined(__SVR4) && defined(__sun)
+ uint64_t user_cb_disable;
+#endif
uint64_t opt_disable_mask;
void (* fast_copy)(void *dst, const void *src, int len);
};
@@ -222,7 +244,7 @@
};
struct sif_qp {
- struct verbs_qp verbs_qp;
+ struct @SIF_GET_STRUCT@_qp @SIF_GET_STRUCT@_qp;
uint32_t qp_idx;
uint32_t magic;
uint8_t qosl;
@@ -245,7 +267,11 @@
struct sif_mr {
struct ibv_mr ibv_mr;
+#if defined(__SVR4) && defined(__sun)
+ off64_t uv2dma;
+#else
off_t uv2dma;
+#endif
enum sif_mem_type mem_type;
};
@@ -298,12 +324,12 @@
static inline struct sif_qp *to_sqp(struct ibv_qp *ibqp)
{
- return container_of(ibqp, struct sif_qp, verbs_qp.qp);
+ @SIF_GET_QP_CONTAINER@
}
static inline struct sif_rq *to_ssrq(struct ibv_srq *ibsrq)
{
- return container_of(ibsrq, struct sif_rq, verbs_srq.srq);
+ @SIF_GET_SRQ_CONTAINER@
}
static inline struct sif_ah *to_sah(struct ibv_ah *ibah)
@@ -353,6 +379,10 @@
struct ibv_pd *pd, void *addr, size_t length,
int access);
int sif_dereg_mr(struct ibv_mr *mr);
+struct ibv_mr *sif_reg_mr_relaxed(struct ibv_pd *pd, void *addr,
+ size_t length, int access);
+int sif_dereg_mr_relaxed(struct ibv_mr *mr);
+int sif_flush_relaxed_mr(struct ibv_pd *pd);
struct ibv_mw *sif_alloc_mw(struct ibv_pd *pd, enum ibv_mw_type type);
int sif_bind_mw(struct ibv_qp *qp, struct ibv_mw *mw, struct ibv_mw_bind *mw_bind);
int sif_dealloc_mw(struct ibv_mw *mw);
@@ -366,9 +396,13 @@
struct ibv_qp *sif_create_qp(struct ibv_pd *pd,
struct ibv_qp_init_attr *attr);
+#ifdef HAVE_VERBS_REGISTER_DRIVER
struct ibv_qp *sif_create_qp_ex(struct ibv_context *context,
struct ibv_qp_init_attr_ex *qp_init_attr_ex);
+struct ibv_srq *sif_create_srq_ex(struct ibv_context *context,
+ struct ibv_srq_init_attr_ex *srq_init_attr_ex);
+#endif
int sif_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
int attr_mask, struct ibv_qp_init_attr *init_attr);
int sif_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
@@ -382,8 +416,6 @@
struct ibv_srq *sif_create_srq(struct ibv_pd *pd,
struct ibv_srq_init_attr *attr);
-struct ibv_srq *sif_create_srq_ex(struct ibv_context *context,
- struct ibv_srq_init_attr_ex *srq_init_attr_ex);
int sif_modify_srq(struct ibv_srq *srq, struct ibv_srq_attr *attr,
int attr_mask);
diff -r 1584d5cbb44d src/sif_abi.h
--- a/src/sif_abi.h Wed Feb 10 12:40:22 2016 +0530
+++ b/src/sif_abi.h Wed Mar 09 22:17:00 2016 +0530
@@ -142,10 +142,12 @@
struct sif_create_srq_ext e;
};
+#ifdef HAVE_VERBS_REGISTER_DRIVER
struct sif_create_xsrq_cmd {
struct ibv_create_xsrq ibv_cmd;
struct sif_create_srq_ext e;
};
+#endif
struct sif_create_srq_resp {
struct ibv_create_srq_resp ibv_resp;
diff -r 1584d5cbb44d src/sndrcv.c
--- a/src/sndrcv.c Wed Feb 10 12:40:22 2016 +0530
+++ b/src/sndrcv.c Wed Mar 09 22:17:00 2016 +0530
@@ -45,10 +45,15 @@
#include <errno.h>
#include <netinet/in.h>
#include <sys/mman.h>
-#include <endian.h>
-#include <string.h>
-#if defined(__x86_64)
-# include <immintrin.h>
+#if (defined(__SVR4) && defined(__sun))
+# include <unistd.h>
+# include <stropts.h>
+#else
+# include <endian.h>
+# include <string.h>
+# if defined(__x86_64)
+# include <immintrin.h>
+# endif
#endif
#include "sif.h"
#include "encoding.h"
@@ -63,6 +68,26 @@
#define CB_KICK_MASK (CB_KICK_ALIGN - 1)
#define SQS_ACTIVE (get_psif_sq_hw__sq_next(qp->sq.hw) != 0xFFFFFFFF)
+#ifdef _ILP32
+int sif_post_send(struct ibv_qp *ibqp, struct ibv_send_wr *wr, struct ibv_send_wr **bad_wr)
+{
+ sif_log(to_sctx(ibqp->context), SIF_INFO, "post_send not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+int sif_post_recv(struct ibv_qp *ibqp, struct ibv_recv_wr *wr, struct ibv_recv_wr **bad_wr)
+{
+ sif_log(to_sctx(ibqp->context), SIF_INFO, "post_recv not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+int sif_post_srq_recv(struct ibv_srq *ibsrq, struct ibv_recv_wr *wr,
+ struct ibv_recv_wr **bad_wr)
+{
+ sif_log(to_sctx(ibsrq->context), SIF_INFO, "post_srq_recv not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+#else
int sif_post_send(struct ibv_qp *ibqp, struct ibv_send_wr *wr, struct ibv_send_wr **bad_wr)
{
int ret = 0;
@@ -78,8 +103,8 @@
* WA for "SW might overtake SQS", bug #3595, comment 53, solution #2:
* Check SQS in SQ-mode before posting WQE
* if SQ-mode, ring SQ-doorbell
- else post WQE to collect buffer
- */
+ * else post WQE to collect buffer
+ */
while (wr) {
const int nmbr_wrs_to_bulk_process = 32;
@@ -130,6 +155,11 @@
struct sif_rq *rq, struct ibv_recv_wr *wr,
struct ibv_recv_wr **bad_wr, bool is_srq)
{
+#ifdef HAVE_VERBS_REGISTER_DRIVER
+ struct ibv_qp *ibv_qp = &qp->verbs_qp.qp;
+#else
+ struct ibv_qp *ibv_qp = &qp->ibv_qp;
+#endif
int ret = 0;
u32 rq_len;
@@ -154,6 +184,7 @@
sif_log(uc, SIF_INFO, "queue full - rq %d entries %d len %d",
rq->index, rq->entries, rq_len);
atomic_dec_return(&rq->sw->length);
+ errno = ENOMEM;
ret = -ENOMEM;
goto err_post_recv;
}
@@ -161,6 +192,7 @@
sif_log(uc, SIF_INFO, "too many sges - rq %d sges configured %d, sges in wr %d",
rq->index, rq->sge_entries, wr->num_sge);
atomic_dec_return(&rq->sw->length);
+ errno = EINVAL;
ret = -EINVAL;
goto err_post_recv;
}
@@ -177,7 +209,7 @@
sge[i].length = wr->sg_list[i].length;
sge[i].lkey = lkey;
sif_log(uc, SIF_RCV,
- "sg_adr 0x%lx sg_len %d lkey %d",
+ "sg_adr 0x%"PRIx64" sg_len %d lkey %d",
wr->sg_list[i].addr, wr->sg_list[i].length, lkey);
}
@@ -199,17 +231,18 @@
sif_log(uc, SIF_RCV, "Exit: success");
err_post_recv:
- *bad_wr = wr;
+ if (bad_wr)
+ *bad_wr = wr;
pthread_mutex_unlock(&rq->lock);
#if SIF_UVERBS_ABI_VERSION > SIF_UVERBS_VERSION(3,3)
/* WA #622, issue RQ flush if QP in ERROR. */
- if (!is_srq && qp->verbs_qp.qp.state == IBV_QPS_ERR) {
+ if (!is_srq && ibv_qp->state == IBV_QPS_ERR) {
struct ibv_qp_attr attr;
memset(&attr, 0, sizeof(attr));
- if (flush_qp(&qp->verbs_qp.qp, &attr, FLUSH_RQ))
+ if (flush_qp(ibv_qp, &attr, FLUSH_RQ))
sif_log(uc, SIF_INFO,"failed to flush RQ, QP %d",
- qp->verbs_qp.qp.qp_num);
+ ibv_qp->qp_num);
}
#endif
return ret;
@@ -224,7 +257,11 @@
if (!rq->m.sz) /* no user space mappings, go via kernel */
return ibv_cmd_post_recv(ibqp, wr, bad_wr);
+#ifdef HAVE_VERBS_REGISTER_DRIVER
if (qp->verbs_qp.qp.state == IBV_QPS_RESET) {
+#else
+ if (qp->ibv_qp.state == IBV_QPS_RESET) {
+#endif
sif_log(uc, SIF_INFO, "Invalid QP state (IBV_QPS_RESET)");
return -EINVAL;
}
@@ -276,12 +313,17 @@
char wr_copy[64+256] __attribute__((aligned(64)));
const int disa_wc2sq = uc->opt_disable_mask & SOD_WC_TO_SQ;
+#ifdef HAVE_VERBS_REGISTER_DRIVER
if (qp->verbs_qp.qp.state < IBV_QPS_RTS)
+#else
+ if (qp->ibv_qp.state < IBV_QPS_RTS)
+#endif
return -EINVAL; /* The qp is not ready */
if (wr->num_sge > sq->sge_entries) {
sif_log(uc, SIF_SND, "attempt to post wr with %d/%d sg entries",
wr->num_sge, sq->sge_entries);
+ errno = EINVAL;
return -EINVAL;
}
@@ -290,6 +332,7 @@
sif_log(uc, SIF_SND,
"wr with more than 16 (%d/%d) sg entries not implemented yet",
wr->num_sge, sq->sge_entries);
+ errno = EINVAL;
return -EINVAL;
}
@@ -302,6 +345,7 @@
sif_log(uc, SIF_INFO,
"queue full - head %d tail %d entries %d",
head, sq_seq, sq->entries);
+ errno = ENOMEM;
ret = -ENOMEM;
goto fail;
}
@@ -400,8 +444,8 @@
wh->sq_seq = sq_seq;
wh->used = true;
- sif_log(uc, SIF_SND, "wr_id %lx at tail 0x%x sq_seq_num %d%s",
- wr->wr_id, sq_seq & sq->mask, wqe.wr.sq_seq, (wqe.wr.completion ? " [req.compl]" : ""));
+ sif_log(uc, SIF_SND, "wr_id %"PRIx64" at tail 0x%x sq_seq_num %d%s",
+ wr->wr_id, sq_seq & sq->mask, wqe.wr.sq_seq, (wqe.wr.completion ? " [req.compl]" : ""));
/* We can safely checksum any "hole" due to end misalignment + byte swap
* towards the end of the inline data
@@ -473,7 +517,11 @@
void sif_cb_write(struct sif_context *uc, struct sif_qp *qp, const void *src, int cp_len)
{
+#ifdef HAVE_VERBS_REGISTER_DRIVER
struct sif_pd *pd = to_spd(qp->verbs_qp.qp.pd);
+#else
+ struct sif_pd *pd = to_spd(qp->ibv_qp.pd);
+#endif
pthread_mutex_lock(&pd->lock);
wmb();
uc->fast_copy(pd->cb.base, src, cp_len);
@@ -558,7 +606,7 @@
}
#endif
#endif
-
+#endif
void fast_copy_plain(void *_dst, const void *_src, int len)
{
u64 *dst = (u64 *)_dst;
@@ -583,14 +631,20 @@
wc_wmb();
}
+#ifndef _ILP32
/*
* Notify about a work request to the cb doorbell - triggering SQ mode:
*/
void sif_doorbell_write(struct sif_qp *qp, struct psif_wr *wqe, bool start)
{
u16 doorbell_offset = start ? SQS_START_DOORBELL : SQS_STOP_DOORBELL;
- struct sif_pd *pd = to_spd(qp->verbs_qp.qp.pd);
+#ifdef HAVE_VERBS_REGISTER_DRIVER
+ struct sif_pd *pd = to_spd(qp->verbs_qp.qp.pd);
struct sif_context *uc = to_sctx(qp->verbs_qp.qp.context);
+#else
+ struct sif_pd *pd = to_spd(qp->ibv_qp.pd);
+ struct sif_context *uc = to_sctx(qp->ibv_qp.context);
+#endif
sif_log(uc, SIF_QP, "%s sqs for qp %d sq_seq %d", (start ? "start" : "stop"),
qp->qp_idx, wqe->sq_seq);
pthread_mutex_lock(&pd->lock);
@@ -608,10 +662,15 @@
void sif_doorbell_from_sqe(struct sif_qp *qp, u16 seq, bool start)
{
u16 doorbell_offset = start ? SQS_START_DOORBELL : SQS_STOP_DOORBELL;
- struct sif_pd *pd = to_spd(qp->verbs_qp.qp.pd);
struct sif_sq *sq = &qp->sq;
u64 *wqe = (u64*)get_sq_entry(sq, seq);
+#ifdef HAVE_VERBS_REGISTER_DRIVER
+ struct sif_pd *pd = to_spd(qp->verbs_qp.qp.pd);
struct sif_context *uc = to_sctx(qp->verbs_qp.qp.context);
+#else
+ struct sif_pd *pd = to_spd(qp->ibv_qp.pd);
+ struct sif_context *uc = to_sctx(qp->ibv_qp.context);
+#endif
/* Pick the 1st 8 bytes directly from the sq entry: */
wmb();
@@ -637,7 +696,11 @@
bool inlined, struct psif_wr_local* la, u32 sqe_seq)
{
int ret = 0;
+#ifdef HAVE_VERBS_REGISTER_DRIVER
struct sif_context *uc = to_sctx(qp->verbs_qp.qp.context);
+#else
+ struct sif_context *uc = to_sctx(qp->ibv_qp.context);
+#endif
struct psif_rq_scatter sge[16]; /* Temp.storage for buildup of LE sge list */
if (inlined)
@@ -656,7 +719,7 @@
la->addr = wr->sg_list[0].addr + mr_uv2dma(uc,lkey);
la->lkey = lkey;
la->length += wr->sg_list[0].length;
- sif_log(uc, SIF_SND, "single sge dma addr 0x%Lx, message len %d, key %d, uv2dma %Lx",
+ sif_log(uc, SIF_SND, "single sge dma addr 0x%"SIFPRIx64", message len %d, key %d, uv2dma %"SIFPRIx64"",
la->addr, la->length, lkey, mr_uv2dma(uc,lkey));
} else {
struct sif_sq *sq = &qp->sq;
@@ -674,11 +737,11 @@
sge[i].length = wr->sg_list[i].length;
la->length += sge[i].length;
sif_log(uc, SIF_SND,
- "sg_list[%d]: sge entry: dma addr 0x%Lx, len = %d, lkey %d",
+ "sg_list[%d]: sge entry: dma addr 0x%"SIFPRIx64", len = %d, lkey %d",
i, sge[i].base_addr, sge[i].length, sge[i].lkey);
}
sif_log(uc, SIF_SND,
- "ready with sgl_start %p, sg list addr 0x%Lx, "
+ "ready with sgl_start %p, sg list addr 0x%"SIFPRIx64", "
"message len %d, lkey %d, sge %p",
sgl_start, la->addr, la->length, la->lkey, sge);
@@ -697,9 +760,15 @@
{
struct sif_ah *ah = 0;
bool is_dr = false;
+#ifdef HAVE_VERBS_REGISTER_DRIVER
struct sif_context *uc = to_sctx(qp->verbs_qp.qp.context);
switch (qp->verbs_qp.qp.qp_type) {
+#else
+ struct sif_context *uc = to_sctx(qp->ibv_qp.context);
+
+ switch (qp->ibv_qp.qp_type) {
+#endif
case IBV_QPT_UD:
if (!wr->wr.ud.ah) {
sif_log(uc, SIF_INFO, "No ah supplied for ud packet");
@@ -722,12 +791,19 @@
case IBV_QPT_RC:
wqe->wr.tsu_sl = qp->tsl;
break;
+#if !(defined(__SVR4) && defined(__sun))
case IBV_QPT_XRC_SEND:
wqe->wr.xrc_hdr.xrqd_id = wr->qp_type.xrc.remote_srqn;
break;
+#endif
default:
+#ifdef HAVE_VERBS_REGISTER_DRIVER
sif_log(uc, SIF_INFO,
"unhandled transport type %d", qp->verbs_qp.qp.qp_type);
+#else
+ sif_log(uc, SIF_INFO,
+ "unhandled transport type %d", qp->ibv_qp.qp_type);
+#endif
return -EINVAL;
}
wqe->wr.op = ib2sif_wr_op(wr->opcode, is_dr);
@@ -774,7 +850,11 @@
int wr_len = 0;
struct sif_sq *sq;
struct psif_sq_entry *sqe;
+#ifdef HAVE_VERBS_REGISTER_DRIVER
struct sif_context *uc = to_sctx(qp->verbs_qp.qp.context);
+#else
+ struct sif_context *uc = to_sctx(qp->ibv_qp.context);
+#endif
/* collect buffer only supports 256 byte inlined, this first part
* of the inline data must be handled in host byte order to
@@ -813,19 +893,6 @@
len = wr->sg_list[i].length;
addr = wr->sg_list[i].addr;
-#if 0
- if (len > 0) {
- /* TBD: keys not available directly here */
- key = safe_get_key(sdev, wr->sg_list[i].lkey);
- if (!key || PSIF_DMA_KEY_INVALID == get_psif_key__lkey_state(key)) {
- sif_log(uc, SIF_INFO,
- "Attempt to do inline copying from an invalid MR "
- "with lkey %d at addr 0x%Lx",
- wr->sg_list[i].lkey, wr->sg_list[i].addr);
- return -EPERM;
- }
- }
-#endif
do_copy:
wr_len += len;
if (dbuf == buf && wr_len >= cb_len) {
@@ -839,12 +906,13 @@
sif_log(uc, SIF_INFO,
"Inline space exhausted: available %d, copied %d, len %d",
space, copy, len);
+ errno = ENOMEM;
return -ENOMEM;
}
- sif_log(uc, SIF_SND, "Copy sg len %d from user addr 0x%Lx to %p",
+ sif_log(uc, SIF_SND, "Copy sg len %d from user addr 0x%"SIFPRIx64" to %p",
len, addr, &dbuf[copy]);
- memcpy(&dbuf[copy], (void *)addr, len);
+ memcpy(&dbuf[copy], (void *)(intptr_t)addr, len);
copy += len;
}
@@ -903,3 +971,4 @@
return 0;
}
+#endif
diff -r 1584d5cbb44d src/sndrcv.h
--- a/src/sndrcv.h Wed Feb 10 12:40:22 2016 +0530
+++ b/src/sndrcv.h Wed Mar 09 22:17:00 2016 +0530
@@ -36,7 +36,9 @@
#ifndef _SIF_SNDRCV_H
#define _SIF_SNDRCV_H
+#if !(defined(__SVR4) && defined(__sun))
#include <kernel_types.h>
+#endif
/* ib verbs callbacks */
int sif_post_send(struct ibv_qp *ibqp, struct ibv_send_wr *wr, struct ibv_send_wr **bad_wr);
diff -r 1584d5cbb44d src/uverbs.c
--- a/src/uverbs.c Wed Feb 10 12:40:22 2016 +0530
+++ b/src/uverbs.c Wed Mar 09 22:17:00 2016 +0530
@@ -50,8 +50,11 @@
#include "encoding.h"
#include "sif_user.h"
#include "sif_abi.h"
+#if !(defined(__SVR4) && defined(__sun))
#include "kernel_types.h"
+#endif
#include "psif_hw_setget.h"
+#include <unistd.h>
unsigned roundup_pwr2(unsigned x)
{
@@ -74,16 +77,24 @@
}
}
+#if defined(__SVR4) && defined(__sun)
+uint64_t page_align(uint64_t addr)
+{
+ int mask = getpagesize() - 1;
+
+ return (addr + mask) & ~mask;
+}
+#endif
void* find_map_desc(struct sif_context *sctx, enum desc_type type, __u32 index,
struct sif_qp *qp)
{
int i;
void *base = NULL;
-#ifdef HAVE_VERBS_REGISTER_DRIVER
+#if defined(__SVR4) && defined(__sun)
+ int fd = sctx->ibv_ctx.mmap_fd;
+#else
int fd = sctx->verbs_ctx.context.cmd_fd;
-#else
- int fd = sctx->ibv_ctx.cmd_fd;
#endif
struct sif_desc_cache* dc = &sctx->dc[type];
uint32_t blk_idx = index / sctx->dc[type].ba.entry_per_block;
@@ -93,14 +104,22 @@
if (dc->d[i].cmd == SIF_MAP_NONE) {
enum sif_mmap_cmd cmd = dt_to_mmap(type);
/* The requested block is not mapped, try to map it: */
+#if defined(__SVR4) && defined(__sun)
+ off64_t offset = mmap_set_cmd(cmd, blk_idx);
+#else
off_t offset = mmap_set_cmd(cmd, blk_idx);
+#endif
int prot = PROT_READ;
- if (i != SIFD_SQ_HW)
+ if (type != SIFD_SQ_HW)
prot |= PROT_WRITE;
+#if defined(__SVR4) && defined(__sun)
+ base = mmap64(NULL, dc->ba.block_sz, prot, MAP_SHARED, fd, offset);
+#else
base = mmap(NULL, dc->ba.block_sz, prot, MAP_SHARED, fd, offset);
- if (base == MAP_FAILED) {
+#endif
+ if (base == MAP_FAILED) {
perror("find_map_desc");
- fprintf(stderr, "type %d block sz %d offset 0x%lx\n", type, dc->ba.block_sz, offset);
+ fprintf(stderr, "type %d block sz %d offset 0x%"PRIx64"\n", type, dc->ba.block_sz, offset);
base = NULL;
break;
}
@@ -204,10 +223,10 @@
int map_rq(struct sif_rq *rq, struct sif_context *sctx)
{
-#ifdef HAVE_VERBS_REGISTER_DRIVER
+#if defined(__SVR4) && defined(__sun)
+ int fd = sctx->ibv_ctx.mmap_fd;
+#else
int fd = sctx->verbs_ctx.context.cmd_fd;
-#else
- int fd = sctx->ibv_ctx.cmd_fd;
#endif
rq->m.sz = rq->extent * rq->entries;
@@ -225,8 +244,14 @@
if (rq->m.sz) {
/* Map the receive queue for this QP */
+#if defined(__SVR4) && defined(__sun)
+ rq->m.sz = page_align(rq->m.sz);
+ off64_t offset = mmap_set_cmd(SIF_MAP_RQ, rq->index);
+ rq->m.base = mmap64(NULL, rq->m.sz, PROT_WRITE|PROT_READ, MAP_SHARED, fd, offset);
+#else
off_t offset = mmap_set_cmd(SIF_MAP_RQ, rq->index);
rq->m.base = mmap(NULL, rq->m.sz, PROT_WRITE|PROT_READ, MAP_SHARED, fd, offset);
+#endif
if (rq->m.base == MAP_FAILED)
return errno;
} else {
@@ -240,10 +265,18 @@
int sif_map_qp(struct sif_qp *qp)
{
+#ifdef HAVE_VERBS_REGISTER_DRIVER
struct ibv_context *ctx = qp->verbs_qp.qp.context;
+#else
+ struct ibv_context *ctx = qp->ibv_qp.context;
+#endif
struct sif_device *dev = to_sdev(ctx->device);
struct sif_context *sctx = to_sctx(ctx);
+#if defined(__SVR4) && defined(__sun)
+ int fd = ctx->mmap_fd;
+#else
int fd = ctx->cmd_fd;
+#endif
int ret;
qp->sq.m.sz = qp->sq.extent * qp->sq.entries;
@@ -266,19 +299,29 @@
return errno;
}
- if (qp->verbs_qp.qp.qp_type == IBV_QPT_XRC_RECV)
+#ifdef HAVE_IBV_XRC_OPS
+ if (ibv_qp->qp_type == IBV_QPT_XRC_RECV)
goto sq_done;
+#endif
if (qp->sq.m.sz) {
/* Map the send queue for this QP */
+#if defined(__SVR4) && defined(__sun)
+ off64_t offset = mmap_set_cmd(SIF_MAP_SQ, qp->qp_idx);
+ qp->sq.m.sz = page_align(qp->sq.m.sz);
+ qp->sq.m.base = mmap64(NULL, qp->sq.m.sz, PROT_WRITE|PROT_READ, MAP_SHARED, fd, offset);
+#else
off_t offset = mmap_set_cmd(SIF_MAP_SQ, qp->qp_idx);
qp->sq.m.base = mmap(NULL, qp->sq.m.sz, PROT_WRITE|PROT_READ, MAP_SHARED, fd, offset);
+#endif
if (qp->sq.m.base == MAP_FAILED)
return errno;
} else
fprintf(stderr, "sq sz 0\n");
+#ifdef HAVE_IBV_XRC_OPS
sq_done:
- if (qp->rq && !qp->verbs_qp.qp.srq) {
+#endif
+ if (qp->rq && !qp->rq->m.sz) {
ret = map_rq(qp->rq, sctx);
if (ret)
goto rq_map_failed;
@@ -301,7 +344,11 @@
if (ret)
return ret;
}
+#ifdef HAVE_VERBS_REGISTER_DRIVER
if (!qp->verbs_qp.qp.srq && qp->rq && qp->rq->m.sz) {
+#else
+ if (!qp->ibv_qp.srq && qp->rq && qp->rq->m.sz) {
+#endif
struct sif_rq *rq = qp->rq;
ret = munmap(rq->m.base, rq->m.sz);
rq->m.sz = 0;
@@ -315,10 +362,14 @@
struct ibv_context *ctx = cq->ibv_cq.context;
struct sif_device *dev = to_sdev(ctx->device);
struct sif_context *sctx = to_sctx(ctx);
+#if defined(__SVR4) && defined(__sun)
+ int fd = ctx->mmap_fd;
+#else
int fd = ctx->cmd_fd;
- int gross_cqe = roundup_pwr2(cq->ibv_cq.cqe);
cq->entries = cq->ibv_cq.cqe;
+#endif
+ int gross_cqe = roundup_pwr2(cq->entries);
cq->mask = gross_cqe - 1;
cq->extent = sizeof(struct psif_cq_entry);
cq->m.sz = gross_cqe * cq->extent;
@@ -334,8 +385,14 @@
return errno;
if (cq->m.sz) {
+#if defined(__SVR4) && defined(__sun)
+ cq->m.sz = page_align(cq->m.sz);
+ off64_t offset = mmap_set_cmd(SIF_MAP_CQ, cq->index);
+ cq->m.base = mmap64(NULL, cq->m.sz, PROT_READ, MAP_SHARED, fd, offset);
+#else
off_t offset = mmap_set_cmd(SIF_MAP_CQ, cq->index);
cq->m.base = mmap(NULL, cq->m.sz, PROT_READ, MAP_SHARED, fd, offset);
+#endif
if (cq->m.base == MAP_FAILED)
return errno;
} else
@@ -372,10 +429,15 @@
{
struct ibv_context *ctx = pd->ibv_pd.context;
struct sif_device *dev = to_sdev(ctx->device);
+#if defined(__SVR4) && defined(__sun)
+ int fd = ctx->mmap_fd;
+ off64_t offset;
+#else
int fd = ctx->cmd_fd;
off_t offset;
+#endif
struct sif_map *cb = &pd->cb;
- size_t sz = 0x1000;
+ size_t sz = getpagesize();
if (dev->abi_version < abi_ver(3,0)) {
fprintf(stderr, "driver v.%d.%d does not support direct user level access\n",
@@ -384,9 +446,15 @@
}
offset = mmap_set_cmd(SIF_MAP_CB, cb->index);
+#if defined(__SVR4) && defined(__sun)
+ cb->base = mmap64(NULL, sz, PROT_WRITE, MAP_SHARED, fd, offset);
+#else
cb->base = mmap(NULL, sz, PROT_WRITE, MAP_SHARED, fd, offset);
- if (cb->base == MAP_FAILED)
+#endif
+ if (cb->base == MAP_FAILED) {
+ printf("cb->base === MAP_FAILED \n");
return errno;
+ }
cb->sz = sz;
return 0;
diff -r 1584d5cbb44d src/uverbs.h
--- a/src/uverbs.h Wed Feb 10 12:40:22 2016 +0530
+++ b/src/uverbs.h Wed Mar 09 22:17:00 2016 +0530
@@ -75,6 +75,10 @@
static inline bool has_srq(struct sif_qp *qp)
{
+#ifdef HAVE_VERBS_REGISTER_DRIVER
return qp->rq && qp->verbs_qp.qp.srq;
+#else
+ return qp->rq && qp->ibv_qp.srq;
+#endif
}
#endif
diff -r 1584d5cbb44d src/verbs.c
--- a/src/verbs.c Wed Feb 10 12:40:22 2016 +0530
+++ b/src/verbs.c Wed Mar 09 22:17:00 2016 +0530
@@ -64,7 +64,7 @@
unsigned major, minor, sub_minor;
struct ibv_query_device cmd;
int ret;
-
+
ret = ibv_cmd_query_device(context, attr, &raw_fw_ver, &cmd, sizeof cmd);
if (ret)
return ret;
@@ -85,13 +85,128 @@
return ibv_cmd_query_port(context, port, attr, &cmd, sizeof cmd);
}
+#ifdef _ILP32
+struct ibv_pd *sif_alloc_pd(struct ibv_context *context)
+{
+ sif_log(to_sctx(context), SIF_INFO, "alloc_pd not supported for 32 bit application. Please use 64Bit App");
+ errno = ENOTSUP;
+ return NULL;
+}
+
+int sif_free_pd(struct ibv_pd *ibpd)
+{
+ sif_log(to_sctx(ibpd->context), SIF_INFO, "free_pd not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+struct ibv_cq *sif_create_cq(struct ibv_context *context, int cqe,
+ struct ibv_comp_channel *channel, int comp_vector)
+{
+ sif_log(to_sctx(context), SIF_INFO, "create_cq not supported for 32 bit application. Please use 64Bit App");
+ errno = ENOTSUP;
+ return NULL;
+}
+
+int sif_req_notify_cq(struct ibv_cq *ibcq, int solicited_only)
+{
+ sif_log(to_sctx(ibcq->context), SIF_INFO, "req_notify_cq not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+void sif_cq_event(struct ibv_cq *ibcq)
+{
+ sif_log(to_sctx(ibcq->context), SIF_INFO, "cq_event not supported for 32 bit application. Please use 64Bit App");
+ return;
+}
+
+int sif_resize_cq(struct ibv_cq *ibcq, int cqe)
+{
+ sif_log(to_sctx(ibcq->context), SIF_INFO, "resize_cq not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+int sif_destroy_cq(struct ibv_cq *ibcq)
+{
+ sif_log(to_sctx(ibcq->context), SIF_INFO, "destroy_cq not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+struct ibv_qp *sif_create_qp(struct ibv_pd *ibpd, struct ibv_qp_init_attr *attr)
+{
+ sif_log(to_sctx(ibpd->context), SIF_INFO, "create_cq not supported for 32 bit application. Please use 64Bit App");
+ errno = ENOTSUP;
+ return NULL;
+}
+
+int sif_query_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr,
+ int attr_mask, struct ibv_qp_init_attr *init_attr)
+{
+ sif_log(to_sctx(ibqp->context), SIF_INFO, "query_qp not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+int sif_modify_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr,
+ int attr_mask)
+{
+ sif_log(to_sctx(ibqp->context), SIF_INFO, "modify_qp not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+int sif_destroy_qp(struct ibv_qp *ibqp)
+{
+ sif_log(to_sctx(ibqp->context), SIF_INFO, "destroy_qp not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+struct ibv_srq *sif_create_srq(struct ibv_pd *ibpd, struct ibv_srq_init_attr *attr)
+{
+ sif_log(to_sctx(ibpd->context), SIF_INFO, "create_srq not supported for 32 bit application. Please use 64Bit App");
+ errno = ENOTSUP;
+ return NULL;
+}
+
+int sif_modify_srq(struct ibv_srq *ibsrq, struct ibv_srq_attr *attr,
+ int attr_mask)
+{
+ sif_log(to_sctx(ibsrq->context), SIF_INFO, "modify_srq not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+int sif_query_srq(struct ibv_srq *ibsrq, struct ibv_srq_attr *attr)
+{
+ sif_log(to_sctx(ibsrq->context), SIF_INFO, "query_srq not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+int sif_destroy_srq(struct ibv_srq *ibsrq)
+{
+ sif_log(to_sctx(ibsrq->context), SIF_INFO, "destroy_srq not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+struct ibv_ah *sif_create_ah(struct ibv_pd *ibpd, struct ibv_ah_attr *attr)
+{
+ sif_log(to_sctx(ibpd->context), SIF_INFO, "create_ah not supported for 32 bit application. Please use 64Bit App");
+ errno = ENOTSUP;
+ return NULL;
+}
+
+int sif_destroy_ah(struct ibv_ah *ibah)
+{
+ sif_log(to_sctx(ibah->context), SIF_INFO, "create_ah not supported for 32 bit application. Please use 64Bit App");
+ return ENOTSUP;
+}
+
+void sif_async_event(struct ibv_async_event *event)
+{
+}
+
+#else
struct ibv_pd *sif_alloc_pd(struct ibv_context *context)
{
struct sif_context *uc = to_sctx(context);
struct sif_pd *pd;
struct ibv_alloc_pd cmd;
struct sif_alloc_pd_resp resp;
- int ret;
+ int ret = 0;
pd = malloc(sizeof *pd);
if (!pd)
@@ -103,12 +218,19 @@
goto create_failed;
pd->cb.index = resp.e.cb_idx;
+
+#if defined(__SVR4) && defined(__sun)
+ if (resp.e.reserved == 1)
+ uc->default_flags |= SQ_mode;
+#endif
pthread_mutex_init(&pd->lock, NULL);
if (user_mode_verbs(context)) {
- ret = sif_map_cb(pd);
- if (ret)
- goto create_failed;
+ ret = sif_map_cb(pd);
+ if (ret) {
+ printf(" sif_map_cb failed \n");
+ goto create_failed;
+ }
}
sif_log(uc, SIF_PD, "cb idx %d", pd->cb.index);
@@ -129,7 +251,7 @@
if (user_mode_verbs(ibpd->context)) {
ret = sif_unmap_cb(pd);
if (ret) {
- sif_log(uc, SIF_INFO, "failed to unmap cb %d (base %p sz %ld - errno %d",
+ sif_log(uc, SIF_INFO, "failed to unmap cb %d (base %p sz %"PRId64" - errno %d",
pd->cb.index, pd->cb.base, pd->cb.sz, errno);
return ret;
}
@@ -159,6 +281,7 @@
return NULL;
memset(cq, 0, sizeof(*cq));
+ memset(&cmd, 0, sizeof (cmd));
cmd.e.flags = to_sctx(context)->default_flags;
/* support for proxy cqs */
@@ -174,6 +297,9 @@
goto create_failed;
cq->index = resp.e.cq_idx;
+#if defined(__SVR4) && defined(__sun)
+ cq->entries = resp.e.cq_entries;
+#endif
pthread_mutex_init(&cq->lock, NULL);
if (user_mode_verbs(context)) {
@@ -220,12 +346,6 @@
struct sif_cq *cq = to_scq(ibcq);
int ret;
- if (user_mode_verbs(ibcq->context)) {
- ret = sif_unmap_cq(cq);
- if (ret)
- return ret;
- }
-
ret = ibv_cmd_destroy_cq(ibcq);
if (ret) {
struct sif_context *uc = to_sctx(ibcq->context);
@@ -233,6 +353,11 @@
cq->index, errno);
return ret;
}
+ if (user_mode_verbs(ibcq->context)) {
+ ret = sif_unmap_cq(cq);
+ if (ret)
+ return ret;
+ }
free(cq);
return 0;
@@ -251,8 +376,98 @@
return rq;
}
+#ifndef HAVE_VERBS_REGISTER_DRIVER
+struct ibv_qp *__sif_create_qp(struct ibv_pd *ibpd,
+ struct ibv_qp_init_attr *attr)
+{
+ struct ibv_context *context = ibpd->context;
+ struct sif_context *uc = to_sctx(context);
+ struct sif_create_qp_resp resp;
+ struct sif_create_qp_cmd cmd;
+ struct sif_qp *qp;
+ struct sif_sq *sq;
+ size_t wr_hdl_sz;
+ int ret;
+ qp = malloc(sizeof *qp);
+ if (!qp)
+ return NULL;
+ memset(qp, 0, sizeof(*qp));
+ memset(&cmd, 0, sizeof(cmd));
+ cmd.e.flags = to_sctx(context)->default_flags;
+ /* support for proxy qps */
+
+ if (cmd.e.flags & proxy_mode)
+ cmd.e.proxy = to_sctx(context)->proxy;
+ ret = ibv_cmd_create_qp(ibpd, &qp->ibv_qp, attr, &cmd.ibv_cmd, sizeof cmd,
+ &resp.ibv_resp, sizeof resp);
+ if (ret) {
+ errno = ret;
+ goto create_failed;
+ }
+
+ if (attr->srq)
+ qp->rq = to_ssrq(attr->srq);
+ else {
+ struct sif_rq *rq = qp->rq = malloc(sizeof(*rq));
+ if (rq) {
+ memset(rq, 0, sizeof(*rq));
+ init_rq(rq, resp.e.rq_idx, attr->cap.max_recv_wr, resp.e.rq_extent,
+ attr->cap.max_recv_sge, to_scq(attr->recv_cq));
+ }
+ }
+ if (!qp->rq) {
+ errno = ENOMEM;
+ goto create_failed;
+ }
+
+ sq = &qp->sq;
+
+ qp->qp_idx = resp.e.qp_idx;
+ qp->magic = resp.e.magic;
+ qp->max_inline_data = attr->cap.max_inline_data;
+
+ sq->extent = resp.e.sq_extent;
+ sq->sgl_offset = resp.e.sq_sgl_offset;
+ sq->dma_handle = resp.e.sq_dma_handle;
+ sq->sg_mr_idx = resp.e.sq_mr_idx;
+ sq->entries = attr->cap.max_send_wr;
+ sq->sge_entries = attr->cap.max_send_sge;
+ sq->cq = to_scq(attr->send_cq);
+ sq->complete_all = attr->sq_sig_all ? 1 : 0;
+
+ if (cmd.e.flags & tsu_qosl)
+ qp->qosl = QOSL_LOW_LATENCY;
+ if (cmd.e.proxy != SIFPX_OFF)
+ qp->eps_tag |= EPS_TAG_FROM_HOST;
+ if (cmd.e.flags & SQ_mode)
+ qp->force_sq_mode = 1;
+ if (user_mode_verbs(context)) {
+ wr_hdl_sz = sizeof(struct sif_sq_hdl) * sq->entries;
+ sq->wr_hdl = malloc(wr_hdl_sz);
+ if (!sq->wr_hdl)
+ goto create_failed;
+ memset(sq->wr_hdl, 0, wr_hdl_sz);
+ pthread_mutex_init(&sq->lock, NULL);
+
+ ret = sif_map_qp(qp);
+ if (ret)
+ goto create_failed;
+ if (sq->sw)
+ sq->sw->last_seq = sq->sw->head_seq = 0;
+ sif_log(uc, SIF_INFO_V, "qp %d running in user mode", qp->qp_idx);
+ }
+ else
+ sif_log(uc, SIF_INFO_V, "qp %d running in kernel mode", qp->qp_idx);
+ return &qp->ibv_qp;
+
+ create_failed:
+ free(qp);
+ return NULL;
+}
+
+#else
struct ibv_qp *sif_create_qp_ex(struct ibv_context *context,
struct ibv_qp_init_attr_ex *attr)
{
@@ -357,9 +572,13 @@
return NULL;
}
+#endif
struct ibv_qp *sif_create_qp(struct ibv_pd *ibpd, struct ibv_qp_init_attr *attr)
{
+#ifndef HAVE_VERBS_REGISTER_DRIVER
+ return __sif_create_qp(ibpd, attr);
+#else
struct ibv_qp_init_attr_ex ex_attr;
struct ibv_qp *qp;
ex_attr.qp_context = attr->qp_context;
@@ -376,6 +595,7 @@
if (qp)
attr->cap = ex_attr.cap;
return qp;
+#endif
}
@@ -392,9 +612,14 @@
enum sif_flush_type qtype)
{
struct sif_modify_qp_cmd mcmd;
+ int mask = 0;
memset(&mcmd, 0, sizeof(mcmd));
mcmd.e.flush = qtype;
- return ibv_cmd_modify_qp(ibqp, attr, 0, &mcmd.ibv_cmd, sizeof(mcmd));
+#if defined(__SVR4) && defined(__sun)
+ mask = IBV_QP_STATE;
+ attr->qp_state = IBV_QPS_ERR;
+#endif
+ return ibv_cmd_modify_qp(ibqp, attr, mask, &mcmd.ibv_cmd, sizeof(mcmd));
}
#endif
@@ -411,7 +636,11 @@
ret = ibv_cmd_modify_qp(ibqp, attr, attr_mask, &mcmd.ibv_cmd, sizeof mcmd);
#else
+#ifdef HAVE_VERBS_REGISTER_DRIVER
struct ibv_context *ctx = qp->verbs_qp.qp.context;
+#else
+ struct ibv_context *ctx = qp->ibv_qp.context;
+#endif
struct sif_device *dev = to_sdev(ctx->device);
struct ibv_modify_qp cmd;
@@ -446,8 +675,6 @@
int ret;
sif_log(uc, SIF_INFO_V, "qp %d", qp->qp_idx);
- if (user_mode_verbs(ibqp->context))
- sif_unmap_qp(qp);
ret = ibv_cmd_destroy_qp(ibqp);
if (ret) {
@@ -477,6 +704,7 @@
sif_log(uc, SIF_QP, "sif_fixup_cqes: fixed %d CQEs in rq.cq", nfixup);
}
}
+ sif_unmap_qp(qp);
}
if (qp->sq.wr_hdl)
@@ -489,7 +717,50 @@
return 0;
}
+#ifndef HAVE_VERBS_REGISTER_DRIVER
+struct ibv_srq *__sif_create_srq(struct ibv_pd *ibpd, struct ibv_srq_init_attr *attr)
+{
+ struct sif_rq *rq;
+ struct sif_create_srq_cmd cmd;
+ struct sif_create_srq_resp resp;
+ struct sif_context *sctx = to_sctx(ibpd->context);
+ int ret;
+ rq = malloc(sizeof(*rq));
+ if (!rq)
+ return NULL;
+ memset(rq, 0, sizeof(*rq));
+ memset(&cmd, 0, sizeof(cmd));
+ cmd.e.flags = sif_get_default_flags(ibpd->context);
+ cmd.e.res1 = 0;
+
+ ret = ibv_cmd_create_srq(ibpd, &rq->ibv_srq,
+ attr, &cmd.ibv_cmd, sizeof(cmd),
+ &resp.ibv_resp, sizeof(resp));
+ if (ret) {
+ sif_log(sctx, SIF_INFO, "%s: failed to create qp, ret %d\n", __func__, ret);
+ free(rq);
+ return NULL;
+ }
+
+ pthread_mutex_init(&rq->lock, NULL);
+ rq->index = resp.e.index;
+ rq->extent = resp.e.extent;
+ rq->entries = attr->attr.max_wr;
+ rq->sge_entries = attr->attr.max_sge;
+ sif_log(sctx, SIF_SRQ, "created srq %d with extent %d, entries %d, sge_entries %d",
+ rq->index, rq->extent, rq->entries, rq->sge_entries);
+
+ if (user_mode_verbs(ibpd->context)) {
+ ret = map_rq(rq, sctx);
+ if (ret) {
+ free(rq);
+ return NULL;
+ }
+ }
+ return &rq->ibv_srq;
+}
+#else
struct ibv_srq *sif_create_srq_ex(struct ibv_context *context,
struct ibv_srq_init_attr_ex *attr)
{
@@ -540,9 +811,13 @@
return &rq->verbs_srq.srq;
}
+#endif
struct ibv_srq *sif_create_srq(struct ibv_pd *ibpd, struct ibv_srq_init_attr *attr)
{
+#ifndef HAVE_VERBS_REGISTER_DRIVER
+ return __sif_create_srq(ibpd, attr);
+#else
struct ibv_srq_init_attr_ex attr_ex;
struct ibv_srq *srq;
attr_ex.srq_context = attr->srq_context;
@@ -554,6 +829,7 @@
if (srq)
attr->attr = attr_ex.attr;
return srq;
+#endif
}
@@ -577,11 +853,6 @@
int ret;
sif_log(sctx, SIF_SRQ, "rq %d", rq->index);
- if (rq->m.sz) {
- ret = munmap(rq->m.base, rq->m.sz);
- rq->m.sz = 0;
- }
-
ret = ibv_cmd_destroy_srq(ibsrq);
if (ret) {
sif_log(sctx, SIF_INFO, "ibv_cmd_destroy_srq %d failed with errno %d",
@@ -589,6 +860,11 @@
return ret;
}
+ if (rq->m.sz) {
+ ret = munmap(rq->m.base, rq->m.sz);
+ rq->m.sz = 0;
+ }
+
free(rq);
return 0;
}
@@ -641,3 +917,4 @@
* know which device this happened for..
*/
}
+#endif
diff -r 1584d5cbb44d src/xrc.c
--- a/src/xrc.c Wed Feb 10 12:40:22 2016 +0530
+++ b/src/xrc.c Wed Mar 09 22:17:00 2016 +0530
@@ -44,6 +44,7 @@
#include "xrc.h"
#include "encoding.h"
+#ifdef HAVE_VERBS_REGISTER_DRIVER
struct ibv_xrcd *sif_open_xrcd(struct ibv_context *context,
struct ibv_xrcd_init_attr *attr)
{
@@ -88,3 +89,4 @@
sif_log(sctx, SIF_INFO, "*** Not implemented **");
return NULL;
}
+#endif
diff -r 1584d5cbb44d src/xrc.h
--- a/src/xrc.h Wed Feb 10 12:40:22 2016 +0530
+++ b/src/xrc.h Wed Mar 09 22:17:00 2016 +0530
@@ -34,12 +34,16 @@
* xrc.h: XRC support device specific calls.
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
#ifndef _SIF_XRC_H
#define _SIF_XRC_H
#include <infiniband/driver.h>
#include <infiniband/arch.h>
#include <infiniband/verbs.h>
+#ifdef HAVE_VERBS_REGISTER_DRIVER
struct ibv_xrcd *sif_open_xrcd(struct ibv_context *context,
struct ibv_xrcd_init_attr *xrcd_init_attr);
int sif_close_xrcd(struct ibv_xrcd *xrcd);
@@ -47,3 +51,4 @@
struct ibv_qp_open_attr *attr);
#endif
+#endif