diff -r -u /tmp/rds-tools-2.0.4/rds-stress.c rds-tools-2.0.7/rds-stress.c

--- /tmp/rds-tools-2.0.4/rds-stress.c	Wed Aug  4 15:25:10 2010

+++ rds-tools-2.0.7/rds-stress.c	Thu Feb 24 13:27:52 2011

@@ -15,7 +15,13 @@

 #include <sys/time.h>

 #include <time.h>

 #include <inttypes.h>

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

+#include <sys/syscall.h>

+#include <signal.h>

+#include <sys/lgrp_user.h>

+#else

 #include <syscall.h>

+#endif

 #include <sys/stat.h>

 #include <sys/poll.h>

 #include <ctype.h>

@@ -22,10 +28,16 @@

 #include <fcntl.h>

 #include <sched.h>

 #include <getopt.h>

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

 #include <byteswap.h>

 #include "rds.h"

-

+#else

+#include <sys/rds.h>

+#endif

 #include "pfhack.h"

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

+#include <infiniband/ofa_solaris.h>

+#endif

 /*

  *

@@ -102,6 +114,10 @@

 #define NR_STATS S__LAST

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

+int sol_ioctl(int, int, struct rds_info_arg *, socklen_t *, int *);

+#endif

+

 /*

  * Parents share a mapped array of these with their children.  Each child

  * gets one.  It's used to communicate between the child and the parent

@@ -110,6 +126,7 @@

 struct child_control {

 	pid_t pid;

 	int ready;

+	int stopping;

 	struct timeval start;

 	struct counter cur[NR_STATS];

 	struct counter last[NR_STATS];

@@ -254,7 +271,20 @@

 	die("invalid host name or dotted quad '%s'\n", ptr);

 }

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

+static lgrp_id_t lgrp_id = -1;

+static void

+set_my_lgrp(void)

+{

+	if (lgrp_id != -1) {

+		lgrp_affinity_set(P_LWPID, P_MYID, lgrp_id,

+			LGRP_AFF_STRONG);

+		yield(); /* force a context switch */

+	}

+}

+#endif

+

 static void usage(void)

 {

         fprintf(stderr, "rds-stress version %s\n", RDS_VERSION);

@@ -281,6 +311,9 @@

 	" -c                measure cpu use with per-cpu soak processes\n"

 	" -V                trace execution\n"

 	" -z                print a summary at end of test only\n"

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

+	" -g [lgrpid]       bind the process to the specified lgrp\n"

+#endif

 	"\n"

 	"Example:\n"

 	"  recv$ rds-stress\n"

@@ -310,7 +343,7 @@

 static void check_parent(pid_t pid)

 {

 	if (pid != getppid())

-		die("parent %u exited\n", pid);

+		die("parent %u exited\n", (int)pid);

 }

 /*

@@ -334,6 +367,7 @@

 		msg_pattern[i] = k;

 }

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

 #if __BYTE_ORDER == __LITTLE_ENDIAN

 #define htonll(x)	bswap_64(x)

 #define ntohll(x)	bswap_64(x)

@@ -341,6 +375,7 @@

 #define htonll(x)	(x)

 #define ntohll(x)	(x)

 #endif

+#endif /* Not sun */

 static void encode_hdr(struct header *dst, const struct header *hdr)

 {

@@ -584,7 +619,11 @@

 	if (opts->receive_addr == 0)

 		return 1;

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

+	sin.sin_family = AF_INET_OFFLOAD;

+#else

 	sin.sin_family = AF_INET;

+#endif

 	sin.sin_port = htons(opts->starting_port);

 	sin.sin_addr.s_addr = htonl(opts->receive_addr);

@@ -677,7 +716,11 @@

 	size = sizeof(struct rdma_key_o_meter)

 			+ 2 * nr_tasks * sizeof(*kt)

 			+ 2 * RDMA_MAX_TRACKED_KEYS * sizeof(*ks);

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

+	base = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_SHARED, -1, 0);

+#else

 	base = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_SHARED, 0, 0);

+#endif

 	if (base == MAP_FAILED)

 		die_errno("alloc_rdma_buffers: mmap failed");

@@ -828,7 +871,7 @@

 	}

 	if (!failed)

-		trace("compare pass pattern %Lx addr %p\n",

+		trace("compare pass pattern 0x%Lx addr %p\n",

 			(unsigned long long) pattern, addr);

 }

