From owner-p4-projects@FreeBSD.ORG  Mon Mar 17 16:09:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF27B106567A; Mon, 17 Mar 2008 16:09:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AE43F1065673
	for <perforce@FreeBSD.org>; Mon, 17 Mar 2008 16:09:19 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D8898FC4A
	for <perforce@FreeBSD.org>; Mon, 17 Mar 2008 16:09:19 +0000 (UTC)
	(envelope-from swise@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2HG9Jp0001391
	for <perforce@FreeBSD.org>; Mon, 17 Mar 2008 16:09:19 GMT
	(envelope-from swise@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2HG9J14001389
	for perforce@freebsd.org; Mon, 17 Mar 2008 16:09:19 GMT
	(envelope-from swise@FreeBSD.org)
Date: Mon, 17 Mar 2008 16:09:19 GMT
Message-Id: <200803171609.m2HG9J14001389@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	swise@FreeBSD.org using -f
From: Steve Wise <swise@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 137922 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Mar 2008 16:09:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=137922

Change 137922 by swise@swise:vic10:iwarp on 2008/03/17 16:09:03

	blocking support for krping rlat.

Affected files ...

.. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#13 edit
.. //depot/projects/iwarp/sys/contrib/rdma/krping/krping.h#6 edit

Differences ...

==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.c#13 (text+ko) ====

@@ -80,6 +80,7 @@
 	{"rlat", OPT_NOPARAM, 'L'},
 	{"bw", OPT_NOPARAM, 'B'},
 	{"tx-depth", OPT_INT, 't'},
+  	{"poll", OPT_NOPARAM, 'P'},
 	{NULL, 0, 0}
 };
 
@@ -841,8 +842,13 @@
 	cb->rdma_sq_wr.sg_list->length = cb->size;
 
 	microtime(&start_tv);
+ 	if (!cb->poll) {
+ 		cb->state = RDMA_READ_ADV;
+ 		ib_req_notify_cq(cb->cq, IB_CQ_NEXT_COMP);
+ 	}
 	while (scnt < iters) {
 
+ 		cb->state = RDMA_READ_ADV;
 		ret = ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr);
 		if (ret) {
 			printf(PFX  
@@ -852,7 +858,16 @@
 		}
 
 		do {
-			ne = ib_poll_cq(cb->cq, 1, &wc);
+			if (!cb->poll) {
+				krping_wait(cb, RDMA_READ_COMPLETE);
+				if (cb->state == RDMA_READ_COMPLETE) {
+					ne = 1;
+					ib_req_notify_cq(cb->cq, IB_CQ_NEXT_COMP);
+				} else {
+					ne = -1;
+				}
+			} else
+				ne = ib_poll_cq(cb->cq, 1, &wc);
 			if (cb->state == ERROR) {
 				printf(PFX 
 				       "state == ERROR...bailing scnt %d\n", scnt);
@@ -864,7 +879,7 @@
 			printf(PFX "poll CQ failed %d\n", ne);
 			return;
 		}
-		if (wc.status != IB_WC_SUCCESS) {
+ 		if (cb->poll && wc.status != IB_WC_SUCCESS) {
 			printf(PFX "Completion wth error at %s:\n",
 				cb->server ? "server" : "client");
 			printf(PFX "Failed status %d: wr_id %d\n",
@@ -1740,6 +1755,10 @@
 			cb->port = htons(optint);
 			DEBUG_LOG(PFX "port %d\n", (int)optint);
 			break;
+		case 'P':
+			cb->poll = 1;
+			DEBUG_LOG("server\n");
+			break;
 		case 's':
 			cb->server = 1;
 			DEBUG_LOG(PFX "server\n");

==== //depot/projects/iwarp/sys/contrib/rdma/krping/krping.h#6 (text+ko) ====

@@ -106,6 +106,7 @@
 	int wlat;			/* run write latency test */
 	int bw;				/* run write bw test */
 	int duplex;			/* run write bw full duplex test */
+	int poll;			/* poll vs block in rlat */
 	int txdepth;
 };