by smtp.nexlab.net (Postfix) with ESMTP id 7AD88FAC5 for <[email protected]>; Tue, 24 May 2005 10:20:44 +0200 (CEST)
Received: ([email protected]) by vger.kernel.org via listexpand
id S261430AbVEXIQ3 (ORCPT <rfc822;[email protected]>); Tue, 24 May 2005 04:16:29 -0400
Received: ([email protected]) by vger.kernel.org id S261442AbVEXIQ3
(ORCPT <rfc822;linux-kernel-outgoing>); Tue, 24 May 2005 04:16:29 -0400
Received: from fmr17.intel.com ([134.134.136.16]:35548 "EHLO
orsfmr002.jf.intel.com") by vger.kernel.org with ESMTP id S261430AbVEXIOA (ORCPT <rfc822;[email protected]>); Tue, 24 May 2005 04:14:00 -0400
Received: from orsfmr100.jf.intel.com (orsfmr100.jf.intel.com [10.7.209.16])
by orsfmr002.jf.intel.com (8.12.10/8.12.10/d: major-outer.mc,v 1.1 2004/09/17 17:50:56 root Exp $) with ESMTP id j4O8CfKm030199; Tue, 24 May 2005 08:12:41 GMT
Received: from csdlinux-2.jf.intel.com (csdlinux-2.jf.intel.com [10.23.61.107])
by orsfmr100.jf.intel.com (8.12.10/8.12.10/d: major-inner.mc,v 1.2 2004/09/17 18:05:01 root Exp $) with ESMTP id j4O8CeAx015527; Tue, 24 May 2005 08:12:40 GMT
Received: by csdlinux-2.jf.intel.com (Postfix, from userid 47353)
id 147152BCFB3; Tue, 24 May 2005 01:08:01 -0700 (PDT)
Message-Id: <[email protected]>
References: <[email protected]>
Date: Tue, 24 May 2005 00:27:52 -0700
From: Ashok Raj <[email protected]>
To: [email protected], [email protected]
Cc: [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected]
Subject: [patch 3/4] CPU Hotplug support for X86_64
Content-Disposition: inline; filename=x86_64-sibling-map-fixup.patch
X-Scanned-By: MIMEDefang 2.44
Sender: [email protected]
Precedence: bulk
X-Mailing-List: [email protected]
Subject: [patch 3/4] x86_64: CPU hotplug sibling map cleanup
From: Ashok Raj <[email protected]>
This patch is a minor cleanup to the cpu sibling/core map. It is required that this setup happens on a per-cpu bringup time.
------------------------------
smpboot.c | 89 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 41 insertions(+), 48 deletions(-)
arch/x86_64/kernel/smpboot.c +41 -48
@@ -62,9 +62,12 @@/* Number of siblings per CPU package */ int smp_num_siblings =1 ;/* Package ID of each logical CPU */ -u8 phys_proc_id[NR_CPUS ] = { [0 ...NR_CPUS -1 ] =BAD_APICID }; -u8 cpu_core_id[NR_CPUS ] = { [0 ...NR_CPUS -1 ] =BAD_APICID }; +u8 phys_proc_id[NR_CPUS] __cacheline_aligned = + { [0 ...NR_CPUS -1 ] =BAD_APICID };EXPORT_SYMBOL (phys_proc_id); + +u8 cpu_core_id[NR_CPUS] __cacheline_aligned = + { [0 ...NR_CPUS -1 ] =BAD_APICID };EXPORT_SYMBOL (cpu_core_id);/* Bitmask of currently online CPUs */
@@ -434,6 +437,34 @@ void __cpuinit smp_callin(void)local_flush_tlb (); } +static inline void +set_cpu_sibling_map (int cpu) +{ +int i; + +if (smp_num_siblings >1 ) { +for_each_online_cpu (i) { +if (cpu_core_id[cpu] == cpu_core_id[i]) { +cpu_set (i, cpu_sibling_map[cpu]); +cpu_set (cpu, cpu_sibling_map[i]); + } + } + }else { +cpu_set (cpu, cpu_sibling_map[cpu]); + } + +if (current_cpu_data.x86_num_cores >1 ) { +for_each_online_cpu (i) { +if (phys_proc_id[cpu] == phys_proc_id[i]) { +cpu_set (i, cpu_core_map[cpu]); +cpu_set (cpu, cpu_core_map[i]); + } + } + }else { + cpu_core_map[cpu] = cpu_sibling_map[cpu]; + } +} +/* * Setup code on secondary processor (after comming out of the trampoline) */
@@ -463,6 +494,12 @@ void __cpuinit start_secondary(void)enable_APIC_timer (); +/* +* The sibling maps must be set before turing the online map on for +* this cpu +*/ +set_cpu_sibling_map (smp_processor_id ()); +/* * Allow the master to continue. */
@@ -798,51 +835,6 @@ cycles_t cacheflush_time;unsigned long cache_decay_ticks;/* -* Construct cpu_sibling_map[], so that we can tell the sibling CPU -* on SMT systems efficiently. -*/ -static __cpuinit void detect_siblings (void ) -{ -int cpu; - -for (cpu =0 ; cpu <NR_CPUS ; cpu++) { -cpus_clear (cpu_sibling_map[cpu]); -cpus_clear (cpu_core_map[cpu]); - } - -for_each_online_cpu (cpu) { -struct cpuinfo_x86 *c = cpu_data + cpu; -int siblings =0 ; -int i; -if (smp_num_siblings >1 ) { -for_each_online_cpu (i) { -if (cpu_core_id[cpu] == cpu_core_id[i]) { - siblings++; -cpu_set (i, cpu_sibling_map[cpu]); - } - } - }else { - siblings++; -cpu_set (cpu, cpu_sibling_map[cpu]); - } - -if (siblings != smp_num_siblings) { -printk (KERN_WARNING -"WARNING: %d siblings found for CPU%d, should be %d\n" , - siblings, cpu, smp_num_siblings); - smp_num_siblings = siblings; - } -if (c->x86_num_cores >1 ) { -for_each_online_cpu (i) { -if (phys_proc_id[cpu] == phys_proc_id[i]) -cpu_set (i, cpu_core_map[cpu]); - } - }else - cpu_core_map[cpu] = cpu_sibling_map[cpu]; - } -} - -/* * Cleanup possible dangling ends... */ static __cpuinit void smp_cleanup_boot (void )
@@ -1036,6 +1028,8 @@ void __init smp_prepare_boot_cpu(void)int me =smp_processor_id ();cpu_set (me, cpu_online_map);cpu_set (me, cpu_callout_map); +cpu_set (0 , cpu_sibling_map[0 ]); +cpu_set (0 , cpu_core_map[0 ]); }/*
@@ -1100,7 +1094,6 @@ void __init smp_cpus_done(unsigned int msetup_ioapic_dest ();#endif -detect_siblings ();time_init_gtod ();check_nmi_watchdog ();
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/