@@ -865,7 +908,11 @@

 	/* We use mmap here rather than malloc, because it is always

 	 * page aligned. */

 	len = 2 * opts->nr_tasks * opts->req_depth * (opts->rdma_vector * opts->rdma_size) + sys_page_size;

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

+	base = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);

+#else	

 	base = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, 0, 0);

+#endif

 	if (base == MAP_FAILED)

 		die_errno("alloc_rdma_buffers: mmap failed");

 	memset(base, 0x2f, len);

@@ -915,17 +962,16 @@

 	if (RDMA_OP_READ == hdr->rdma_op) {

 		if (opt.verify)

 			rds_fill_buffer(rdma_addr, rdma_size, hdr->rdma_pattern);

-		trace("Requesting RDMA read for pattern %Lx "

-				"local addr to rdma read %p\n",

-				(unsigned long long) hdr->rdma_pattern,

+		trace("Requesting RDMA read for pattern 0x%Lx"

+				"local addr to rdma read 0x%p\n",

+				hdr->rdma_pattern,

 				rdma_addr);

 	} else {

 		if (opt.verify)

 			rds_fill_buffer(rdma_addr, rdma_size, 0);

-		trace("Requesting RDMA write for pattern %Lx "

-				"local addr to rdma write %p\n",

-				(unsigned long long) hdr->rdma_pattern,

-				rdma_addr);

+

+		trace("Requesting RDMA write for pattern 0x%Lx",

+				hdr->rdma_pattern);

 	}

 }

@@ -947,7 +993,7 @@

 		die("Unexpected RDMA op %u in request\n", in_hdr->rdma_op);

-	trace("RDS received request to issue rdma %s len %lu rva %Lx key %Lx pattern %Lx\n",

+	trace("RDS received request to issue rdma %s len %lu rva 0x%Lx key 0x%Lx pattern 0x%Lx\n",

 		in_hdr->rdma_op == RDMA_OP_WRITE? "write to" : "read from",

 		rdma_size,

 		(unsigned long long) in_hdr->rdma_addr,

@@ -1007,6 +1053,9 @@

 	t->drain_rdmas = 0;

 }

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

+#undef MSG_MAXIOVLEN

+#endif

 #define MSG_MAXIOVLEN 2

 /*

@@ -1560,7 +1609,12 @@

 	struct timeval start;

         int do_work = opts->simplex ? active : 1;

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

+	set_my_lgrp();

+	sin.sin_family = AF_INET_OFFLOAD;

+#else

 	sin.sin_family = AF_INET;

+#endif

 	sin.sin_port = htons(opts->starting_port + 1 + id);

 	sin.sin_addr.s_addr = htonl(opts->receive_addr);

@@ -1572,7 +1626,11 @@

 	for (i = 0; i < opts->nr_tasks; i++) {

 		tasks[i].nr = i;

 		tasks[i].src_addr = sin;

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

+		tasks[i].dst_addr.sin_family = AF_INET_OFFLOAD;

+#else

 		tasks[i].dst_addr.sin_family = AF_INET;

+#endif

 		tasks[i].dst_addr.sin_addr.s_addr = htonl(opts->send_addr);

 		tasks[i].dst_addr.sin_port = htons(opts->starting_port + 1 + i);

 		tasks[i].send_time = alloca(opts->req_depth * sizeof(struct timeval));

@@ -1625,6 +1683,10 @@

 				;

 		}

+		/* stop sending if in shutdown phase */

+		if (ctl->stopping)

+			continue;

+

 		/* keep the pipeline full */

 		can_send = !!(pfd.revents & POLLOUT);

 		for (i = 0, t = tasks; i < opts->nr_tasks; i++, t++) {

@@ -1665,8 +1727,12 @@

 	uint32_t i;

 	len = opts->nr_tasks * sizeof(*ctl);

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

+	ctl = (struct child_control *)mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_SHARED, -1, 0);

+#else

 	ctl = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_SHARED,

 		   0, 0);

+#endif

 	if (ctl == MAP_FAILED)

 		die("mmap of %u child control structs failed", opts->nr_tasks);

@@ -1699,7 +1765,7 @@

 			continue;

 		pid = waitpid(-1, NULL, WNOHANG);

 		if (pid)

-			die("child %u (pid %u) exited\n", i, pid);

+			die("child %u (pid %u) exited\n", i, (int)pid);

 		sleep(1);

 		i--; /* try this child again */

 	}

@@ -1823,6 +1889,7 @@

 	if (disable)

 		return;

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

 	if ((fp = fopen("/proc/stat", "r")) == NULL) {

 		fprintf(stderr, "Cannot open /proc/stat (%s) - "

 				"not printing cpu stats\n",

@@ -1856,10 +1923,37 @@

 		}

 	}

 	fclose(fp);

