cpu fixes
Hello Ingo,
Please pull:
The following changes since commit c6003015dacd7c6fe18c6009115801079d8fdd49:
Ingo Molnar (1):
Merge branch 'linus'
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip-cpu.git master
Jaswinder Singh Rajput (3):
x86: decent declarations in perf_counter.c
x88: using pr_info in perf_counter.c
x86: remove double copy of show_cpuinfo_core for 32 and 64 bit
arch/x86/kernel/cpu/perf_counter.c | 62 ++++++++++++++++++------------------ arch/x86/kernel/cpu/proc.c | 20 +---------- 2 files changed, 33 insertions(+), 49 deletions(-)
Complete diff:
arch/x86/kernel/cpu/perf_counter.c +31 -31
@@ -42,12 +42,12 @@ struct cpu_hw_counters {* struct pmc_x86_ops - performance counter x86 ops */ struct pmc_x86_ops { -u64 (*save_disable_all) (void ); -void (*restore_all) (u64 ctrl); -unsigned eventsel; -unsigned perfctr; -int (*event_map) (int event); -int max_events; +u64 (*save_disable_all)(void ); +void (*restore_all)(u64 ctrl); +unsigned eventsel; +unsigned perfctr; +int (*event_map)(int event); +int max_events; };static struct pmc_x86_ops *pmc_ops;
@@ -454,18 +454,18 @@ void perf_counter_print_debug(void) cpuc = &per_cpu (cpu_hw_counters, cpu);if (boot_cpu_data.x86_vendor ==X86_VENDOR_INTEL ) { -rdmsrl (MSR_CORE_PERF_GLOBAL_CTRL , ctrl); -rdmsrl (MSR_CORE_PERF_GLOBAL_STATUS , status); -rdmsrl (MSR_CORE_PERF_GLOBAL_OVF_CTRL , overflow); -rdmsrl (MSR_ARCH_PERFMON_FIXED_CTR_CTRL , fixed); - -printk (KERN_INFO "\n" ); -printk (KERN_INFO "CPU#%d: ctrl: %016llx\n" , cpu, ctrl); -printk (KERN_INFO "CPU#%d: status: %016llx\n" , cpu, status); -printk (KERN_INFO "CPU#%d: overflow: %016llx\n" , cpu, overflow); -printk (KERN_INFO "CPU#%d: fixed: %016llx\n" , cpu, fixed); +rdmsrl (MSR_CORE_PERF_GLOBAL_CTRL , ctrl); +rdmsrl (MSR_CORE_PERF_GLOBAL_STATUS , status); +rdmsrl (MSR_CORE_PERF_GLOBAL_OVF_CTRL , overflow); +rdmsrl (MSR_ARCH_PERFMON_FIXED_CTR_CTRL , fixed); + +pr_info ("\n" ); +pr_info ("CPU#%d: ctrl: %016llx\n" , cpu, ctrl); +pr_info ("CPU#%d: status: %016llx\n" , cpu, status); +pr_info ("CPU#%d: overflow: %016llx\n" , cpu, overflow); +pr_info ("CPU#%d: fixed: %016llx\n" , cpu, fixed); } -printk (KERN_INFO "CPU#%d: used: %016llx\n" , cpu, *(u64 *)cpuc->used); +pr_info ("CPU#%d: used: %016llx\n" , cpu, *(u64 *)cpuc->used);for (idx =0 ; idx < nr_counters_generic; idx++) {rdmsrl (pmc_ops->eventsel + idx, pmc_ctrl);
@@ -473,17 +473,17 @@ void perf_counter_print_debug(void) prev_left =per_cpu (prev_left[idx], cpu); -printk (KERN_INFO "CPU#%d: gen-PMC%d ctrl: %016llx\n" , +pr_info ("CPU#%d: gen-PMC%d ctrl: %016llx\n" , cpu, idx, pmc_ctrl); -printk (KERN_INFO "CPU#%d: gen-PMC%d count: %016llx\n" , +pr_info ("CPU#%d: gen-PMC%d count: %016llx\n" , cpu, idx, pmc_count); -printk (KERN_INFO "CPU#%d: gen-PMC%d left: %016llx\n" , +pr_info ("CPU#%d: gen-PMC%d left: %016llx\n" , cpu, idx, prev_left); }for (idx =0 ; idx < nr_counters_fixed; idx++) {rdmsrl (MSR_ARCH_PERFMON_FIXED_CTR0 + idx, pmc_count); -printk (KERN_INFO "CPU#%d: fixed-PMC%d count: %016llx\n" , +pr_info ("CPU#%d: fixed-PMC%d count: %016llx\n" , cpu, idx, pmc_count); }local_irq_enable ();
@@ -561,7 +561,7 @@ perf_handle_group(struct perf_counter *sibling, u64 *status, u64 *overflown)/* * Maximum interrupt frequency of 100KHz per CPU */ -#define PERFMON_MAX_INTERRUPTS 100000/HZ +#define PERFMON_MAX_INTERRUPTS (100000/HZ)/* * This handler is triggered by the local APIC, so the APIC IRQ handling
@@ -773,10 +773,10 @@ static struct pmc_x86_ops *pmc_intel_init(void)if (eax.split.mask_length <=ARCH_PERFMON_BRANCH_MISSES_RETIRED )return NULL ; -printk (KERN_INFO "Intel Performance Monitoring support detected.\n" ); -printk (KERN_INFO "... version: %d\n" , eax.split.version_id); -printk (KERN_INFO "... bit width: %d\n" , eax.split.bit_width); -printk (KERN_INFO "... mask length: %d\n" , eax.split.mask_length); +pr_info ("Intel Performance Monitoring support detected.\n" ); +pr_info ("... version: %d\n" , eax.split.version_id); +pr_info ("... bit width: %d\n" , eax.split.bit_width); +pr_info ("... mask length: %d\n" , eax.split.mask_length); nr_counters_generic = eax.split.num_counters; nr_counters_fixed = edx.split.num_counters_fixed;
@@ -790,7 +790,7 @@ static struct pmc_x86_ops *pmc_amd_init(void) nr_counters_generic =4 ; nr_counters_fixed =0 ; -printk (KERN_INFO "AMD Performance Monitoring support detected.\n" ); +pr_info ("AMD Performance Monitoring support detected.\n" );return &pmc_amd_ops; }
@@ -811,7 +811,7 @@ void __init init_hw_perf_counters(void)if (!pmc_ops)return ; -printk (KERN_INFO "... num counters: %d\n" , nr_counters_generic); +pr_info ("... num counters: %d\n" , nr_counters_generic);if (nr_counters_generic >X86_PMC_MAX_GENERIC ) { nr_counters_generic =X86_PMC_MAX_GENERIC ; WARN(1, KERN_ERR "hw perf counters %d > max(%d), clipping!",
@@ -820,18 +820,18 @@ void __init init_hw_perf_counters(void) perf_counter_mask = (1 << nr_counters_generic) -1 ; perf_max_counters = nr_counters_generic; -printk (KERN_INFO "... value mask: %016Lx\n" , counter_value_mask); +pr_info ("... value mask: %016Lx\n" , counter_value_mask);if (nr_counters_fixed >X86_PMC_MAX_FIXED ) { nr_counters_fixed =X86_PMC_MAX_FIXED ;WARN (1 ,KERN_ERR "hw perf counters fixed %d > max(%d), clipping!" , nr_counters_fixed,X86_PMC_MAX_FIXED ); } -printk (KERN_INFO "... fixed counters: %d\n" , nr_counters_fixed); +pr_info ("... fixed counters: %d\n" , nr_counters_fixed); perf_counter_mask |= ((1LL << nr_counters_fixed)-1 ) <<X86_PMC_IDX_FIXED ; -printk (KERN_INFO "... counter mask: %016Lx\n" , perf_counter_mask); +pr_info ("... counter mask: %016Lx\n" , perf_counter_mask); perf_counters_initialized = true;perf_counters_lapic_init (0 );
arch/x86/kernel/cpu/proc.c +2 -18
@@ -7,11 +7,10 @@/* * Get CPU information for use by the procfs. */ -#ifdef CONFIG_X86_32 static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c, unsigned int cpu) { -#ifdef CONFIG_X86_HT +#ifdef CONFIG_SMP if (c->x86_max_cores * smp_num_siblings > 1) { seq_printf(m, "physical id\t: %d\n", c->phys_proc_id); seq_printf(m, "siblings\t: %d\n",
@@ -24,6 +23,7 @@ static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,#endif } +#ifdef CONFIG_X86_32 static void show_cpuinfo_misc (struct seq_file *m,struct cpuinfo_x86 *c) {/*
@@ -50,22 +50,6 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c) c->wp_works_ok ? "yes" : "no"); }#else -static void show_cpuinfo_core (struct seq_file *m,struct cpuinfo_x86 *c, -unsigned int cpu) -{ -#ifdef CONFIG_SMP -if (c->x86_max_cores * smp_num_siblings >1 ) { -seq_printf (m,"physical id\t: %d\n" , c->phys_proc_id); -seq_printf (m,"siblings\t: %d\n" , -cpus_weight (per_cpu (cpu_core_map, cpu))); -seq_printf (m,"core id\t\t: %d\n" , c->cpu_core_id); -seq_printf (m,"cpu cores\t: %d\n" , c->booted_cores); -seq_printf (m,"apicid\t\t: %d\n" , c->apicid); -seq_printf (m,"initial apicid\t: %d\n" , c->initial_apicid); - } -#endif -} -static void show_cpuinfo_misc (struct seq_file *m,struct cpuinfo_x86 *c) { seq_printf(m,
Quoted 8 lines · Jaswinder Singh Rajput
Hello Ingo,
Please pull:
The following changes since commit
c6003015dacd7c6fe18c6009115801079d8fdd49:
Ingo Molnar (1):
Merge branch 'linus'
Quoted 9 lines
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip-cpu.gitmasterJaswinder Singh Rajput (3):
x86: decent declarations inperf_counter.c
x88: usingpr_infoinperf_counter.c
x86: remove double copy ofshow_cpuinfo_corefor 32 and 64 bit
Hello Ingo,
'x86: remove double copy of show_cpuinfo_core for 32 and 64 bit' already merged in -tip through peter, So here is new pull request:
The following changes since commit c6003015dacd7c6fe18c6009115801079d8fdd49:
Ingo Molnar (1):
Merge branch 'linus'
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip-cpu.git master
Jaswinder Singh Rajput (2):
x86: decent declarations in perf_counter.c
x86: using pr_info in perf_counter.c
arch/x86/kernel/cpu/perf_counter.c | 62 ++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 31 deletions(-)
Complete diff:
arch/x86/kernel/cpu/perf_counter.c +31 -31
@@ -42,12 +42,12 @@ struct cpu_hw_counters {* struct pmc_x86_ops - performance counter x86 ops */ struct pmc_x86_ops { -u64 (*save_disable_all) (void ); -void (*restore_all) (u64 ctrl); -unsigned eventsel; -unsigned perfctr; -int (*event_map) (int event); -int max_events; +u64 (*save_disable_all)(void ); +void (*restore_all)(u64 ctrl); +unsigned eventsel; +unsigned perfctr; +int (*event_map)(int event); +int max_events; };static struct pmc_x86_ops *pmc_ops;
@@ -454,18 +454,18 @@ void perf_counter_print_debug(void) cpuc = &per_cpu (cpu_hw_counters, cpu);if (boot_cpu_data.x86_vendor ==X86_VENDOR_INTEL ) { -rdmsrl (MSR_CORE_PERF_GLOBAL_CTRL , ctrl); -rdmsrl (MSR_CORE_PERF_GLOBAL_STATUS , status); -rdmsrl (MSR_CORE_PERF_GLOBAL_OVF_CTRL , overflow); -rdmsrl (MSR_ARCH_PERFMON_FIXED_CTR_CTRL , fixed); - -printk (KERN_INFO "\n" ); -printk (KERN_INFO "CPU#%d: ctrl: %016llx\n" , cpu, ctrl); -printk (KERN_INFO "CPU#%d: status: %016llx\n" , cpu, status); -printk (KERN_INFO "CPU#%d: overflow: %016llx\n" , cpu, overflow); -printk (KERN_INFO "CPU#%d: fixed: %016llx\n" , cpu, fixed); +rdmsrl (MSR_CORE_PERF_GLOBAL_CTRL , ctrl); +rdmsrl (MSR_CORE_PERF_GLOBAL_STATUS , status); +rdmsrl (MSR_CORE_PERF_GLOBAL_OVF_CTRL , overflow); +rdmsrl (MSR_ARCH_PERFMON_FIXED_CTR_CTRL , fixed); + +pr_info ("\n" ); +pr_info ("CPU#%d: ctrl: %016llx\n" , cpu, ctrl); +pr_info ("CPU#%d: status: %016llx\n" , cpu, status); +pr_info ("CPU#%d: overflow: %016llx\n" , cpu, overflow); +pr_info ("CPU#%d: fixed: %016llx\n" , cpu, fixed); } -printk (KERN_INFO "CPU#%d: used: %016llx\n" , cpu, *(u64 *)cpuc->used); +pr_info ("CPU#%d: used: %016llx\n" , cpu, *(u64 *)cpuc->used);for (idx =0 ; idx < nr_counters_generic; idx++) {rdmsrl (pmc_ops->eventsel + idx, pmc_ctrl);
@@ -473,17 +473,17 @@ void perf_counter_print_debug(void) prev_left =per_cpu (prev_left[idx], cpu); -printk (KERN_INFO "CPU#%d: gen-PMC%d ctrl: %016llx\n" , +pr_info ("CPU#%d: gen-PMC%d ctrl: %016llx\n" , cpu, idx, pmc_ctrl); -printk (KERN_INFO "CPU#%d: gen-PMC%d count: %016llx\n" , +pr_info ("CPU#%d: gen-PMC%d count: %016llx\n" , cpu, idx, pmc_count); -printk (KERN_INFO "CPU#%d: gen-PMC%d left: %016llx\n" , +pr_info ("CPU#%d: gen-PMC%d left: %016llx\n" , cpu, idx, prev_left); }for (idx =0 ; idx < nr_counters_fixed; idx++) {rdmsrl (MSR_ARCH_PERFMON_FIXED_CTR0 + idx, pmc_count); -printk (KERN_INFO "CPU#%d: fixed-PMC%d count: %016llx\n" , +pr_info ("CPU#%d: fixed-PMC%d count: %016llx\n" , cpu, idx, pmc_count); }local_irq_enable ();
@@ -561,7 +561,7 @@ perf_handle_group(struct perf_counter *sibling, u64 *status, u64 *overflown)/* * Maximum interrupt frequency of 100KHz per CPU */ -#define PERFMON_MAX_INTERRUPTS 100000/HZ +#define PERFMON_MAX_INTERRUPTS (100000/HZ)/* * This handler is triggered by the local APIC, so the APIC IRQ handling
@@ -773,10 +773,10 @@ static struct pmc_x86_ops *pmc_intel_init(void)if (eax.split.mask_length <=ARCH_PERFMON_BRANCH_MISSES_RETIRED )return NULL ; -printk (KERN_INFO "Intel Performance Monitoring support detected.\n" ); -printk (KERN_INFO "... version: %d\n" , eax.split.version_id); -printk (KERN_INFO "... bit width: %d\n" , eax.split.bit_width); -printk (KERN_INFO "... mask length: %d\n" , eax.split.mask_length); +pr_info ("Intel Performance Monitoring support detected.\n" ); +pr_info ("... version: %d\n" , eax.split.version_id); +pr_info ("... bit width: %d\n" , eax.split.bit_width); +pr_info ("... mask length: %d\n" , eax.split.mask_length); nr_counters_generic = eax.split.num_counters; nr_counters_fixed = edx.split.num_counters_fixed;
@@ -790,7 +790,7 @@ static struct pmc_x86_ops *pmc_amd_init(void) nr_counters_generic =4 ; nr_counters_fixed =0 ; -printk (KERN_INFO "AMD Performance Monitoring support detected.\n" ); +pr_info ("AMD Performance Monitoring support detected.\n" );return &pmc_amd_ops; }
@@ -811,7 +811,7 @@ void __init init_hw_perf_counters(void)if (!pmc_ops)return ; -printk (KERN_INFO "... num counters: %d\n" , nr_counters_generic); +pr_info ("... num counters: %d\n" , nr_counters_generic);if (nr_counters_generic >X86_PMC_MAX_GENERIC ) { nr_counters_generic =X86_PMC_MAX_GENERIC ; WARN(1, KERN_ERR "hw perf counters %d > max(%d), clipping!",
@@ -820,18 +820,18 @@ void __init init_hw_perf_counters(void) perf_counter_mask = (1 << nr_counters_generic) -1 ; perf_max_counters = nr_counters_generic; -printk (KERN_INFO "... value mask: %016Lx\n" , counter_value_mask); +pr_info ("... value mask: %016Lx\n" , counter_value_mask);if (nr_counters_fixed >X86_PMC_MAX_FIXED ) { nr_counters_fixed =X86_PMC_MAX_FIXED ;WARN (1 ,KERN_ERR "hw perf counters fixed %d > max(%d), clipping!" , nr_counters_fixed,X86_PMC_MAX_FIXED ); } -printk (KERN_INFO "... fixed counters: %d\n" , nr_counters_fixed); +pr_info ("... fixed counters: %d\n" , nr_counters_fixed); perf_counter_mask |= ((1LL << nr_counters_fixed)-1 ) <<X86_PMC_IDX_FIXED ; -printk (KERN_INFO "... counter mask: %016Lx\n" , perf_counter_mask); +pr_info ("... counter mask: %016Lx\n" , perf_counter_mask); perf_counters_initialized = true;perf_counters_lapic_init (0 );
Ingo Molnar
AppliedQuoted 29 lines · Jaswinder Singh Rajput
Quoted 8 lines · Jaswinder Singh Rajput
Hello Ingo,
Please pull:
The following changes since commit
c6003015dacd7c6fe18c6009115801079d8fdd49:
Ingo Molnar (1):
Merge branch 'linus'Quoted 9 lines
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip-cpu.gitmasterJaswinder Singh Rajput (3):
x86: decent declarations inperf_counter.c
x88: usingpr_infoinperf_counter.c
x86: remove double copy ofshow_cpuinfo_corefor 32 and 64 bitHello Ingo,
'x86: remove double copy of
show_cpuinfo_corefor 32 and 64 bit' already merged in -tip through peter, So here is new pull request:
The following changes since commitc6003015dacd7c6fe18c6009115801079d8fdd49:
Ingo Molnar (1):
Merge branch 'linus'are available in the git repository at:
Quoted 8 lines
git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6-tip-cpu.gitmasterJaswinder Singh Rajput (2):
x86: decent declarations inperf_counter.c
x86: usingpr_infoinperf_counter.carch/x86/kernel/cpu/perf_counter.c | 62 ++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 31 deletions(-)
i've applied the two patches to tip:perfcounters/core, thanks Jaswinder! Note, i did small edits in the changelogs.
Ingo