svn commit: r188365 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/fxp

[Pyun YongHyeon]

Author: yongari
Date: Mon Feb  9 03:23:00 2009
New Revision: 188365
URL: http://svn.freebsd.org/changeset/base/188365

Log:
  MFC r177507(cvs if_fxp.c, 1.267):
    Reuse the mbuf that was just retrieved from the receive ring if mbuf
    exhaustion is encountered. There was a fix made previously for this
    problem but the solution (breaking out of the receive loop) does not
    seem to work. mbuf reuse strategy is already adopted by other drivers
    such as if_bge.  The problem was recreated and the patch is also
    verified in the same test environment.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/fxp/if_fxp.c

Modified: stable/7/sys/dev/fxp/if_fxp.c
==============================================================================
--- stable/7/sys/dev/fxp/if_fxp.c	Mon Feb  9 02:15:25 2009	(r188364)
+++ stable/7/sys/dev/fxp/if_fxp.c	Mon Feb  9 03:23:00 2009	(r188365)
@@ -231,7 +231,7 @@ static int		fxp_ioctl(struct ifnet *ifp,
 			    caddr_t data);
 static void 		fxp_watchdog(struct fxp_softc *sc);
 static int		fxp_add_rfabuf(struct fxp_softc *sc,
-    			    struct fxp_rx *rxp);
+    			    struct fxp_rx *rxp, struct mbuf *oldm);
 static int		fxp_mc_addrs(struct fxp_softc *sc);
 static void		fxp_mc_setup(struct fxp_softc *sc);
 static uint16_t		fxp_eeprom_getword(struct fxp_softc *sc, int offset,
@@ -715,7 +715,7 @@ fxp_attach(device_t dev)
 			device_printf(dev, "can't create DMA map for RX\n");
 			goto fail;
 		}
-		if (fxp_add_rfabuf(sc, rxp) != 0) {
+		if (fxp_add_rfabuf(sc, rxp, NULL) != 0) {
 			error = ENOMEM;
 			goto fail;
 		}
@@ -1652,7 +1652,7 @@ fxp_intr_body(struct fxp_softc *sc, stru
 		 * If this fails, the old buffer is recycled
 		 * instead.
 		 */
-		fxp_rc = fxp_add_rfabuf(sc, rxp);
+		fxp_rc = fxp_add_rfabuf(sc, rxp, m);
 		if (fxp_rc == 0) {
 			int total_len;
 
@@ -2245,17 +2245,26 @@ fxp_ifmedia_sts(struct ifnet *ifp, struc
  * data pointer is fixed up to point just past it.
  */
 static int
-fxp_add_rfabuf(struct fxp_softc *sc, struct fxp_rx *rxp)
+fxp_add_rfabuf(struct fxp_softc *sc, struct fxp_rx *rxp, struct mbuf *oldm)
 {
 	struct mbuf *m;
 	struct fxp_rfa *rfa, *p_rfa;
 	struct fxp_rx *p_rx;
 	bus_dmamap_t tmp_map;
-	int error;
+	int error, reused_mbuf=0;
 
 	m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
-	if (m == NULL)
-		return (ENOBUFS);
+	if (m == NULL) {
+		if (oldm == NULL)
+			return ENOBUFS;
+		m = oldm;
+		m->m_data = m->m_ext.ext_buf;
+		/*
+		 * return error so the receive loop will 
+		 * not pass the packet to upper layer
+		 */
+		reused_mbuf = EAGAIN;
+	}
 
 	/*
 	 * Move the data pointer up so that the incoming data packet
@@ -2320,7 +2329,7 @@ fxp_add_rfabuf(struct fxp_softc *sc, str
 		sc->fxp_desc.rx_head = rxp;
 	}
 	sc->fxp_desc.rx_tail = rxp;
-	return (0);
+	return (reused_mbuf);
 }
 
 static int