From owner-p4-projects@FreeBSD.ORG  Tue Nov  7 05:24:58 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C161316A47C; Tue,  7 Nov 2006 05:24:58 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 6B2EA16A415
	for <perforce@freebsd.org>; Tue,  7 Nov 2006 05:24:58 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7DF1043D75
	for <perforce@freebsd.org>; Tue,  7 Nov 2006 05:24:50 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA75OmtR040651
	for <perforce@freebsd.org>; Tue, 7 Nov 2006 05:24:48 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA75OmFw040648
	for perforce@freebsd.org; Tue, 7 Nov 2006 05:24:48 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 7 Nov 2006 05:24:48 GMT
Message-Id: <200611070524.kA75OmFw040648@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>
Cc: 
Subject: PERFORCE change 109417 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: Tue, 07 Nov 2006 05:24:59 -0000

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

Change 109417 by sam@sam_ebb on 2006/11/07 05:24:12

	replace m_defrag with private code for a small speedup

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#8 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/if_npe.c#8 (text+ko) ====

@@ -982,6 +982,29 @@
 	NPE_UNLOCK(sc);
 }
 
+static struct mbuf *
+npe_linearize(struct mbuf *m0, int how)
+{
+	struct mbuf *m, *n;
+
+	if (m0->m_pkthdr.len > MHLEN)
+		n = m_getcl(how, MT_DATA, M_PKTHDR);
+	else
+		n = m_gethdr(how, MT_DATA);
+	if (n != NULL) {
+		n->m_len = 0;		/* NB: not initialized on alloc */
+		for (m = m0; m != NULL; m = m->m_next) {
+			bcopy(mtod(m, void *), mtod(n, char *) + n->m_len,
+				m->m_len);
+			n->m_len += m->m_len;
+		}
+		/* NB: this works because we never change m_final->m_data */
+		m_move_pkthdr(n, m0);
+	}
+	m_freem(m0);
+	return n;
+}
+
 /*
  * dequeu packets and transmit
  */
@@ -990,7 +1013,7 @@
 {
 	struct npe_softc *sc = ifp->if_softc;
 	struct npebuf *npe;
-	struct mbuf *m, *mdefrag;
+	struct mbuf *m;
 	struct npedma *dma = &sc->txdma;
 	bus_dma_segment_t segs[1];
 	int nseg, len;
@@ -1007,16 +1030,14 @@
 			ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 			return;
 		}
-		mdefrag = m_defrag(m, M_DONTWAIT);
-		if (mdefrag == NULL) {
-			/* XXX not a good idea */
-			IFQ_DRV_PREPEND(&ifp->if_snd, m);
-			return;
+		npe = sc->tx_free;
+		if (m->m_next != NULL) {
+			m = npe_linearize(m, M_DONTWAIT);
+			if (m == NULL)
+				return;
 		}
-		m = mdefrag;
-		npe = sc->tx_free;
-		if (bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, m,
-		    segs, &nseg, 0) != 0) {
+		if (bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map,
+		    m, segs, &nseg, 0) != 0) {
 			m_freem(m);
 			continue;
 		}