Date: Sat, 7 Jan 2012 01:08:17 +0000 (UTC) From: Pyun YongHyeon <yongari@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r229754 - in stable/8/sys/dev: bce mxge Message-ID: <201201070108.q0718HV7017102@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yongari Date: Sat Jan 7 01:08:17 2012 New Revision: 229754 URL: http://svn.freebsd.org/changeset/base/229754 Log: MFC r207761: Belatedly merge r207761. For unknown reason r207761 was not fully merged (r208073) to stable/8 but mergeinfo was recorded. Add a fastpath to allocate from packet zone when using m_getjcl. This will add support for packet zone for at least igb and ixgbe and will avoid to check for that in bce and mxge. Modified: stable/8/sys/dev/bce/if_bce.c stable/8/sys/dev/mxge/if_mxge.c Modified: stable/8/sys/dev/bce/if_bce.c ============================================================================== --- stable/8/sys/dev/bce/if_bce.c Sat Jan 7 00:47:27 2012 (r229753) +++ stable/8/sys/dev/bce/if_bce.c Sat Jan 7 01:08:17 2012 (r229754) @@ -5017,11 +5017,8 @@ bce_get_rx_buf(struct bce_softc *sc, str #ifdef BCE_JUMBO_HDRSPLIT MGETHDR(m_new, M_DONTWAIT, MT_DATA); #else - if (sc->rx_bd_mbuf_alloc_size <= MCLBYTES) - m_new = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - else - m_new = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, - sc->rx_bd_mbuf_alloc_size); + m_new = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, + sc->rx_bd_mbuf_alloc_size); #endif if (m_new == NULL) { Modified: stable/8/sys/dev/mxge/if_mxge.c ============================================================================== --- stable/8/sys/dev/mxge/if_mxge.c Sat Jan 7 00:47:27 2012 (r229753) +++ stable/8/sys/dev/mxge/if_mxge.c Sat Jan 7 01:08:17 2012 (r229754) @@ -2411,10 +2411,7 @@ mxge_get_buf_big(struct mxge_slice_state mxge_rx_ring_t *rx = &ss->rx_big; int cnt, err, i; - if (rx->cl_size == MCLBYTES) - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - else - m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, rx->cl_size); + m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, rx->cl_size); if (m == NULL) { rx->alloc_fail++; err = ENOBUFS;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201070108.q0718HV7017102>