From owner-p4-projects@FreeBSD.ORG  Mon Sep 24 16:17:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5906116A418; Mon, 24 Sep 2007 16:17:14 +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 E0BE316A419
	for <perforce@FreeBSD.org>; Mon, 24 Sep 2007 16:17:13 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F415313C448
	for <perforce@FreeBSD.org>; Mon, 24 Sep 2007 16:17:13 +0000 (UTC)
	(envelope-from zec@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 l8OGHDkh077249
	for <perforce@FreeBSD.org>; Mon, 24 Sep 2007 16:17:13 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8OGHDQO077246
	for perforce@freebsd.org; Mon, 24 Sep 2007 16:17:13 GMT
	(envelope-from zec@FreeBSD.org)
Date: Mon, 24 Sep 2007 16:17:13 GMT
Message-Id: <200709241617.l8OGHDQO077246@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 126773 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: Mon, 24 Sep 2007 16:17:14 -0000

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

Change 126773 by zec@zec_tca51 on 2007/09/24 16:16:25

	Rearrange a few lines in schedcpu() in a desperate attempt
	to catch a difficult to reproduce panic observed there after
	change 126517 went in, i.e. after load average accounting
	having been split into per-vprocg counters.
	
	The panic was observed (but not traced nor dump saved) a few
	times just after system bootup, with only the default
	vimage/vprocg configured.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#10 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/sched_4bsd.c#10 (text+ko) ====

@@ -390,8 +390,6 @@
 {
 #ifndef VIMAGE
 	register fixpt_t loadfac = loadfactor(averunnable.ldavg[0]);
-#else
-	#define loadfac loadfactor(td->td_ucred->cr_vimage->v_procg->_averunnable.ldavg[0])
 #endif
 	struct thread *td;
 	struct proc *p;
@@ -402,6 +400,13 @@
 	sx_slock(&allproc_lock);
 	FOREACH_PROC_IN_SYSTEM(p) {
 		PROC_SLOCK(p);
+#ifdef VIMAGE
+		KASSERT((p->p_ucred != NULL), ("p_ucred"));
+		KASSERT((p->p_ucred->cr_vimage != NULL), ("cr_vimage"));
+		KASSERT((p->p_ucred->cr_vimage->v_procg != NULL), ("v_procg"));
+		INIT_VPROCG(p->p_ucred->cr_vimage->v_procg);
+		fixpt_t loadfac = loadfactor(V_averunnable.ldavg[0]);
+#endif
 		/*
 		 * Increment time in/out of memory.  We ignore overflow; with
 		 * 16-bit int's (remember them?) overflow takes 45 days.
@@ -490,9 +495,6 @@
 		PROC_SUNLOCK(p);
 	} /* end of process loop */
 	sx_sunlock(&allproc_lock);
-#ifdef VIMAGE
-#undef loadfac
-#endif
 }
 
 /*