From owner-freebsd-current@FreeBSD.ORG  Thu Jul 29 14:19:52 2010
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6617E106567B;
	Thu, 29 Jul 2010 14:19:52 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 3790C8FC19;
	Thu, 29 Jul 2010 14:19:52 +0000 (UTC)
Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net
	[66.111.2.69])
	by cyrus.watson.org (Postfix) with ESMTPSA id DA16646B52;
	Thu, 29 Jul 2010 10:19:51 -0400 (EDT)
Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9])
	by bigwig.baldwin.cx (Postfix) with ESMTPSA id D14758A050;
	Thu, 29 Jul 2010 10:19:50 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: mdf@freebsd.org
Date: Thu, 29 Jul 2010 10:18:07 -0400
User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20100217; KDE/4.4.5; amd64; ; )
References: <AANLkTimZj4ocqiiUzXJhwkY6nRj_sGJ2h+QAQKvC9wWi@mail.gmail.com>
In-Reply-To: <AANLkTimZj4ocqiiUzXJhwkY6nRj_sGJ2h+QAQKvC9wWi@mail.gmail.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201007291018.07112.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1
	(bigwig.baldwin.cx); Thu, 29 Jul 2010 10:19:50 -0400 (EDT)
X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-2.6 required=4.2 tests=AWL,BAYES_00 autolearn=ham
	version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx
Cc: freebsd-current@freebsd.org
Subject: Re: Panic booting vmware i386 after SRAT update
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jul 2010 14:19:52 -0000

On Wednesday, July 28, 2010 1:37:42 pm mdf@freebsd.org wrote:
> I have a 2 cpu virtual image of FreeBSD current.  It panics during
> boot after building in the NUMA support.
> 
> I'll transcribe the SRAT bootverbose messages and panic message as best I can.
> 
> Table 'SRAT' at 0xfef07f6
> SRAT: Found table at 0xfef07f6
> SRAT: Found memory domain 0 addr 0 len a0000: enabled
> SRAT: Found memory domain 0 addr 100000 len ff00000: enabled
> 
> then some MADT: messages about finding cpu 0 and 1
> 
>  cpu0 (BSP): APIC ID:  0
>  cpu1 (AP): APIC ID:  1
> panic: SRAT: CPU with APIC ID 0 is not known
> 
> I'm playing around now with trying to figure out what went missing,
> but I thought I'd send this out now.

Hmm, check_domains() in srat.c should reject the SRAT table in this case.
Oh, I see the problem, try this:

Index: srat.c
===================================================================
--- srat.c	(revision 210552)
+++ srat.c	(working copy)
@@ -150,7 +150,8 @@
 	for (i = 0; i < num_mem; i++) {
 		found = 0;
 		for (j = 0; j <= MAX_APIC_ID; j++)
-			if (cpus[j].domain == mem_info[i].domain) {
+			if (cpus[j].enabled &&
+			    cpus[j].domain == mem_info[i].domain) {
 				cpus[j].has_memory = 1;
 				found++;
 			}

-- 
John Baldwin