From owner-p4-projects@FreeBSD.ORG  Tue Oct 21 09:29:04 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BF72516A4C0; Tue, 21 Oct 2003 09:29:03 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8180216A4B3
	for <perforce@freebsd.org>; Tue, 21 Oct 2003 09:29:03 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0802143FAF
	for <perforce@freebsd.org>; Tue, 21 Oct 2003 09:29:03 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9LGT2XJ086337
	for <perforce@freebsd.org>; Tue, 21 Oct 2003 09:29:02 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9LGT2BF086334
	for perforce@freebsd.org; Tue, 21 Oct 2003 09:29:02 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Tue, 21 Oct 2003 09:29:02 -0700 (PDT)
Message-Id: <200310211629.h9LGT2BF086334@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 40099 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 21 Oct 2003 16:29:04 -0000

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

Change 40099 by sam@sam_ebb on 2003/10/21 09:28:45

	terminate the rx descriptor list with a self-linked entry
	so high phy error rates don't cause rx overruns

Affected files ...

.. //depot/projects/netperf/sys/dev/ath/if_ath.c#27 edit

Differences ...

==== //depot/projects/netperf/sys/dev/ath/if_ath.c#27 (text+ko) ====

@@ -1544,9 +1544,23 @@
 	}
 	bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap, BUS_DMASYNC_PREREAD);
 
-	/* setup descriptors */
+	/*
+	 * Setup descriptors.  For receive we always terminate
+	 * the descriptor list with a self-linked entry so we'll
+	 * not get overrun under high load (as can happen with a
+	 * 5212 when ANI processing enables PHY errors).
+	 *
+	 * To insure the last descriptor is self-linked we create
+	 * each descriptor as self-linked and add it to the end.  As
+	 * each additional descriptor is added the previous self-linked
+	 * entry is ``fixed'' naturally.  This should be safe even
+	 * if DMA is happening.  When processing RX interrupts we
+	 * never remove/process the last, self-linked, entry on the
+	 * descriptor list.  This insures the hardware always has
+	 * someplace to write a new frame.
+	 */
 	ds = bf->bf_desc;
-	ds->ds_link = 0;
+	ds->ds_link = bf->bf_daddr;	/* link to self */
 	ds->ds_data = bf->bf_segs[0].ds_addr;
 	ath_hal_setuprxdesc(ah, ds
 		, m->m_len		/* buffer size */
@@ -1584,12 +1598,16 @@
 			if_printf(ifp, "ath_rx_proc: no buffer!\n");
 			break;
 		}
+		ds = bf->bf_desc;
+		if (ds->ds_link == bf->bf_daddr) {
+			/* NB: never process the self-linked entry at the end */
+			break;
+		}
 		m = bf->bf_m;
 		if (m == NULL) {		/* NB: shouldn't happen */
 			if_printf(ifp, "ath_rx_proc: no mbuf!\n");
 			continue;
 		}
-		ds = bf->bf_desc;
 		status = ath_hal_rxprocdesc(ah, ds);
 #ifdef AR_DEBUG
 		if (ath_debug > 1)