#This patch was developed both in-house and from outside. We plan to submit it

#upstream, but do not yet have a target date for doing so

#

# HG changeset patch

# Parent  1afa90e87b4b0fcc3ccef29f1029fa7d1628f389

diff -r 1afa90e87b4b Makefile.in

--- a/Makefile.in	Tue Feb 23 22:30:57 2016 -0800

+++ b/Makefile.in	Tue Feb 23 22:30:58 2016 -0800

@@ -4,18 +4,22 @@

 mandir		= $(DESTDIR)@[email protected]

 incdir		= $(DESTDIR)@[email protected]

+CC=gcc

+

 all: all-programs

-CFLAGS = -O2 -Wall -Iinclude

-CPPFLAGS = -DDEBUG_EXE -DRDS_VERSION=\"@[email protected]\" -MD -MP -MF $(@D)/.$(basename $(@F)).d

+CFLAGS += -O2 -Wall -Iinclude

+	-DDEBUG_EXE -DRDS_VERSION=\"@[email protected]\" -MD -MP -MF $(@D)/.$(basename $(@F)).d

+LDFLAGS += -libverbs -lsocket -lnsl -llgrp

 HEADERS = kernel-list.h pfhack.h include/rds.h

-COMMON_SOURCES = pfhack.c

+COMMON_SOURCES = pfhack.c rds-vendor.c

 SOURCES = $(addsuffix .c,$(PROGRAMS)) $(COMMON_SOURCES)

 CLEAN_OBJECTS = $(addsuffix .o,$(PROGRAMS)) $(subst .c,.o,$(COMMON_SOURCES))

 # This is the default

-DYNAMIC_PF_RDS = true

+#DYNAMIC_PF_RDS = true

 ifneq ($(DYNAMIC_PF_RDS),)

 CPPFLAGS += -DDYNAMIC_PF_RDS

@@ -29,14 +33,14 @@

 all-programs: $(PROGRAMS)

 install: $(PROGRAMS)

-	install -d $(bindir)

-	install -m 555 -s $(PROGRAMS) $(bindir)

-	install -d $(mandir)/man1

-	install -d $(mandir)/man7

-	install -m 644 *.1 $(mandir)/man1

-	install -m 644 *.7 $(mandir)/man7

-	install -d $(incdir)/net

-	install -m 444 include/rds.h $(incdir)/net

+	$(INSTALL) -d $(bindir)

+	$(INSTALL) -m 755 -s $(PROGRAMS) $(bindir)

+	$(INSTALL) -d $(mandir)/man1

+	$(INSTALL) -d $(mandir)/man7

+	$(INSTALL) -m 644 *.1 $(mandir)/man1

+	$(INSTALL) -m 644 *.7 $(mandir)/man7

+	$(INSTALL) -d $(incdir)/net

+	$(INSTALL) -m 444 include/rds.h $(incdir)/net

 clean:

 	rm -f $(PROGRAMS) $(CLEAN_OBJECTS)

@@ -47,7 +51,7 @@

 $(PROGRAMS) : % : %.o $(COMMON_OBJECTS)

-	gcc $(CFLAGS) $(LDFLAGS) -o [email protected] $^

+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o [email protected] $^

 LOCAL_DFILES := $(wildcard .*.d)

 ifneq ($(LOCAL_DFILES),)

@@ -72,8 +76,6 @@

 		configure \

 		README \

 		rds-tools.txt \

-		stap/rds.stp \

-		stap/README \

 		docs/rds-architecture.txt \

 		examples/Makefile \

 		examples/rds-sample.c \

diff -r 1afa90e87b4b configure

--- a/configure	Tue Feb 23 22:30:57 2016 -0800

+++ b/configure	Tue Feb 23 22:30:58 2016 -0800

@@ -1215,7 +1215,7 @@

-VERSION=2.0.4

+VERSION=2.0.7

 RELEASE=1

diff -r 1afa90e87b4b configure.in

--- a/configure.in	Tue Feb 23 22:30:57 2016 -0800

+++ b/configure.in	Tue Feb 23 22:30:58 2016 -0800

@@ -1,7 +1,7 @@

 AC_PREREQ(2.55)

 AC_INIT()

-VERSION=2.0.4

+VERSION=2.0.7

 RELEASE=1

 AC_SUBST(VERSION)

diff -r 1afa90e87b4b examples/Makefile

--- a/examples/Makefile	Tue Feb 23 22:30:57 2016 -0800

