--- a/components/open-fabrics/libibverbs/patches/001-libibverbs-solaris_port.patch Fri Mar 03 10:47:25 2017 -0800
+++ b/components/open-fabrics/libibverbs/patches/001-libibverbs-solaris_port.patch Fri Mar 03 12:52:04 2017 -0800
@@ -7,7 +7,7 @@
diff -r 714ac8a9d237 Makefile.am
--- a/Makefile.am Wed Oct 14 12:54:37 2015 -0700
-+++ b/Makefile.am Mon Feb 01 09:10:21 2016 -0800
++++ b/Makefile.am Fri Mar 03 11:06:42 2017 -0800
@@ -11,7 +11,7 @@
src_libibverbs_la_SOURCES = src/cmd.c src/compat-1_0.c src/device.c src/init.c \
@@ -36,7 +36,7 @@
src/libibverbs.map libibverbs.spec.in $(man_MANS)
diff -r 714ac8a9d237 Makefile.in
--- a/Makefile.in Wed Oct 14 12:54:37 2015 -0700
-+++ b/Makefile.in Mon Feb 01 09:10:21 2016 -0800
++++ b/Makefile.in Fri Mar 03 11:06:42 2017 -0800
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
@@ -238,7 +238,7 @@
cp libibverbs.spec $(distdir)
diff -r 714ac8a9d237 aclocal.m4
--- a/aclocal.m4 Wed Oct 14 12:54:37 2015 -0700
-+++ b/aclocal.m4 Mon Feb 01 09:10:21 2016 -0800
++++ b/aclocal.m4 Fri Mar 03 11:06:42 2017 -0800
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
@@ -474,7 +474,7 @@
# gives unlimited permission to copy and/or distribute it,
diff -r 714ac8a9d237 configure
--- a/configure Wed Oct 14 12:54:37 2015 -0700
-+++ b/configure Mon Feb 01 09:10:21 2016 -0800
++++ b/configure Fri Mar 03 11:06:42 2017 -0800
@@ -2285,7 +2285,7 @@
ac_config_headers="$ac_config_headers config.h"
@@ -484,9 +484,24 @@
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
+diff -r 714ac8a9d237 examples/asyncwatch.c
+--- a/examples/asyncwatch.c Wed Oct 14 12:54:37 2015 -0700
++++ b/examples/asyncwatch.c Fri Mar 03 11:06:42 2017 -0800
+@@ -35,8 +35,11 @@
+ #endif /* HAVE_CONFIG_H */
+
+ #include <stdio.h>
++
++#if !(defined(__SVR4) && defined(__sun))
+ #include <endian.h>
+ #include <byteswap.h>
++#endif
+
+ #include <infiniband/verbs.h>
+
diff -r 714ac8a9d237 examples/device_list.c
--- a/examples/device_list.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/examples/device_list.c Mon Feb 01 09:10:21 2016 -0800
++++ b/examples/device_list.c Fri Mar 03 11:06:42 2017 -0800
@@ -36,16 +36,32 @@
#include <stdio.h>
@@ -574,7 +589,7 @@
return 0;
diff -r 714ac8a9d237 examples/devinfo.c
--- a/examples/devinfo.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/examples/devinfo.c Mon Feb 01 09:10:21 2016 -0800
++++ b/examples/devinfo.c Fri Mar 03 11:06:42 2017 -0800
@@ -41,8 +41,10 @@
#include <string.h>
#include <getopt.h>
@@ -588,7 +603,7 @@
#include <infiniband/driver.h>
diff -r 714ac8a9d237 examples/rc_pingpong.c
--- a/examples/rc_pingpong.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/examples/rc_pingpong.c Mon Feb 01 09:10:21 2016 -0800
++++ b/examples/rc_pingpong.c Fri Mar 03 11:06:42 2017 -0800
@@ -156,8 +156,13 @@
n = getaddrinfo(servername, service, &hints, &res);
@@ -616,7 +631,7 @@
return NULL;
diff -r 714ac8a9d237 examples/srq_pingpong.c
--- a/examples/srq_pingpong.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/examples/srq_pingpong.c Mon Feb 01 09:10:21 2016 -0800
++++ b/examples/srq_pingpong.c Fri Mar 03 11:06:42 2017 -0800
@@ -166,8 +166,13 @@
n = getaddrinfo(servername, service, &hints, &res);
@@ -644,7 +659,7 @@
return NULL;
diff -r 714ac8a9d237 examples/uc_pingpong.c
--- a/examples/uc_pingpong.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/examples/uc_pingpong.c Mon Feb 01 09:10:21 2016 -0800
++++ b/examples/uc_pingpong.c Fri Mar 03 11:06:42 2017 -0800
@@ -144,7 +144,7 @@
n = getaddrinfo(servername, service, &hints, &res);
@@ -665,7 +680,7 @@
return NULL;
diff -r 714ac8a9d237 examples/ud_pingpong.c
--- a/examples/ud_pingpong.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/examples/ud_pingpong.c Mon Feb 01 09:10:21 2016 -0800
++++ b/examples/ud_pingpong.c Fri Mar 03 11:06:42 2017 -0800
@@ -144,8 +144,13 @@
n = getaddrinfo(servername, service, &hints, &res);
@@ -693,7 +708,7 @@
return NULL;
diff -r 714ac8a9d237 include/infiniband/arch.h
--- a/include/infiniband/arch.h Wed Oct 14 12:54:37 2015 -0700
-+++ b/include/infiniband/arch.h Mon Feb 01 09:10:21 2016 -0800
++++ b/include/infiniband/arch.h Fri Mar 03 11:06:42 2017 -0800
@@ -34,6 +34,7 @@
#define INFINIBAND_ARCH_H
@@ -714,7 +729,7 @@
* Architecture-specific defines. Currently, an architecture is
diff -r 714ac8a9d237 include/infiniband/driver.h
--- a/include/infiniband/driver.h Wed Oct 14 12:54:37 2015 -0700
-+++ b/include/infiniband/driver.h Mon Feb 01 09:10:21 2016 -0800
++++ b/include/infiniband/driver.h Fri Mar 03 11:06:42 2017 -0800
@@ -190,6 +190,10 @@
struct ibv_recv_wr **bad_wr);
int ibv_cmd_create_ah(struct ibv_pd *pd, struct ibv_ah *ah,
@@ -728,7 +743,7 @@
int ibv_cmd_detach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid);
diff -r 714ac8a9d237 include/infiniband/kern-abi.h
--- a/include/infiniband/kern-abi.h Wed Oct 14 12:54:37 2015 -0700
-+++ b/include/infiniband/kern-abi.h Mon Feb 01 09:10:21 2016 -0800
++++ b/include/infiniband/kern-abi.h Fri Mar 03 11:06:42 2017 -0800
@@ -35,7 +35,11 @@
#ifndef KERN_ABI_H
#define KERN_ABI_H
@@ -954,7 +969,7 @@
/*
diff -r 714ac8a9d237 include/infiniband/sa-kern-abi.h
--- a/include/infiniband/sa-kern-abi.h Wed Oct 14 12:54:37 2015 -0700
-+++ b/include/infiniband/sa-kern-abi.h Mon Feb 01 09:10:21 2016 -0800
++++ b/include/infiniband/sa-kern-abi.h Fri Mar 03 11:06:42 2017 -0800
@@ -33,7 +33,11 @@
#ifndef INFINIBAND_SA_KERN_ABI_H
#define INFINIBAND_SA_KERN_ABI_H
@@ -969,7 +984,7 @@
* Obsolete, deprecated names. Will be removed in libibverbs 1.1.
diff -r 714ac8a9d237 include/infiniband/verbs.h
--- a/include/infiniband/verbs.h Wed Oct 14 12:54:37 2015 -0700
-+++ b/include/infiniband/verbs.h Mon Feb 01 09:10:21 2016 -0800
++++ b/include/infiniband/verbs.h Fri Mar 03 11:06:42 2017 -0800
@@ -40,6 +40,9 @@
#include <pthread.h>
#include <stddef.h>
@@ -1039,7 +1054,7 @@
struct ibv_context *ibv_open_device(struct ibv_device *device);
diff -r 714ac8a9d237 man/ibv_devices.1
--- a/man/ibv_devices.1 Wed Oct 14 12:54:37 2015 -0700
-+++ b/man/ibv_devices.1 Mon Feb 01 09:10:21 2016 -0800
++++ b/man/ibv_devices.1 Fri Mar 03 11:06:42 2017 -0800
@@ -10,6 +10,35 @@
.PP
List RDMA devices available for use from userspace.
@@ -1078,7 +1093,7 @@
diff -r 714ac8a9d237 src/cmd.c
--- a/src/cmd.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/src/cmd.c Mon Feb 01 09:10:21 2016 -0800
++++ b/src/cmd.c Fri Mar 03 11:06:42 2017 -0800
@@ -42,24 +42,81 @@
#include <errno.h>
#include <alloca.h>
@@ -1447,7 +1462,7 @@
diff -r 714ac8a9d237 src/device.c
--- a/src/device.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/src/device.c Mon Feb 01 09:10:21 2016 -0800
++++ b/src/device.c Fri Mar 03 11:06:42 2017 -0800
@@ -122,6 +122,28 @@
}
default_symver(__ibv_get_device_guid, ibv_get_device_guid);
@@ -1530,7 +1545,7 @@
if (abi_ver <= 2)
diff -r 714ac8a9d237 src/ibverbs.h
--- a/src/ibverbs.h Wed Oct 14 12:54:37 2015 -0700
-+++ b/src/ibverbs.h Mon Feb 01 09:10:21 2016 -0800
++++ b/src/ibverbs.h Fri Mar 03 11:06:42 2017 -0800
@@ -52,7 +52,12 @@
# define VALGRIND_MAKE_MEM_DEFINED(addr, len) 0
#endif
@@ -1547,7 +1562,7 @@
#define FINI __attribute__((destructor))
diff -r 714ac8a9d237 src/init.c
--- a/src/init.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/src/init.c Mon Feb 01 09:10:21 2016 -0800
++++ b/src/init.c Fri Mar 03 11:06:42 2017 -0800
@@ -78,8 +78,13 @@
static struct ibv_driver_name *driver_name_list;
static struct ibv_driver *head_driver, *tail_driver;
@@ -1654,7 +1669,7 @@
static void add_device(struct ibv_device *dev,
diff -r 714ac8a9d237 src/libibverbs.map
--- a/src/libibverbs.map Wed Oct 14 12:54:37 2015 -0700
-+++ b/src/libibverbs.map Mon Feb 01 09:10:21 2016 -0800
++++ b/src/libibverbs.map Fri Mar 03 11:06:42 2017 -0800
@@ -73,6 +73,7 @@
mult_to_ibv_rate;
ibv_get_sysfs_path;
@@ -1665,7 +1680,7 @@
};
diff -r 714ac8a9d237 src/sysfs.c
--- a/src/sysfs.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/src/sysfs.c Mon Feb 01 09:10:21 2016 -0800
++++ b/src/sysfs.c Fri Mar 03 11:06:42 2017 -0800
@@ -44,6 +44,10 @@
#include "ibverbs.h"
@@ -1706,7 +1721,7 @@
}
diff -r 714ac8a9d237 src/verbs.c
--- a/src/verbs.c Wed Oct 14 12:54:37 2015 -0700
-+++ b/src/verbs.c Mon Feb 01 09:10:21 2016 -0800
++++ b/src/verbs.c Fri Mar 03 11:06:42 2017 -0800
@@ -41,6 +41,11 @@
#include <stdlib.h>
#include <errno.h>
--- a/components/open-fabrics/libibverbs/patches/003-libibverbs-SMGID-events.patch Fri Mar 03 10:47:25 2017 -0800
+++ b/components/open-fabrics/libibverbs/patches/003-libibverbs-SMGID-events.patch Fri Mar 03 12:52:04 2017 -0800
@@ -3,14 +3,14 @@
#
# HG changeset patch
# User [email protected]
-# Parent 6f1b3e12e65a05883b7375d196cad71d6e5ce1bc
+# Parent d4f9e8f6dcc097fe929178f51678e9c07da43b0b
PSARC 2012/384 Fast IB node death detection
16037511 Add support SM events to facilitate fast node death detection (userland
-diff -r 6f1b3e12e65a examples/asyncwatch.c
---- a/examples/asyncwatch.c Tue Nov 24 20:12:48 2015 -0800
-+++ b/examples/asyncwatch.c Tue Nov 24 20:13:37 2015 -0800
-@@ -35,11 +35,72 @@
+diff -r d4f9e8f6dcc0 examples/asyncwatch.c
+--- a/examples/asyncwatch.c Fri Mar 03 11:07:30 2017 -0800
++++ b/examples/asyncwatch.c Fri Mar 03 11:23:21 2017 -0800
+@@ -35,6 +35,12 @@
#endif /* HAVE_CONFIG_H */
#include <stdio.h>
@@ -20,10 +20,10 @@
+#include <signal.h>
+#include <string.h>
+#include <strings.h>
-+#if !(defined(__SVR4) && defined(__sun))
+
+ #if !(defined(__SVR4) && defined(__sun))
#include <endian.h>
- #include <byteswap.h>
-+#endif
+@@ -43,6 +49,59 @@
#include <infiniband/verbs.h>
@@ -83,7 +83,7 @@
static const char *event_name_str(enum ibv_event_type event_type)
{
switch (event_type) {
-@@ -59,7 +120,14 @@
+@@ -62,7 +121,14 @@
return "IBV_EVENT_CLIENT_REREGISTER";
case IBV_EVENT_GID_CHANGE:
return "IBV_EVENT_GID_CHANGE";
@@ -99,7 +99,7 @@
case IBV_EVENT_CQ_ERR:
case IBV_EVENT_QP_FATAL:
case IBV_EVENT_QP_REQ_ERR:
-@@ -76,14 +144,172 @@
+@@ -79,14 +145,172 @@
}
}
@@ -278,7 +278,7 @@
dev_list = ibv_get_device_list(NULL);
if (!dev_list) {
-@@ -103,19 +329,111 @@
+@@ -106,19 +330,111 @@
return 1;
}
@@ -395,9 +395,9 @@
-
return 0;
}
-diff -r 6f1b3e12e65a include/infiniband/kern-abi.h
---- a/include/infiniband/kern-abi.h Tue Nov 24 20:12:48 2015 -0800
-+++ b/include/infiniband/kern-abi.h Tue Nov 24 20:13:37 2015 -0800
+diff -r d4f9e8f6dcc0 include/infiniband/kern-abi.h
+--- a/include/infiniband/kern-abi.h Fri Mar 03 11:07:30 2017 -0800
++++ b/include/infiniband/kern-abi.h Fri Mar 03 11:23:21 2017 -0800
@@ -115,7 +115,10 @@
IB_USER_VERBS_CMD_SHARE_PD, /* =47 */
IB_USER_VERBS_CMD_REG_MR_RELAXED, /* =48 */
@@ -466,9 +466,9 @@
};
struct ibv_modify_srq_v3 {
-diff -r 6f1b3e12e65a include/infiniband/verbs.h
---- a/include/infiniband/verbs.h Tue Nov 24 20:12:48 2015 -0800
-+++ b/include/infiniband/verbs.h Tue Nov 24 20:13:37 2015 -0800
+diff -r d4f9e8f6dcc0 include/infiniband/verbs.h
+--- a/include/infiniband/verbs.h Fri Mar 03 11:07:30 2017 -0800
++++ b/include/infiniband/verbs.h Fri Mar 03 11:23:21 2017 -0800
@@ -239,6 +239,10 @@
IBV_EVENT_QP_LAST_WQE_REACHED,
IBV_EVENT_CLIENT_REREGISTER,
@@ -527,9 +527,9 @@
* ibv_alloc_pd - Allocate a protection domain
*/
struct ibv_pd *ibv_alloc_pd(struct ibv_context *context);
-diff -r 6f1b3e12e65a man/ibv_asyncwatch.1
---- a/man/ibv_asyncwatch.1 Tue Nov 24 20:12:48 2015 -0800
-+++ b/man/ibv_asyncwatch.1 Tue Nov 24 20:13:37 2015 -0800
+diff -r d4f9e8f6dcc0 man/ibv_asyncwatch.1
+--- a/man/ibv_asyncwatch.1 Fri Mar 03 11:07:30 2017 -0800
++++ b/man/ibv_asyncwatch.1 Fri Mar 03 11:23:21 2017 -0800
@@ -1,16 +1,78 @@
-.TH IBV_ASYNCWATCH 1 "August 30, 2005" "libibverbs" "USER COMMANDS"
+'\" te
@@ -617,9 +617,9 @@
+.sp
+ibv_asyncwatch -M -s0xff12:4001:ffff::c:2238
+.sp
-diff -r 6f1b3e12e65a man/ibv_get_async_event.3
---- a/man/ibv_get_async_event.3 Tue Nov 24 20:12:48 2015 -0800
-+++ b/man/ibv_get_async_event.3 Tue Nov 24 20:13:37 2015 -0800
+diff -r d4f9e8f6dcc0 man/ibv_get_async_event.3
+--- a/man/ibv_get_async_event.3 Fri Mar 03 11:07:30 2017 -0800
++++ b/man/ibv_get_async_event.3 Fri Mar 03 11:23:21 2017 -0800
@@ -14,7 +14,7 @@
.fi
.SH "DESCRIPTION"
@@ -655,9 +655,9 @@
.B ibv_ack_async_event()
acknowledge the async event
.I event\fR.
-diff -r 6f1b3e12e65a src/device.c
---- a/src/device.c Tue Nov 24 20:12:48 2015 -0800
-+++ b/src/device.c Tue Nov 24 20:13:37 2015 -0800
+diff -r d4f9e8f6dcc0 src/device.c
+--- a/src/device.c Fri Mar 03 11:07:30 2017 -0800
++++ b/src/device.c Fri Mar 03 11:23:21 2017 -0800
@@ -287,7 +287,15 @@
case IBV_EVENT_SRQ_LIMIT_REACHED:
event->element.srq = (void *) (uintptr_t) ev.element;
@@ -675,9 +675,9 @@
default:
event->element.port_num = ev.element;
break;
-diff -r 6f1b3e12e65a src/enum_strs.c
---- a/src/enum_strs.c Tue Nov 24 20:12:48 2015 -0800
-+++ b/src/enum_strs.c Tue Nov 24 20:13:37 2015 -0800
+diff -r d4f9e8f6dcc0 src/enum_strs.c
+--- a/src/enum_strs.c Fri Mar 03 11:07:30 2017 -0800
++++ b/src/enum_strs.c Fri Mar 03 11:23:21 2017 -0800
@@ -87,10 +87,14 @@
[IBV_EVENT_SRQ_LIMIT_REACHED] = "SRQ limit reached",
[IBV_EVENT_QP_LAST_WQE_REACHED] = "last WQE reached",
@@ -695,9 +695,9 @@
return "unknown";
return event_type_str[event];
-diff -r 6f1b3e12e65a src/libibverbs.map
---- a/src/libibverbs.map Tue Nov 24 20:12:48 2015 -0800
-+++ b/src/libibverbs.map Tue Nov 24 20:13:37 2015 -0800
+diff -r d4f9e8f6dcc0 src/libibverbs.map
+--- a/src/libibverbs.map Fri Mar 03 11:07:30 2017 -0800
++++ b/src/libibverbs.map Fri Mar 03 11:23:21 2017 -0800
@@ -21,6 +21,9 @@
ibv_dereg_mr;
ibv_dereg_mr_relaxed;
@@ -708,9 +708,9 @@
ibv_create_comp_channel;
ibv_destroy_comp_channel;
ibv_create_cq;
-diff -r 6f1b3e12e65a src/verbs.c
---- a/src/verbs.c Tue Nov 24 20:12:48 2015 -0800
-+++ b/src/verbs.c Tue Nov 24 20:13:37 2015 -0800
+diff -r d4f9e8f6dcc0 src/verbs.c
+--- a/src/verbs.c Fri Mar 03 11:07:30 2017 -0800
++++ b/src/verbs.c Fri Mar 03 11:23:21 2017 -0800
@@ -49,6 +49,16 @@
#include "ibverbs.h"