Date: Mon, 9 Apr 2012 12:34:42 -0400 From: John Baldwin <jhb@freebsd.org> To: Jaakko Heinonen <jh@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, "Justin T. Gibbs" <gibbs@freebsd.org>, src-committers@freebsd.org Subject: Re: svn commit: r233961 - head/sys/x86/x86 Message-ID: <201204091234.43106.jhb@freebsd.org> In-Reply-To: <20120409154510.GA2253@a91-153-116-96.elisa-laajakaista.fi> References: <201204062119.q36LJTKR026564@svn.freebsd.org> <20120409154510.GA2253@a91-153-116-96.elisa-laajakaista.fi>
next in thread | previous in thread | raw e-mail | index | archive | help
On Monday, April 09, 2012 11:45:11 am Jaakko Heinonen wrote:
>
> Hi,
>
> On 2012-04-06, Justin T. Gibbs wrote:
> > Fix interrupt load balancing regression, introduced in revision
> > 222813, that left all un-pinned interrupts assigned to CPU 0.
> >
> > sys/x86/x86/intr_machdep.c:
> > In intr_shuffle_irqs(), remove CPU_SETOF() call that initialized
> > the "intr_cpus" cpuset to only contain CPU0.
> >
> > This initialization is too late and nullifies the results of calls
> > the intr_add_cpu() that occur much earlier in the boot process.
> > Since "intr_cpus" is statically initialized to the empty set, and
> > all processors, including the BSP, already add themselves to
> > "intr_cpus" no special initialization for the BSP is necessary.
>
> My Pentium 4 system hangs on boot after this commit. These are the last
> lines from a verbose boot:
>
> SMP: AP CPU #1 Launched!
> cpu1 AP:
> ID: 0x01000000 VER: 0x00050014 LDR: 0x00000000 DFR: 0xffffffff
> lint0: 0x00010700 lint1: 0x00000400 TPR: 0x00000000 SVR: 0x000001ff
> timer: 0x000100ef therm: 0x00010000 err: 0x000000f0 pmc: 0x00010400
>
> The system boots with r233960.
>
> Some information:
>
> CPU: Intel(R) Pentium(R) 4 CPU 2.60GHz (2605.96-MHz 686-class CPU)
> Origin = "GenuineIntel" Id = 0xf29 Family = f Model = 2 Stepping =
> 9
>
Features=0xbfebfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CLFLUSH,DTS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE>
> Features2=0x4400<CNXT-ID,xTPR>
> real memory = 2147483648 (2048 MB)
> avail memory = 2085228544 (1988 MB)
> Event timer "LAPIC" quality 400
> ACPI APIC Table: <A M I OEMAPIC >
> FreeBSD/SMP: Multiprocessor System Detected: 2 CPUs
> FreeBSD/SMP: 1 package(s) x 1 core(s) x 2 HTT threads
> cpu0 (BSP): APIC ID: 0
> cpu1 (AP/HT): APIC ID: 1
I suspect in your case intr_add_cpu() is never called. I think Attilio is not
correct in that it is not called for the BSP.
Yes, it is not called for the BSP in set_interrupt_apic_ids(). This used to
work because bit 0 was assigned statically. Also, in a UP machine
set_interrupt_apic_ids() is not called at all.
Try this (untested):
Index: sys/x86/x86/intr_machdep.c
===================================================================
--- intr_machdep.c (revision 234057)
+++ intr_machdep.c (working copy)
@@ -491,6 +491,15 @@ intr_bind(u_int vector, u_char cpu)
return (intr_event_bind(isrc->is_event, cpu));
}
+static void
+intr_add_bsp(void *arg __unused)
+{
+
+ /* The BSP is always a valid target. */
+ CPU_SETOF(0, &intr_cpus);
+}
+SYSINIT(intr_add_bsp, SI_SUB_CPU, SI_ORDER_FIRST, intr_add_bsp, NULL);
+
/*
* Add a CPU to our mask of valid CPUs that can be destinations of
* interrupts.
--
John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204091234.43106.jhb>