From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751418Ab1IEIFP (ORCPT ); Mon, 5 Sep 2011 04:05:15 -0400 Received: from nat28.tlf.novell.com ([130.57.49.28]:5997 "EHLO nat28.tlf.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750918Ab1IEIFJ convert rfc822-to-8bit (ORCPT ); Mon, 5 Sep 2011 04:05:09 -0400 Message-Id: <4E649ED00200007800054988@nat28.tlf.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.1 Date: Mon, 05 Sep 2011 09:05:04 +0100 From: "Jan Beulich" To: "Stratos Psomadakis" Cc: , , , , , Subject: Re: [PATCH] i386/bigsmp: eliminate false warnings regarding logical APIC ID mismatches References: <4E4D27B40200007800051D40@nat28.tlf.novell.com> <4E5B677F.4030302@gentoo.org> In-Reply-To: <4E5B677F.4030302@gentoo.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>> On 29.08.11 at 12:18, Stratos Psomadakis wrote: > On 08/18/2011 03:54 PM, Jan Beulich wrote: >> These warnings (generally one per CPU) are a result of initializing >> x86_cpu_to_logical_apicid while apic_default is still in use, but the >> check in setup_local_APIC() being done when apic_bigsmp was already >> used as an override in default_setup_apic_routing(): >> >> Overriding APIC driver with bigsmp >> Enabling APIC mode: Physflat. Using 5 I/O APICs >> ------------[ cut here ]------------ >> WARNING: at .../arch/x86/kernel/apic/apic.c:1239 > setup_local_APIC+0x137/0x46b() >> Hardware name: ... >> CPU0 logical APIC ID: 1 != 0 >> Pid: 1, comm: swapper Not tainted 3.0.1-2011-08-09-jb #2 >> Call Trace: >> [] try_stack_unwind+0x1b1/0x1f0 >> [] dump_trace+0x47/0x110 >> [] show_trace_log_lvl+0x4b/0x60 >> [] show_trace+0x18/0x20 >> [] dump_stack+0x6d/0x72 >> [] warn_slowpath_common+0x77/0xb0 >> [] warn_slowpath_fmt+0x33/0x40 >> [] setup_local_APIC+0x137/0x46b >> [] native_smp_prepare_cpus+0x108/0x1cd >> [] kernel_init+0x37/0x12c >> [] kernel_thread_helper+0x6/0xd >> ---[ end trace 4eaa2a86a8e2da22 ]--- >> ... >> CPU 1 irqstacks, hard=f1c9a000 soft=f1c9c000 >> Booting Node 0, Processors #1 >> smpboot cpu 1: start_ip = 9e000 >> Initializing CPU#1 >> ------------[ cut here ]------------ >> WARNING: at .../arch/x86/kernel/apic/apic.c:1239 > setup_local_APIC+0x137/0x46b() >> Hardware name: ... >> CPU1 logical APIC ID: 2 != 8 >> ... >> >> Fix this (for the time being, i.e. until x86_32_early_logical_apicid() >> will get removed again, as Tehun says ought to be possible) by >> overriding the previously stored values at the point where the APIC >> driver gets overridden. >> >> Signed-off-by: Jan Beulich >> Cc: Tejun Heo >> Cc: stable@kernel.org (2.6.39 and onwards) >> >> --- >> arch/x86/kernel/apic/probe_32.c | 11 +++++++++++ >> 1 file changed, 11 insertions(+) >> >> --- 3.1-rc2/arch/x86/kernel/apic/probe_32.c >> +++ 3.1-rc2-i386-bigsmp-early-lapicid-override/arch/x86/kernel/apic/probe_32.c >> @@ -203,7 +203,18 @@ void __init default_setup_apic_routing(v >> if (!cmdline_apic && apic == &apic_default) { >> struct apic *bigsmp = generic_bigsmp_probe(); >> if (bigsmp) { >> + unsigned int cpu; >> + >> apic = bigsmp; >> + for_each_possible_cpu(cpu) { >> + if (early_per_cpu(x86_cpu_to_logical_apicid, >> + cpu) == BAD_APICID) >> + continue; >> + early_per_cpu(x86_cpu_to_logical_apicid, >> + cpu) = >> + bigsmp->x86_32_early_logical_apicid >> + (cpu); >> + } >> printk(KERN_INFO "Overriding APIC driver with %s\n", >> apic->name); >> } > Will this patch be included in 3.1 (so that it gets merged in 3.0-stable > kernels sooner too) or will it go for 3.2? That can only be answered by the maintainers (on Cc), not me - afaict it didn't even get applied to -tip yet. Jan