+++ b/examples/Makefile	Tue Feb 23 22:30:58 2016 -0800

@@ -1,6 +1,12 @@

+CC=gcc

+LIBS = -lsocket -lnsl

 all: rds-sample

-rds-sample: rds-sample.o

+rds-sample: rds-sample.c

+	$(CC) $(CPPFLAGS) $(CFLAGS) -o rds-sample rds-sample.c $(LIBS)

-CFLAGS = -I ../include

+clean:

+	rm -rf rds-sample

+

diff -r 1afa90e87b4b examples/rds-sample.c

--- a/examples/rds-sample.c	Tue Feb 23 22:30:57 2016 -0800

+++ b/examples/rds-sample.c	Tue Feb 23 22:30:58 2016 -0800

@@ -26,6 +26,7 @@

 #include <string.h>

 #include <stdlib.h>

+#if !(defined(__SVR4) && defined(__sun))

 /* FIXME - this is a hack to getaround RDS not exporting any header files.

  * This is a local copy of the file found at net/rds/

  */

@@ -33,6 +34,9 @@

 /* These are defined in rds.h....but that file is not happily included */

 #define SOL_RDS		272

 #define PF_RDS		28

+#else

+#include <sys/rds.h>

+#endif

 #define TESTPORT	4000

@@ -107,12 +111,12 @@

 	cmsg->cmsg_type = RDS_CMSG_RDMA_ARGS;

 	cmsg->cmsg_len = CMSG_LEN(sizeof(struct rds_rdma_args));

-	iov.addr = (uint64_t) buf;

+	iov.addr = (uint64_t)(uintptr_t)buf;

 	iov.bytes = sizeof(struct rdss_message);

 	args->remote_vec.addr = 0;

 	args->remote_vec.bytes = sizeof(struct rdss_message);

-	args->local_vec_addr = (uint64_t) &iov;

+	args->local_vec_addr = (uint64_t)(uintptr_t)&iov;

 	args->nr_local = 1;

 	args->flags = remote_flags ? (RDS_RDMA_READWRITE | RDS_RDMA_FENCE) : 0;

 	args->flags |= RDS_RDMA_NOTIFY_ME;

@@ -244,9 +248,9 @@

 	void *ctlbuf;

 	struct iovec *iov;

-	mr_args.vec.addr = (uint64_t) buf;

+	mr_args.vec.addr = (uint64_t)(uintptr_t)buf;

 	mr_args.vec.bytes = sizeof(struct rdss_message);

-	mr_args.cookie_addr = (uint64_t) cookie;

+	mr_args.cookie_addr = (uint64_t)(uintptr_t)cookie;

 	mr_args.flags = RDS_RDMA_USE_ONCE;

 	ctlbuf = calloc(1, CMSG_SPACE(sizeof(mr_args)));

diff -r 1afa90e87b4b include/rds.h

--- a/include/rds.h	Tue Feb 23 22:30:57 2016 -0800

+++ b/include/rds.h	Tue Feb 23 22:30:58 2016 -0800

@@ -84,6 +84,8 @@

 #define RDS_CMSG_CONG_UPDATE		5

 #define RDS_CMSG_ATOMIC_FADD		6

 #define RDS_CMSG_ATOMIC_CSWP		7

+#define	RDS_CMSG_MASKED_ATOMIC_FADD	8

+#define	RDS_CMSG_MASKED_ATOMIC_CSWP	9

 #define RDS_INFO_FIRST			10000

 #define RDS_INFO_COUNTERS		10000

@@ -252,8 +254,25 @@

 	rds_rdma_cookie_t cookie;

 	uint64_t 	local_addr;

 	uint64_t 	remote_addr;

-	uint64_t	swap_add;

-	uint64_t	compare;

+	union {

+		struct {

+			uint64_t	compare;

+			uint64_t	swap;

+		} cswp;

+		struct {

+			uint64_t	add;

+		} fadd;

+		struct {

+			uint64_t	compare;

+			uint64_t	swap;

+			uint64_t	compare_mask;

+			uint64_t	swap_mask;

+		} m_cswp;

+		struct {

+			uint64_t	add;

+			uint64_t	nocarry_mask;

+		} m_fadd;

+	};

 	u_int64_t	flags;

 	u_int64_t	user_token;

 };

@@ -278,5 +297,6 @@

 #define RDS_RDMA_USE_ONCE	0x0008	/* free MR after use */

 #define RDS_RDMA_DONTWAIT	0x0010	/* Don't wait in SET_BARRIER */

 #define RDS_RDMA_NOTIFY_ME	0x0020	/* Notify when operation completes */

