From owner-p4-projects@FreeBSD.ORG Sat Sep 15 21:06:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E47716A421; Sat, 15 Sep 2007 21:06:52 +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 2B19E16A419 for ; Sat, 15 Sep 2007 21:06:52 +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 0990613C458 for ; Sat, 15 Sep 2007 21:06:52 +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 l8FL6psD014084 for ; Sat, 15 Sep 2007 21:06:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FL6pea014081 for perforce@freebsd.org; Sat, 15 Sep 2007 21:06:51 GMT (envelope-from kmacy@freebsd.org) Date: Sat, 15 Sep 2007 21:06:51 GMT Message-Id: <200709152106.l8FL6pea014081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 126450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2007 21:06:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=126450 Change 126450 by kmacy@kmacy_home:ethng on 2007/09/15 21:06:41 pass ref to iovappend to avoid lookup Affected files ... .. //depot/projects/ethng/src/sys/dev/cxgb/sys/mvec.h#3 edit .. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#2 edit Differences ... ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/mvec.h#3 (text+ko) ==== @@ -78,7 +78,7 @@ } static __inline void -m_iovappend(struct mbuf *m, uint8_t *cl, int size, int len, int offset) +m_iovappend(struct mbuf *m, uint8_t *cl, int size, int len, int offset, volatile uint32_t *ref) { struct mbuf_vec *mv = mtomv(m); struct mbuf_iovec *iov; @@ -96,6 +96,7 @@ iov->mi_base = cl; iov->mi_len = len; iov->mi_offset = offset; + iov->mi_refcnt = ref; m->m_pkthdr.len += len; m->m_len += len; mv->mv_count++; @@ -128,6 +129,8 @@ { struct mbuf *n = m->m_next; + prefetch(n); + m->m_pkthdr.rss_hash = 0; if (m->m_flags & M_IOVEC) ==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#2 (text+ko) ==== @@ -79,6 +79,7 @@ { int i, offset, type, first, len; uint8_t *cl; + volatile uint32_t *ref; struct mbuf *m0, *head = NULL; struct mbuf_vec *mv; @@ -101,6 +102,7 @@ type = mbuf_vec_get_type(mv, i); cl = mv->mv_vec[i].mi_base; offset = mv->mv_vec[i].mi_offset; + ref = mv->mv_vec[i].mi_refcnt; len = mv->mv_vec[i].mi_len; if (__predict_false(type == EXT_MBUF)) { m0 = (struct mbuf *)cl; @@ -118,10 +120,10 @@ } m0->m_flags = 0; - m_cljset(m0, (uint8_t *)cl, type); + m_cljset(m0, (uint8_t *)cl, type, ref); m0->m_len = mv->mv_vec[i].mi_len; if (offset) - m_adj(m0, offset); + m->m_data += offset; skip_cluster: m0->m_next = head; m->m_len -= m0->m_len; @@ -129,11 +131,12 @@ } offset = mv->mv_vec[first].mi_offset; cl = mv->mv_vec[first].mi_base; + ref = mv->mv_vec[first].mi_refcnt; type = mbuf_vec_get_type(mv, first); m->m_flags &= ~(M_IOVEC); - m_cljset(m, cl, type); + m_cljset(m, cl, type, ref); if (offset) - m_adj(m, offset); + m->m_data += offset; m->m_next = head; head = m; M_SANITY(m, 0);