From owner-p4-projects@FreeBSD.ORG  Thu May 25 08:16:56 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 AE94116A425; Thu, 25 May 2006 08:16:56 +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 89C3516A41F
	for <perforce@freebsd.org>; Thu, 25 May 2006 08:16:56 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 38A3043D46
	for <perforce@freebsd.org>; Thu, 25 May 2006 08:16:56 +0000 (GMT)
	(envelope-from kmacy@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 k4P8G1I0040908
	for <perforce@freebsd.org>; Thu, 25 May 2006 08:16:01 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4P8G1Ps040900
	for perforce@freebsd.org; Thu, 25 May 2006 08:16:01 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 25 May 2006 08:16:01 GMT
Message-Id: <200605250816.k4P8G1Ps040900@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 97802 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: Thu, 25 May 2006 08:16:56 -0000

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

Change 97802 by kmacy@kmacy_storage:sun4v_work on 2006/05/25 08:15:13

	only conditionally compile tunable stalling boot

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/vm/vm_pageq.c#5 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/vm/vm_pageq.c#5 (text+ko) ====

@@ -52,7 +52,7 @@
 
 static void vm_coloring_init(void);
 void setPQL2(int *const size, int *const ways);
-
+extern int smp_started;
 struct vpgqueues vm_page_queues[PQ_MAXCOUNT];
 struct pq_coloring page_queue_coloring;
 
@@ -191,10 +191,14 @@
 vm_page_t
 vm_pageq_add_new_page(vm_paddr_t pa)
 {
+	vm_page_t m;
+
+/* 
+ * This virtually unused tunable increases the boot time on sun4v by > 10x
+ */
+#ifdef ENABLE_PADDR_BLACKLIST
 	vm_paddr_t bad;
-	vm_page_t m;
 	char *cp, *list, *pos;
-
 	/*
 	 * See if a physical address in this page has been listed
 	 * in the blacklist tunable.  Entries in the tunable are
@@ -222,16 +226,20 @@
 		}
 		freeenv(list);
 	}
-
+#endif
 	atomic_add_int(&cnt.v_page_count, 1);
 	m = PHYS_TO_VM_PAGE(pa);
 	m->phys_addr = pa;
 	m->flags = 0;
 	m->pc = (pa >> PAGE_SHIFT) & PQ_COLORMASK;
 	pmap_page_init(m);
-	mtx_lock_spin(&vm_page_queue_free_mtx);
-	vm_pageq_enqueue(m->pc + PQ_FREE, m);
-	mtx_unlock_spin(&vm_page_queue_free_mtx);
+	if (!smp_started) {
+		vm_pageq_enqueue(m->pc + PQ_FREE, m);
+	} else {
+		mtx_lock_spin(&vm_page_queue_free_mtx);
+		vm_pageq_enqueue(m->pc + PQ_FREE, m);
+		mtx_unlock_spin(&vm_page_queue_free_mtx);
+	}
 	return (m);
 }