+#else

+#define NSEC_TO_TICK(v)		(v * sysconf(_SC_CLK_TCK)/1000000000)

+	sol_cpu_stats_t		stats;	

+	solaris_init();

+	if ((sol_get_cpu_stats(&stats)) < 0) {

+		disable = 1;

+		return;

+	}

+	solaris_fini();

+	current.times[0] = stats.t_user;

+	current.times[1] = 0;

+	current.times[2] = stats.t_kernel;

+	current.times[3] = stats.t_idle;

+	current.times[4] = stats.t_iowait;

+	current.times[5] = 0;

+	current.times[6] = 0;

+	current.times[7] = 0;

+	current.intr = NSEC_TO_TICK(stats.t_intr);	/* NSEC_TO_TICK */

+

+#endif

+

 	if (initialize) {

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

 		printf(",user:percent,system:percent,idle:percent"

 		       ",irq:percent,intr:count");

+#else

+		/* Solaris kstat doesn't provide irq/softirq info. */

+		printf(",user:percent,system:percent,idle:percent"

+		       ",intr:count");

+#endif

 	} else {

 		struct sys_stats sys;

 		unsigned long sum = 0;

@@ -1884,6 +1978,7 @@

 		 *  5	irq

 		 *  6	softirq

 		 */

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

 		printf(",%f,%f,%f,%f,%Lu",

 			(sys.times[0] + sys.times[1]) * scale,

 			sys.times[2] * scale,

@@ -1890,6 +1985,14 @@

 			(sys.times[3] + sys.times[4]) * scale,

 			(sys.times[5] + sys.times[6]) * scale,

 			sys.intr);

+#else

+		/* Solaris kstat doesn't provide irq/softirq info. */

+		printf(",%f,%f,%f,%Lu",

+			(sys.times[0] + sys.times[1]) * scale,

+			sys.times[2] * scale,

+			(sys.times[3] + sys.times[4]) * scale,

+			sys.intr);

+#endif

 	}

 	prev = current;

 }

@@ -1903,6 +2006,10 @@

 	static socklen_t buflen = 0;

 	static int sock_fd = -1;

 	int i, count, item_size;

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

+	socklen_t len;

+	struct rds_info_arg arg;

+#endif

 	if (sock_fd < 0) {

 		sock_fd = socket(pf, SOCK_SEQPACKET, 0);

@@ -1912,6 +2019,7 @@

 	/* We should only loop once on the first call; after that the

 	 * buffer requirements for RDS counters should not change. */

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

 	while ((item_size = getsockopt(sock_fd, sol, RDS_INFO_COUNTERS, curr, &buflen)) < 0) {

 		if (errno != ENOSPC)

 			die_errno("getsockopt(RDS_INFO_COUNTERS) failed");

@@ -1919,7 +2027,29 @@

 		if (!curr)

 			die_errno("Cannot allocate buffer for stats counters");

 	}

+#else

+	int retcode;

+	retcode = sol_ioctl(

+	    sock_fd, RDS_INFO_COUNTERS, &arg, &buflen, &item_size);

+	if (retcode != 0) {

+		if (retcode == 1) {

+			die_errno("ioctl(RDS_INFO_COUNTERS) failed");

+		} else if (retcode == 2) {

+			fprintf(stderr, "%s: Unable to allocate memory "

+			    "for %u bytes of info: %s\n",

+			    "rds-stress", buflen, strerror(errno));

+			return;

+		} else {

+			fprintf(stderr, "%s: Unable to access "

+			    "RDS_INFO_COUNTERS statistics: %s\n",

+			    "rds-stress", strerror(errno));

+			return;

+		}

+	}

+

+#endif

+

 	if (item_size > sizeof(*ctr))

 		die("Bad counter item size in RDS_INFO_COUNTERS (got %d, max %zd)\n",

 				item_size, sizeof(*ctr));

@@ -1932,8 +2062,11 @@

 	}

 	for (i = 0; i < count; ++i)

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

 		memcpy(ctr + i, curr + i * item_size, item_size);

-

+#else

+		memcpy(ctr + i, ((void *)(uintptr_t)arg.datap) + i * item_size, item_size);

+#endif

 	gettimeofday(&now, NULL);

 	if (initialize) {

@@ -1957,6 +2090,10 @@

 	memcpy(prev, ctr, count * sizeof(*ctr));

 	last_ts = now;

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

+	free((void *)(uintptr_t)arg.datap);

+#endif

+

 	get_stats(initialize);

 }