+#define RDS_RDMA_SILENT		0x0040	/* Do not interrupt remote */

 #endif /* IB_RDS_H */

diff -r 1afa90e87b4b pfhack.h

--- a/pfhack.h	Tue Feb 23 22:30:57 2016 -0800

+++ b/pfhack.h	Tue Feb 23 22:30:58 2016 -0800

@@ -44,9 +44,11 @@

 #ifndef __PF_HACK_H

 #define __PF_HACK_H

+#if !((defined(__SVR4) && defined(__sun)))

 #define PF_RDS		21

 #define AF_RDS		21

 #define SOL_RDS		276

+#endif

 extern int discover_pf_rds();

 extern int discover_sol_rds();

diff -r 1afa90e87b4b rds-info.1

--- a/rds-info.1	Tue Feb 23 22:30:57 2016 -0800

+++ b/rds-info.1	Tue Feb 23 22:30:58 2016 -0800

@@ -1,162 +1,160 @@

-.Dd October 30, 2006

-.Dt RDS-INFO 1

-.Os

-.Sh NAME

-.Nm rds-info

-.Nd display information from the RDS kernel module

-.Pp

-.Sh SYNOPSIS

-.Nm rds-info

-.Op Fl v

-.Bk -words

-.Op Fl cknrstIT

+.TH RDS-INFO 1 "October 30, 2006"

+.SH "NAME"

+rds-info - display information from the RDS kernel module

+.SH SYNOPSIS

+.B rds-info [-cknrstIT]

-.Sh DESCRIPTION

-The

-.Nm

-utility presents various sources of information that

+.SH DESCRIPTION

+.PP

+The utility presents various sources of information that

 the RDS kernel module maintains.  When run without any optional arguments

-.Nm

 will output all the information it knows of.  When options are specified then

 only the information associated with those options is displayed.

 The options are as follows:

-.Bl -tag -width Ds

-.It Fl v

+.SH OPTIONS

+.PP

+.TP 7

+\fB\-v

 Requests verbose output. When this option is given, some classes of information

 will display additional data.

-.It Fl c

+.TP

+\fB\-c

 Display global counters.  Each counter increments as its event

 occurs.  The counters may not be reset.  The set of supported counters

 may change over time.

-.Bl -tag -width 4

-.It CounterName

+.IP	CounterName

 The name of the counter.  These names come from the kernel and can change

 depending on the capability of the kernel module.

-.It Value

+.IP 	Value

 The number of times that the counter has been incremented since the kernel

 module was loaded.

-.El

-.It Fl k

+.TP

+\fB\-k\fR

 Display all the RDS sockets in the system.  There will always be one socket

 listed that is neither bound to nor connected to any addresses because

-.Nm

 itself uses an unbound socket to collect information.

-.Bl -tag -width 4

-.It BoundAddr, BPort

+.IP	BoundAddr, BPort

 The IP address and port that the socket is bound to.  0.0.0.0 0 indicates that

 the socket has not been bound.

-.It ConnAddr, CPort

+.IP	ConnAddr, CPort

 The IP address and port that the socket is connected to.  0.0.0.0 0 indicates

 that the socket has not been connected.

-.It SndBuf, RcvBuf

+.IP	SndBuf, RcvBuf

 The number of bytes of message payload which can be queued for sending or

 receiving on the socket, respectively.

-.It Inode

