linux-kernel - [tip:x86/urgent] x86: Fix double enable_IR_x2apic() call on SMP kernel on !SMP boards

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-472a474c6630efd195d3738339fd1bdc8aa3b1aa@git.kernel.org>
Date:	Fri, 2 Apr 2010 19:14:31 GMT
From:	tip-bot for Suresh Siddha <suresh.b.siddha@...el.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	weidong.han@...el.com, youquan.song@...el.com,
	jbarnes@...tuousgeek.org, david.woodhouse@...el.com,
	suresh.b.siddha@...el.com, Jan.Grossmann@...lnet.net,
	tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/urgent] x86: Fix double enable_IR_x2apic() call on SMP kernel on !SMP boards

Commit-ID:  472a474c6630efd195d3738339fd1bdc8aa3b1aa
Gitweb:     http://git.kernel.org/tip/472a474c6630efd195d3738339fd1bdc8aa3b1aa
Author:     Suresh Siddha <suresh.b.siddha@...el.com>
AuthorDate: Wed, 31 Mar 2010 18:04:47 -0700
Committer:  Ingo Molnar <mingo@...e.hu>
CommitDate: Fri, 2 Apr 2010 20:48:47 +0200

x86: Fix double enable_IR_x2apic() call on SMP kernel on !SMP boards

Jan Grossmann reported kernel boot panic while booting SMP
kernel on his system with a single core cpu. SMP kernels call
enable_IR_x2apic() from native_smp_prepare_cpus() and on
platforms where the kernel doesn't find SMP configuration we
ended up again calling enable_IR_x2apic() from the
APIC_init_uniprocessor() call in the smp_sanity_check(). Thus
leading to kernel panic.

Don't call enable_IR_x2apic() and default_setup_apic_routing()
from APIC_init_uniprocessor() in CONFIG_SMP case.

NOTE: this kind of non-idempotent and assymetric initialization
sequence is rather fragile and unclean, we'll clean that up
in v2.6.35. This is the minimal fix for v2.6.34.

Reported-by: Jan.Grossmann@...lnet.net
Signed-off-by: Suresh Siddha <suresh.b.siddha@...el.com>
Cc: <jbarnes@...tuousgeek.org>
Cc: <david.woodhouse@...el.com>
Cc: <weidong.han@...el.com>
Cc: <youquan.song@...el.com>
Cc: <Jan.Grossmann@...lnet.net>
Cc: <stable@...nel.org> # [v2.6.32.x, v2.6.33.x]
LKML-Reference: <1270083887.7835.78.camel@...-t61.sc.intel.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
 arch/x86/kernel/apic/apic.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 00187f1..e5a4a1e 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1640,8 +1640,10 @@ int __init APIC_init_uniprocessor(void)
 	}
 #endif
 
+#ifndef CONFIG_SMP
 	enable_IR_x2apic();
 	default_setup_apic_routing();
+#endif
 
 	verify_local_APIC();
 	connect_bsp_APIC();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/