@@ -1967,7 +2104,7 @@

 	pid = waitpid(-1, &status, wflags);

 	if (pid < 0)

-		die("waitpid returned %u", pid);

+		die("waitpid returned %u", (int)pid);

 	if (pid == 0)

 		return 0;

@@ -1975,15 +2112,15 @@

 		if (WEXITSTATUS(status) == 0)

 			return 1;

 		die("child pid %u exited with status %d\n",

-				pid, WEXITSTATUS(status));

+				(int)pid, WEXITSTATUS(status));

 	}

 	if (WIFSIGNALED(status)) {

 		if (WTERMSIG(status) == SIGTERM)

 			return 1;

 		die("child pid %u exited with signal %d\n",

-				pid, WTERMSIG(status));

+				(int)pid, WTERMSIG(status));

 	}

-	die("child pid %u wait status %d\n", pid, status);

+	die("child pid %u wait status %d\n", (int)pid, status);

 }

 static void release_children_and_wait(struct options *opts,

@@ -2139,7 +2276,12 @@

 	control_fd = -1;

 	if (nr_running) {

+		/* let everything gracefully stop before we kill the chillins */

 		for (i = 0; i < opts->nr_tasks; i++)

+			ctl[i].stopping = 1;

+		sleep(1);

+

+		for (i = 0; i < opts->nr_tasks; i++)

 			kill(ctl[i].pid, SIGTERM);

 		stop_soakers(soak_arr);

 	}

@@ -2517,7 +2659,11 @@

 	/* an extra terminating entry which will be all 0s */

 	len = (nr_soak + 1) * sizeof(struct soak_control);

 	soak_arr = mmap(NULL, len, PROT_READ|PROT_WRITE,

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

+			MAP_ANONYMOUS|MAP_SHARED, -1, 0);

+#else

 			MAP_ANONYMOUS|MAP_SHARED, 0, 0);

+#endif

 	if (soak_arr == MAP_FAILED)

 		die("mmap of %ld soak control structs failed", nr_soak);

@@ -2589,6 +2735,7 @@

 { "rtprio",		no_argument,		NULL,	'R'	},

 { "verify",		no_argument,		NULL,	'v'	},

 { "trace",		no_argument,		NULL,	'V'	},

+{ "lgrpid",		required_argument,	NULL,	'g'	},

 { "rdma-use-once",	required_argument,	NULL,	OPT_RDMA_USE_ONCE },

 { "rdma-use-get-mr",	required_argument,	NULL,	OPT_RDMA_USE_GET_MR },

@@ -2652,7 +2799,7 @@

 	while(1) {

 		int c, index;

-		c = getopt_long(argc, argv, "+a:cD:d:hI:M:op:q:Rr:s:t:T:vVz",

+		c = getopt_long(argc, argv, "+a:cD:d:hI:M:op:q:Rr:s:t:T:vVg:z",

 				long_options, &index);

 		if (c == -1)

 			break;

@@ -2711,6 +2858,10 @@

 			case 'V':

 				opts.tracing = 1;

 				break;

+			case 'g':

+				lgrp_id = (lgrp_id_t)parse_ull(optarg,

+				    (uint32_t)~0);

+				break;

 			case OPT_USE_CONG_MONITOR:

 				opts.use_cong_monitor = parse_ull(optarg, 1);

 				break;

@@ -2786,6 +2937,7 @@

 	if (opts.rdma_size && 0)

 		opts.rdma_size = (opts.rdma_size + 4095) & ~4095;

+	set_my_lgrp();

 	opt = opts;

 	return active_parent(&opts, soak_arr);

 }

diff -r -u /tmp/rds-tools-2.0.4/pfhack.h rds-tools-2.0.7/pfhack.h

--- /tmp/rds-tools-2.0.4/pfhack.h	Wed Aug  4 15:25:11 2010

+++ rds-tools-2.0.7/pfhack.h	Thu Feb 24 13:27:51 2011

@@ -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 -u /tmp/rds-tools-2.0.4/rds-info.c rds-tools-2.0.7/rds-info.c

--- /tmp/rds-tools-2.0.4/rds-info.c	Wed Aug  4 15:25:10 2010

+++ rds-tools-2.0.7/rds-info.c	Thu Feb 24 13:27:51 2011

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

 #include <sys/types.h>

 #include <sys/socket.h>

 #include <errno.h>

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

+#include <strings.h>