From owner-p4-projects@FreeBSD.ORG  Thu Oct 11 18:22:38 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 218C416A4DF; Thu, 11 Oct 2007 18:22:38 +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 AEB4E16A4C4
	for <perforce@freebsd.org>; Thu, 11 Oct 2007 18:22:37 +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 A2DF113C469
	for <perforce@freebsd.org>; Thu, 11 Oct 2007 18:22:37 +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 l9BIMbAK085174
	for <perforce@freebsd.org>; Thu, 11 Oct 2007 18:22:37 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9BIMb08085171
	for perforce@freebsd.org; Thu, 11 Oct 2007 18:22:37 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 11 Oct 2007 18:22:37 GMT
Message-Id: <200710111822.l9BIMb08085171@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 127388 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: Thu, 11 Oct 2007 18:22:38 -0000

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

Change 127388 by kmacy@kmacy_home:ethng on 2007/10/11 18:22:25

	put busdma failure under cxgb_debug to prevent spamming the console
	add more diagnostic printfs to determine why we're seeing a failure

Affected files ...

.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#29 edit
.. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#11 edit

Differences ...

==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#29 (text+ko) ====

@@ -1315,7 +1315,8 @@
 			return (err);
 		nsegs = count;
 	} else if ((err = busdma_map_sg_collapse(&m0, segs, &nsegs))) {
-		printf("failed ... err=%d\n", err);
+		if (cxgb_debug)
+			printf("failed ... err=%d\n", err);
 		return (err);
 	}
 	if (m0->m_type == MT_DATA) {

==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#11 (text+ko) ====

@@ -217,8 +217,15 @@
 		n = *m;
 		goto retry;
 	}
-	if (seg_count == 0 || seg_count >= TX_MAX_SEGS)
+	if (seg_count == 0) {
+		if (cxgb_debug)
+			printf("empty segment chain\n");
+		return (EFBIG);
+	}  else if (seg_count >= TX_MAX_SEGS) {
+		if (cxgb_debug)
+			printf("mbuf chain too long: %d max allowed %d\n", seg_count, TX_MAX_SEGS);
 		return (EFBIG);
+	}
 
 	if (seg_count > MAX_MIOVEC_IOV) {
 		DPRINTF("seg count=%d ", seg_count);