From owner-svn-src-all@FreeBSD.ORG  Mon Apr 22 09:02:23 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BB0EB6ED;
 Mon, 22 Apr 2013 09:02:23 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ADA59190A;
 Mon, 22 Apr 2013 09:02:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3M92NoG074633;
 Mon, 22 Apr 2013 09:02:23 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3M92NB9074631;
 Mon, 22 Apr 2013 09:02:23 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201304220902.r3M92NB9074631@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 22 Apr 2013 09:02:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249763 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Apr 2013 09:02:23 -0000

Author: glebius
Date: Mon Apr 22 09:02:23 2013
New Revision: 249763
URL: http://svnweb.freebsd.org/changeset/base/249763

Log:
  Panic if UMA_ZONE_PCPU is created at early stages of boot, when mp_ncpus
  isn't yet initialized. Otherwise we will panic at first allocation later.
  
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/vm/uma_core.c

Modified: head/sys/vm/uma_core.c
==============================================================================
--- head/sys/vm/uma_core.c	Mon Apr 22 08:28:53 2013	(r249762)
+++ head/sys/vm/uma_core.c	Mon Apr 22 09:02:23 2013	(r249763)
@@ -1139,6 +1139,7 @@ keg_small_init(uma_keg_t keg)
 	u_int shsize;
 
 	if (keg->uk_flags & UMA_ZONE_PCPU) {
+		KASSERT(mp_ncpus > 0, ("%s: ncpus %d\n", __func__, mp_ncpus));
 		keg->uk_slabsize = sizeof(struct pcpu);
 		keg->uk_ppera = howmany(mp_ncpus * sizeof(struct pcpu),
 		    PAGE_SIZE);