From owner-p4-projects@FreeBSD.ORG  Sat Sep 15 21:08:55 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 924B916A420; Sat, 15 Sep 2007 21:08:55 +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 58CBD16A41A
	for <perforce@freebsd.org>; Sat, 15 Sep 2007 21:08:55 +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 36C2A13C458
	for <perforce@freebsd.org>; Sat, 15 Sep 2007 21:08:55 +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 l8FL8tlC014199
	for <perforce@freebsd.org>; Sat, 15 Sep 2007 21:08:55 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8FL8sMi014196
	for perforce@freebsd.org; Sat, 15 Sep 2007 21:08:54 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 15 Sep 2007 21:08:54 GMT
Message-Id: <200709152108.l8FL8sMi014196@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 126451 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: Sat, 15 Sep 2007 21:08:55 -0000

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

Change 126451 by kmacy@kmacy_home:ethng on 2007/09/15 21:08:33

	add jumbo_phys_contig knob
	pass ref to cljset
	past zone to cljget

Affected files ...

.. //depot/projects/ethng/src/sys/sys/mbuf.h#4 edit

Differences ...

==== //depot/projects/ethng/src/sys/sys/mbuf.h#4 (text+ko) ====

@@ -351,7 +351,7 @@
 static __inline struct mbuf	*m_getclr(int how, short type);	/* XXX */
 static __inline struct mbuf	*m_free(struct mbuf *m);
 static __inline void		 m_clget(struct mbuf *m, int how);
-static __inline void		*m_cljget(struct mbuf *m, int how, int size);
+static __inline void		*m_cljget(struct mbuf *m, int how, uma_zone_t zone);
 static __inline void		 m_chtype(struct mbuf *m, short new_type);
 void				 mb_free_ext(struct mbuf *);
 static __inline struct mbuf	*m_last(struct mbuf *m);
@@ -530,21 +530,19 @@
  * For size it takes MCLBYTES, MJUMPAGESIZE, MJUM9BYTES, MJUM16BYTES.
  */
 static __inline void *
-m_cljget(struct mbuf *m, int how, int size)
+m_cljget(struct mbuf *m, int how, uma_zone_t zone)
 {
-	uma_zone_t zone;
 
 	if (m && m->m_flags & M_EXT)
 		printf("%s: %p mbuf already has cluster\n", __func__, m);
 	if (m != NULL)
 		m->m_ext.ext_buf = NULL;
 
-	zone = m_getzone(size);
 	return (uma_zalloc_arg(zone, m, how));
 }
 
 static __inline void
-m_cljset(struct mbuf *m, void *cl, int type)
+m_cljset(struct mbuf *m, void *cl, int type, volatile uint32_t *ref)
 {
 	uma_zone_t zone;
 	int size;
@@ -577,7 +575,7 @@
 	m->m_ext.ext_free = m->m_ext.ext_args = NULL;
 	m->m_ext.ext_size = size;
 	m->m_ext.ext_type = type;
-	m->m_ext.ref_cnt = uma_find_refcnt(zone, cl);
+	m->m_ext.ref_cnt = ref;
 	m->m_flags |= M_EXT;
 
 }
@@ -723,6 +721,7 @@
 extern int		max_protohdr;	/* Largest protocol header */
 extern struct mbstat	mbstat;		/* General mbuf stats/infos */
 extern int		nmbclusters;	/* Maximum number of clusters */
+extern int              jumbo_phys_contig;
 
 struct uio;