x86, x86_64: Intel dual-core detection
PATCH 1/1 x86, x86_64: Intel dual-core detection
Appended patch adds the support for Intel dual-core detection and displaying the core related information in /proc/cpuinfo.
It adds two new fields "core id" and "cpu cores" to x86 /proc/cpuinfo and the "core id" field for x86_64("cpu cores" field is already present in x86_64).
Number of processor cores in a die is detected using cpuid(4) and this is documented in IA-32 Intel Architecture Software Developer's Manual (vol 2a)
(http://developer.intel.com/design/pentium4/manuals/index_new.htm#sdm_vol2a)
This patch also adds cpu_core_map similar to cpu_sibling_map.
arch/i386/kernel/cpu/amd.c +7 -6
@@ -188,6 +188,13 @@ }display_cacheinfo (c); + +if (cpuid_eax (0x80000000 ) >=0x80000008 ) { + c->x86_num_cores = (cpuid_ecx (0x80000008 ) &0xff ) +1 ; +if (c->x86_num_cores & (c->x86_num_cores -1 )) + c->x86_num_cores =1 ; + } +detect_ht (c);#ifdef CONFIG_X86_HT
@@ -199,12 +206,6 @@if (cpu_has (c,X86_FEATURE_CMP_LEGACY )) smp_num_siblings =1 ;#endif - -if (cpuid_eax (0x80000000 ) >=0x80000008 ) { - c->x86_num_cores = (cpuid_ecx (0x80000008 ) &0xff ) +1 ; -if (c->x86_num_cores & (c->x86_num_cores -1 )) - c->x86_num_cores =1 ; - } }static unsigned int amd_size_cache (struct cpuinfo_x86 * c,unsigned int size)
arch/i386/kernel/cpu/common.c +20 -8
@@ -441,7 +441,7 @@void __init detect_ht (struct cpuinfo_x86 *c) {u32 eax, ebx, ecx, edx; -int index_lsb, index_msb, tmp; +int index_msb, tmp;int cpu =smp_processor_id ();if (!cpu_has (c,X86_FEATURE_HT ))
@@ -453,7 +453,6 @@if (smp_num_siblings ==1 ) {printk (KERN_INFO "CPU: Hyper-Threading is disabled\n" ); }else if (smp_num_siblings >1 ) { - index_lsb =0 ; index_msb =31 ;if (smp_num_siblings >NR_CPUS ) {
@@ -462,21 +461,34 @@return ; } tmp = smp_num_siblings; -while ((tmp &1 ) ==0 ) { - tmp >>=1 ; - index_lsb++; - } - tmp = smp_num_siblings;while ((tmp &0x80000000 ) ==0 ) { tmp <<=1 ; index_msb--; } -if (index_lsb != index_msb ) +if (smp_num_siblings & (smp_num_siblings -1 )) index_msb++; phys_proc_id[cpu] =phys_pkg_id ((ebx >>24 ) &0xFF , index_msb);printk (KERN_INFO "CPU: Physical Processor ID: %d\n" , phys_proc_id[cpu]); + + smp_num_siblings = smp_num_siblings / c->x86_num_cores; + + tmp = smp_num_siblings; + index_msb =31 ; +while ((tmp &0x80000000 ) ==0 ) { + tmp <<=1 ; + index_msb--; + } + +if (smp_num_siblings & (smp_num_siblings -1 )) + index_msb++; + + cpu_core_id[cpu] =phys_pkg_id ((ebx >>24 ) &0xFF , index_msb); + +if (c->x86_num_cores >1 ) +printk (KERN_INFO "CPU: Processor Core ID: %d\n" , + cpu_core_id[cpu]); } }#endif
arch/i386/kernel/cpu/intel.c +23 -0
@@ -77,6 +77,27 @@ } +/* +* find out the number of processor cores on the die +*/ +static int __init num_cpu_cores (struct cpuinfo_x86 *c) +{ +unsigned int eax; + +if (c->cpuid_level <4 ) +return 1 ; + + __asm__("cpuid" + :"=a" (eax) + :"0" (4 ),"c" (0 ) + :"bx" ,"dx" ); + +if (eax &0x1f ) +return ((eax >>26 ) +1 ); +else +return 1 ; +} +static void __init init_intel (struct cpuinfo_x86 *c) {unsigned int l2 =0 ;
@@ -139,6 +160,8 @@if ( p )strcpy (c->x86_model_id, p); + c->x86_num_cores =num_cpu_cores (c); +detect_ht (c);/* Work around errata */
arch/i386/kernel/cpu/proc.c +6 -2
@@ -94,8 +94,12 @@if (c->x86_cache_size >=0 )seq_printf (m,"cache size\t: %d KB\n" , c->x86_cache_size);#ifdef CONFIG_X86_HT -seq_printf (m,"physical id\t: %d\n" , phys_proc_id[n]); -seq_printf (m,"siblings\t: %d\n" , c->x86_num_cores * smp_num_siblings); +if (smp_num_siblings >1 || c->x86_num_cores >1 ) { +seq_printf (m,"physical id\t: %d\n" , phys_proc_id[n]); +seq_printf (m,"siblings\t: %d\n" , c->x86_num_cores * smp_num_siblings); +seq_printf (m,"core id\t\t: %d\n" , cpu_core_id[n]); +seq_printf (m,"cpu cores\t: %d\n" , c->x86_num_cores); + }#endif /* We use exception 16 if we have hardware math and we've either seen it or the CPU claims it is internal */
arch/i386/kernel/smpboot.c +23 -2
@@ -62,6 +62,8 @@int smp_num_siblings =1 ;int phys_proc_id[NR_CPUS ];/* Package ID of each logical CPU */ EXPORT_SYMBOL (phys_proc_id); +int cpu_core_id[NR_CPUS ];/* Core ID of each logical CPU */ +EXPORT_SYMBOL (cpu_core_id);/* bitmap of online cpus */ cpumask_t cpu_online_map;
@@ -900,6 +902,7 @@void *xquad_portio; cpumask_t cpu_sibling_map[NR_CPUS] __cacheline_aligned; +cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;static void __init smp_boot_cpus (unsigned int max_cpus) {
@@ -922,6 +925,9 @@cpus_clear (cpu_sibling_map[0 ]);cpu_set (0 , cpu_sibling_map[0 ]); +cpus_clear (cpu_core_map[0 ]); +cpu_set (0 , cpu_core_map[0 ]); +/* * If we couldn't find an SMP configuration at boot time, * get out of here now!
@@ -1050,10 +1056,13 @@* construct cpu_sibling_map[], so that we can tell sibling CPUs * efficiently. */ -for (cpu =0 ; cpu <NR_CPUS ; cpu++) +for (cpu =0 ; cpu <NR_CPUS ; cpu++) {cpus_clear (cpu_sibling_map[cpu]); +cpus_clear (cpu_core_map[cpu]); + }for (cpu =0 ; cpu <NR_CPUS ; cpu++) { +struct cpuinfo_x86 *c = cpu_data + cpu;int siblings =0 ;int i;if (!cpu_isset (cpu, cpu_callout_map))
@@ -1063,7 +1072,7 @@for (i =0 ; i <NR_CPUS ; i++) {if (!cpu_isset (i, cpu_callout_map))continue ; -if (phys_proc_id[cpu] == phys_proc_id[i]) { +if (cpu_core_id[cpu] == cpu_core_id[i]) { siblings++;cpu_set (i, cpu_sibling_map[cpu]); }
@@ -1075,6 +1084,18 @@if (siblings != smp_num_siblings)printk (KERN_WARNING "WARNING: %d siblings found for CPU%d, should be %d\n" , siblings, cpu, smp_num_siblings); + +if (c->x86_num_cores >1 ) { +for (i =0 ; i <NR_CPUS ; i++) { +if (!cpu_isset (i, cpu_callout_map)) +continue ; +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]; + } }if (nmi_watchdog ==NMI_LOCAL_APIC )
arch/x86_64/kernel/setup.c +49 -15
115 lines not on this page · raw message
arch/x86_64/kernel/smpboot.c +20 -2
@@ -58,7 +58,10 @@int smp_num_siblings =1 ;/* Package ID of each logical CPU */ u8 phys_proc_id[NR_CPUS ] = { [0 ...NR_CPUS -1 ] =BAD_APICID }; +/* Core ID of each logical CPU */ +u8 cpu_core_id[NR_CPUS ] = { [0 ...NR_CPUS -1 ] =BAD_APICID };EXPORT_SYMBOL (phys_proc_id); +EXPORT_SYMBOL (cpu_core_id);/* Bitmask of currently online CPUs */ cpumask_t cpu_online_map;
@@ -74,6 +77,7 @@int smp_threads_ready; cpumask_t cpu_sibling_map[NR_CPUS] __cacheline_aligned; +cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;/* * Trampoline 80x86 program as an array.
@@ -857,10 +861,13 @@* Construct cpu_sibling_map[], so that we can tell the * sibling CPU efficiently. */ -for (cpu =0 ; cpu <NR_CPUS ; cpu++) +for (cpu =0 ; cpu <NR_CPUS ; cpu++) {cpus_clear (cpu_sibling_map[cpu]); +cpus_clear (cpu_core_map[cpu]); + }for (cpu =0 ; cpu <NR_CPUS ; cpu++) { +struct cpuinfo_x86 *c = cpu_data + cpu;int siblings =0 ;int i;if (!cpu_isset (cpu, cpu_callout_map))
@@ -870,7 +877,7 @@for (i =0 ; i <NR_CPUS ; i++) {if (!cpu_isset (i, cpu_callout_map))continue ; -if (phys_proc_id[cpu] == phys_proc_id[i]) { +if (cpu_core_id[cpu] == cpu_core_id[i]) { siblings++;cpu_set (i, cpu_sibling_map[cpu]); }
@@ -886,6 +893,17 @@ siblings, cpu, smp_num_siblings); smp_num_siblings = siblings; } + +if (c->x86_num_cores >1 ) { +for (i =0 ; i <NR_CPUS ; i++) { +if (!cpu_isset (i, cpu_callout_map)) +continue ; +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]; }Dprintk ("Boot done.\n" );
include/asm-i386/processor.h +1 -0
@@ -98,6 +98,7 @@#endif extern int phys_proc_id[NR_CPUS ]; +extern int cpu_core_id[NR_CPUS ];extern char ignore_fpu_irq;extern void identify_cpu (struct cpuinfo_x86 *);
include/asm-i386/smp.h +1 -0
@@ -35,6 +35,7 @@extern int pic_mode;extern int smp_num_siblings;extern cpumask_t cpu_sibling_map[]; +extern cpumask_t cpu_core_map[];extern void smp_flush_tlb (void );extern void smp_message_irq (int cpl,void *dev_id,struct pt_regs *regs);
include/asm-x86_64/smp.h +2 -0
@@ -48,7 +48,9 @@extern void zap_low_mappings (void );void smp_stop_cpu (void );extern cpumask_t cpu_sibling_map[NR_CPUS ]; +extern cpumask_t cpu_core_map[NR_CPUS ];extern u8 phys_proc_id[NR_CPUS ]; +extern u8 cpu_core_id[NR_CPUS ];#define SMP_TRAMPOLINE_BASE 0x6000
Quoted 6 lines · Suresh B
Appended patch adds the support for Intel dual-core detection and displaying the core related information in
/proc/cpuinfo.It adds two new fields "core id" and "cpu cores" to x86
/proc/cpuinfoand the "core id" field forx86_64("cpu cores" field is already present in x86_64).
Thanks. I have a similar patch for AMD CPUs, unfortuntely it uses different names ("shared cores" etc.)
Quoted 6 lines
Number of processor cores in a die is detected using cpuid(4) and this is documented in IA-32 Intel Architecture Software Developer's Manual (vol 2a)
(http://developer.intel.com/design/pentium4/manuals/index_new.htm#sdm_vol2a)This patch also adds
cpu_core_mapsimilar tocpu_sibling_map.
Called cpu_sharecore_map in my patch.
Hmm, which names should be chosen?
-Andi
Quoted 7 lines · Andi Kleen
Quoted 3 lines · Suresh B
It adds two new fields "core id" and "cpu cores" to x86
/proc/cpuinfoand the "core id" field forx86_64("cpu cores" field is already present in x86_64).Thanks. I have a similar patch for AMD CPUs, unfortuntely it uses different names ("shared cores" etc.)
2.6.11 already has "cpu cores" for x86_64. I would like to retain that.
Quoted 3 lines
Quoted 2 lines
This patch also adds
cpu_core_mapsimilar tocpu_sibling_map.Called
cpu_sharecore_mapin my patch.
cpu_sharecore_map sounds like HT logical siblings sharing the core. Initially I was calling it as cpu_coresibling_map but later thought cpu_core_map is a smaller name.
Quoted 2 lines
Hmm, which names should be chosen?
For /proc/cpuinfo, I want to stick with "cpu cores" and "core id" But I am open for kernel variable names.
Depending on what we decide on kernel variable names, I will see if I have to make any changes to the IPF patch we posted last week.
thanks,
suresh