From owner-p4-projects@FreeBSD.ORG  Sat Dec  8 05:20:53 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B47A16A46B; Sat,  8 Dec 2007 05:20:53 +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 D881116A419
	for <perforce@freebsd.org>; Sat,  8 Dec 2007 05:20:52 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C8EF613C465
	for <perforce@freebsd.org>; Sat,  8 Dec 2007 05:20:52 +0000 (UTC)
	(envelope-from kmacy@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 lB85Kq9I046330
	for <perforce@freebsd.org>; Sat, 8 Dec 2007 05:20:52 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB85Kq1b046327
	for perforce@freebsd.org; Sat, 8 Dec 2007 05:20:52 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 8 Dec 2007 05:20:52 GMT
Message-Id: <200712080520.lB85Kq1b046327@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 130460 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: Sat, 08 Dec 2007 05:20:53 -0000

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

Change 130460 by kmacy@kmacy:storage:toestack on 2007/12/08 05:20:40

	reduce coalesce nsecs in INVARIANTS case
	remove skip statement causing us to lose ctrl queue updates

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#14 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#14 (text+ko) ====

@@ -367,7 +367,7 @@
 			q->coalesce_nsecs = 50000;
 		} else {
 #ifdef INVARIANTS			
-			q->coalesce_nsecs = 50000;
+			q->coalesce_nsecs = 20000;
 #else
 			q->coalesce_nsecs = 5000;
 #endif			
@@ -1585,7 +1585,7 @@
 	if (__predict_false(ret)) {
 		if (ret == 1) {
 			mtx_unlock(&q->lock);
-			printf("no desc available\n");
+			log(LOG_ERR, "no desc available\n");
 			
 			return (ENOSPC);
 		}
@@ -1620,7 +1620,7 @@
 	struct sge_txq *q = &qs->txq[TXQ_CTRL];
 	adapter_t *adap = qs->port->adapter;
 
-	printf("Restart_ctrlq\n");
+	log(LOG_WARNING, "Restart_ctrlq in_use=%d\n", q->in_use);
 	
 	mtx_lock(&q->lock);
 again:	reclaim_completed_tx_imm(q);
@@ -2676,8 +2676,6 @@
 		if (desc_reclaimable(&qs->txq[TXQ_ETH]) > TX_START_MAX_DESC)
 			taskqueue_enqueue(qs->port->adapter->tq,
 			    &qs->port->timer_reclaim_task);
-#else
-		wakeup(qs);
 #endif		
 	}
 	
@@ -2692,6 +2690,7 @@
 	credits = G_RSPD_TXQ1_CR(flags);
 	if (credits)
 		qs->txq[TXQ_OFLD].processed += credits;
+
 }
 
 static void
@@ -2780,8 +2779,6 @@
 			
 			eop = 1;
 			rspq->imm_data++;
-			goto skip;
-			
 #endif			
 		} else if (r->len_cq) {			
 			int drop_thresh = eth ? SGE_RX_DROP_THRES : 0;
@@ -2808,9 +2805,6 @@
 			DPRINTF("pure response\n");
 			rspq->pure_rsps++;
 		}
-#ifndef DISABLE_MBUF_IOVEC		
-	skip:
-#endif
 		if (flags & RSPD_CTRL_MASK) {
 			sleeping |= flags & RSPD_GTS_MASK;
 			handle_rsp_cntrl_info(qs, flags);