+.IP	Inode

 The number of the inode object associated with the socket. Can be used to

 locate the process owning a given socket by searching /proc/*/fd for

 open files referencing a socket with this inode number.

-.El

-.It Fl n

+.TP

+\fB\-n\fR

 Display all RDS connections.  RDS connections are maintained between

 nodes by transports.  

-.Bl -tag -width 4

-.It LocalAddr

+.IP	LocalAddr

 The IP address of this node.  For connections that originate and terminate on

 the same node the local address indicates which address initiated the

 connection establishment.

-.It RemoteAddr

+.IP	RemoteAddr

 The IP address of the remote end of the connection.  

-.It NextTX

+.IP	Tos

+The type of service value for this connection.

+.IP	NextTX

 The sequence number that will be given to the next message that is sent

 over the connection.

-.It NextRX

+.IP	NextRX

 The sequence number that is expected from the next message to arrive over

 the connection.  Any incoming messages with sequence numbers less than this

 will be dropped.

-.It Flg

+.IP	Flg

 Flags which indicate the state of the connection. 

-.Bl -tag -width 4

-.It s

-A process is currently sending a message down the connection.

-.It c

-The transport is attempting to connect to the remote address.

-.It C

-The connection to the remote host is connected and active.

-.El

-.El

-.It Fl r, Fl s, Fl t

+.IP 		s

+	A process is currently sending a message down

+	the connection.

+.IP 		c

+	The transport is attempting to connect to the

+	remote address.

+.IP 		C

+	The connection to the remote host is connected

+	and active.

+.IP 		E

+	The connection to the remote host is in error.

+

+.TP

+\fB\-r\fR, \fB\-s\fR, \fB\-t\fR

 Display the messages in the receive, send, or retransmit queues respectively.

-.Bl -tag -width 4

-.It LocalAddr, LPort

+

+.IP	LocalAddr, LPort

 The local IP address and port on this node associated with the message. For

 sent messages this is the source address, for receive messages it is the

 destination address.

-.It RemoteAddr, RPort

+.IP	RemoteAddr, RPort

 The remote IP address and port associated with the message. For sent messages

 this is the destination address, for receive messages it is the source address.

-.It Seq

+.IP	Tos

+The type of service for this message.

+.IP	Seq

 The sequence number of the message.

-.It Bytes

+.IP	Bytes

 The number of bytes in the message payload.

-.El

+

+.PP

 The following information sources are dependent on specific transports which

 may not always be available. 

-.It Fl I

+.TP 7

+\fB\-I\fR

 Display the IB connections which the IB transport is using to provide

 RDS connections.

-.Bl -tag -width 4

-.It LocalAddr

+.IP	LocalAddr

 The local IP address of this connection.

-.It RemoteAddr

+.IP	RemoteAddr

 The remote IP address of this connection.

-.It LocalDev

+.IP	Tos

+The type of service value for this connection.

+.IP	SL

+The QoS Service Level for this connection.

+.IP	LocalDev

 The local IB Global Identifier, printed in IPv6 address syntax.

-.It RemoteDev

+.IP	RemoteDev

 The remote IB Global Identifier, printed in IPv6 address syntax.

-.El

 If verbose output is requested, per-connection settings such as the

 maximum number of send and receive work requests will be displayed

 in addition.

-.It Fl T

+.TP 7

+\fB\-T\fR

 Display the TCP sockets which the TCP transport is using to provide

 RDS connections.

-.Bl -tag -width 4

-.It LocalAddr, LPort

+.IP	LocalAddr, LPort

 The local IP address and port of this socket.

-.It RemoteAddr, RPort

+.IP	RemoteAddr, RPort

 The remote IP address and port that this socket is connected to.

-.It HdrRemain

+.IP	HdrRemain

 The number of bytes that must be read off the socket to complete the next

 full RDS header.

-.It DataRemain

+.IP	DataRemain

 The number of bytes that must be read off the socket to complete the data

 payload of the message which is being received.

-.It SentNxt

+.IP	SentNxt

 The TCP sequence number of the first byte of the last message that we sent

 down the connection.

-.It ExpectedUna

+.IP	ExpectedUna

 The TCP sequence number of the byte past the last byte of the last message

 that we sent down the connection.  When we see that the remote side has

 acked up to this byte then we know that the remote side has received all

 our RDS messages.

-.It SeenUna

+.IP	SeenUna

 The TCP sequence number of the byte past the last byte which has been

 acked by the remote host.

-.El

-

-.El

-.Pp

diff -r 1afa90e87b4b rds-info.c

--- a/rds-info.c	Tue Feb 23 22:30:57 2016 -0800

+++ b/rds-info.c	Tue Feb 23 22:30:58 2016 -0800

@@ -42,16 +42,28 @@

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <errno.h>

+#if defined(__SVR4) && defined(__sun)

+#include <strings.h>

+#else

 #include <string.h>

+#endif

 #include <inttypes.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

+#if defined(__SVR4) && defined(__sun)

+#include <sys/rds.h>

+#include <infiniband/ofa_solaris.h>

+#else

 #include "rds.h"

+#endif

 #include "pfhack.h"

+/* WHUPS changed the struct rds_info_connection definition b/w rds in 1.4 & 1.5. gotta support both

+   for now. TODO remove check of transport[15] once ofed pre-1.5 is extinct. */

 #define rds_conn_flag(conn, flag, letter) \