x86 updates for v2.6.28, phase #7, Oprofile
Linus,
Please pull the latest x86-v28-for-linus-phase7 git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-v28-for-linus-phase7
Oprofile updates. (Embedded in later topics due to apic unification impact and other ordering constraints.)
out-of-topic modifications in x86-v28-for-linus-phase7:
-------------------------------------------------------arch/Kconfig # 852402c: x86/oprofile: add CONFIG_OPROFILEdrivers/oprofile/buffer_sync.c # 852402c: x86/oprofile: add CONFIG_OPROFILE
# 345c257: x86/oprofile: add IBS support for # 5e11f98: OProfile: moving increment_tail() # 73185e0: drivers/oprofile: coding style fidrivers/oprofile/cpu_buffer.c # bd17b62: oprofile: fix printk in cpu_buffe
# 852402c: x86/oprofile: add CONFIG_OPROFILE
# 345c257: x86/oprofile: add IBS support fordrivers/oprofile/cpu_buffer.h # 345c257: x86/oprofile: add IBS support forinclude/linux/oprofile.h # 4c168ea: Revert "Oprofile Multiplexing Pat
# 1a960b4: Oprofile Multiplexing Patch # ee648bc: OProfile: add IBS code macros
Thanks,
Ingo
------------------>
Andrea Righi (1):
x86, oprofile: BUG: using smp_processor_id() in preemptible code
Barry Kasindorf (3):
oprofile: Add support for AMD Family 11h
x86/oprofile: add IBS support for AMD CPUs, IBS buffer handling routines x86/oprofile: add IBS support for AMD CPUs, model specific code
Jason Yeh (1):
Oprofile Multiplexing Patch
Robert Richter (24):
x86: add PCI IDs for AMD Barcelona PCI devices
x86: apic_*.c: add description to AMD's extended LVT functions x86/oprofile: introduce model specific init/exit functions x86/oprofile: Minor changes in op_model_athlon.c x86/oprofile: renaming athlon_*() into op_amd_*() drivers/oprofile: coding style fixes in buffer_sync.c
OProfile: moving increment_tail() in buffer_sync.c
OProfile: add IBS code macros
x86/oprofile: separating the IBS handler
OProfile: change IBS interrupt initialization
OProfile: Fix build error in op_model_athlon.c
OProfile: on_each_cpu(): kill unused retry parameter
OProfile: fix setup_ibs_files() function interface
OProfile: enable IBS for AMD CPUs
OProfile: fix IBS build error for UP
x86/oprofile: macro definition cleanup in op_model_athlon.c x86/oprofile: op_model_athlon.c: fix counter reset when reenabling IBS OP
x86: apic: export symbols for extended interrupt LVT functions
x86: apic: changing export symbols to *_GPL
x86/oprofile: add CONFIG_OPROFILE_IBS option
oprofile: fix printk in cpu_buffer.c
x86/oprofile: reanaming op_model_athlon.c to op_model_amd.c x86/oprofile: fix on_each_cpu build error
Revert "Oprofile Multiplexing Patch"
arch/Kconfig | 14 + arch/x86/kernel/apic_32.c | 4 + arch/x86/kernel/apic_64.c | 4 + arch/x86/oprofile/Makefile | 2 +- arch/x86/oprofile/nmi_int.c | 27 ++- arch/x86/oprofile/op_model_amd.c | 543 +++++++++++++++++++++++++++++++++++ arch/x86/oprofile/op_model_athlon.c | 190 ------------ arch/x86/oprofile/op_x86_model.h | 4 +- drivers/oprofile/buffer_sync.c | 209 +++++++++----- drivers/oprofile/cpu_buffer.c | 74 +++++- drivers/oprofile/cpu_buffer.h | 2 + include/linux/oprofile.h | 2 + 12 files changed, 809 insertions(+), 266 deletions(-) create mode 100644 arch/x86/oprofile/op_model_amd.c delete mode 100644 arch/x86/oprofile/op_model_athlon.c
arch/Kconfig +14 -0
@@ -13,6 +13,20 @@ config OPROFILE If unsure, say N. +config OPROFILE_IBS + bool "OProfile AMD IBS support (EXPERIMENTAL)" + default n + depends on OPROFILE && SMP && X86 + help + Instruction-Based Sampling (IBS) is a new profiling + technique that provides rich, precise program performance + information. IBS is introduced by AMD Family10h processors + (AMD Opteron Quad-Core processor “Barcelona”) to overcome + the limitations of conventional performance counter + sampling. + + If unsure, say N. + config HAVE_OPROFILE def_bool n
arch/x86/kernel/apic_32.c +4 -0
@@ -295,6 +295,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)* * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and * MCE interrupts are supported. Thus MCE offset must be set to 0. +* +* If mask=1, the LVT entry does not generate interrupts while mask=0 +* enables the vector. See also the BKDGs. */ #define APIC_EILVT_LVTOFF_MCE 0
@@ -319,6 +322,7 @@ u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)setup_APIC_eilvt (APIC_EILVT_LVTOFF_IBS , vector, msg_type, mask);return APIC_EILVT_LVTOFF_IBS ; } +EXPORT_SYMBOL_GPL (setup_APIC_eilvt_ibs);/* * Program the next event, relative to now
arch/x86/kernel/apic_64.c +4 -0
@@ -307,6 +307,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)* * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and * MCE interrupts are supported. Thus MCE offset must be set to 0. +* +* If mask=1, the LVT entry does not generate interrupts while mask=0 +* enables the vector. See also the BKDGs. */ #define APIC_EILVT_LVTOFF_MCE 0
@@ -331,6 +334,7 @@ u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)setup_APIC_eilvt (APIC_EILVT_LVTOFF_IBS , vector, msg_type, mask);return APIC_EILVT_LVTOFF_IBS ; } +EXPORT_SYMBOL_GPL (setup_APIC_eilvt_ibs);/* * Program the next event, relative to now
arch/x86/oprofile/Makefile +1 -1
@@ -7,6 +7,6 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ timer_int.o ) oprofile-y := $(DRIVER_OBJS) init.o backtrace.o -oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o \ +oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_amd.o \ op_model_ppro.o op_model_p4.o oprofile-$(CONFIG_X86_IO_APIC) += nmi_timer_int.o
arch/x86/oprofile/nmi_int.c +21 -6
@@ -1,10 +1,11 @@/** * @file nmi_int.c * -* @remark Copyright 2002 OProfile authors +* @remark Copyright 2002-2008 OProfile authors * @remark Read the file COPYING * * @author John Levon <[email protected]> +* @author Robert Richter <[email protected]> */ #include <linux/init.h>
@@ -439,6 +440,7 @@ int __init op_nmi_init(struct oprofile_operations *ops)__u8 vendor = boot_cpu_data.x86_vendor;__u8 family = boot_cpu_data.x86;char *cpu_type; +int ret =0 ;if (!cpu_has_apic)return -ENODEV ;
@@ -451,19 +453,23 @@ int __init op_nmi_init(struct oprofile_operations *ops)default :return -ENODEV ;case 6 : - model = &op_athlon_spec; + model = &op_amd_spec; cpu_type ="i386/athlon" ;break ;case 0xf : - model = &op_athlon_spec; + model = &op_amd_spec;/* Actually it could be i386/hammer too, but give user space an consistent name. */ cpu_type ="x86-64/hammer" ;break ;case 0x10 : - model = &op_athlon_spec; + model = &op_amd_spec; cpu_type ="x86-64/family10" ;break ; +case 0x11 : + model = &op_amd_spec; + cpu_type ="x86-64/family11h" ; +break ; }break ;
@@ -490,17 +496,24 @@ int __init op_nmi_init(struct oprofile_operations *ops)return -ENODEV ; } -init_sysfs ();#ifdef CONFIG_SMP register_cpu_notifier (&oprofile_cpu_nb);#endif - using_nmi =1 ; +/* default values, can be overwritten by model */ ops->create_files = nmi_create_files; ops->setup = nmi_setup; ops->shutdown = nmi_shutdown; ops->start = nmi_start; ops->stop = nmi_stop; ops->cpu_type = cpu_type; + +if (model->init) + ret = model->init (ops); +if (ret) +return ret; + +init_sysfs (); + using_nmi =1 ;printk (KERN_INFO "oprofile: using NMI interrupt.\n" );return 0 ; }
@@ -513,4 +526,6 @@ void op_nmi_exit(void)unregister_cpu_notifier (&oprofile_cpu_nb);#endif } +if (model->exit) + model->exit (); }
arch/x86/oprofile/op_model_amd.c new file +543 -0
543 lines not on this page · raw message
arch/x86/oprofile/op_model_athlon.c deleted +0 -190
190 lines not on this page · raw message
arch/x86/oprofile/op_x86_model.h +3 -1
@@ -32,6 +32,8 @@ struct pt_regs;* various x86 CPU models' perfctr support. */ struct op_x86_model_spec { +int (*init)(struct oprofile_operations *ops); +void (*exit)(void );unsigned int const num_counters;unsigned int const num_controls;void (*fill_in_addresses)(struct op_msrs *const msrs);
@@ -46,6 +48,6 @@ struct op_x86_model_spec {extern struct op_x86_model_spec const op_ppro_spec;extern struct op_x86_model_spec const op_p4_spec;extern struct op_x86_model_spec const op_p4_ht2_spec; -extern struct op_x86_model_spec const op_athlon_spec; +extern struct op_x86_model_spec const op_amd_spec;#endif /* OP_X86_MODEL_H */
drivers/oprofile/buffer_sync.c +143 -66
411 lines not on this page · raw message
drivers/oprofile/cpu_buffer.c +72 -2
98 lines not on this page · raw message
drivers/oprofile/cpu_buffer.h +2 -0
@@ -55,5 +55,7 @@ void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf);/* transient events for the CPU buffer -> event buffer */ #define CPU_IS_KERNEL 1#define CPU_TRACE_BEGIN 2 +#define IBS_FETCH_BEGIN 3 +#define IBS_OP_BEGIN 4#endif /* OPROFILE_CPU_BUFFER_H */
include/linux/oprofile.h +2 -0
@@ -36,6 +36,8 @@#define XEN_ENTER_SWITCH_CODE 10#define SPU_PROFILING_CODE 11#define SPU_CTX_SWITCH_CODE 12 +#define IBS_FETCH_CODE 13 +#define IBS_OP_CODE 14struct super_block ;struct dentry ;
Quoted 6 lines · Ingo Molnar
Linus,
Please pull the latest x86-v28-for-linus-phase7 git tree from:
Oprofile updates. (Embedded in later topics due to apic unification impact and other ordering constraints.)
please find updated pull request below. Relative to phase-N-1. No changes beyond the first pull request, other than what came in via phase-N-1.
Ingo
----------->
Linus,
Please pull the latest x86-v28-for-linus-phase7-B git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-v28-for-linus-phase7-B
out-of-topic modifications in x86-v28-for-linus-phase7-B:
---------------------------------------------------------arch/Kconfig # 852402c: x86/oprofile: add CONFIG_OPROFILEdrivers/oprofile/buffer_sync.c # 852402c: x86/oprofile: add CONFIG_OPROFILE
# 345c257: x86/oprofile: add IBS support for # 5e11f98: OProfile: moving increment_tail() # 73185e0: drivers/oprofile: coding style fidrivers/oprofile/cpu_buffer.c # bd17b62: oprofile: fix printk in cpu_buffe
# 852402c: x86/oprofile: add CONFIG_OPROFILE
# 345c257: x86/oprofile: add IBS support fordrivers/oprofile/cpu_buffer.h # 345c257: x86/oprofile: add IBS support forinclude/linux/oprofile.h # 4c168ea: Revert "Oprofile Multiplexing Pat
# 1a960b4: Oprofile Multiplexing Patch # ee648bc: OProfile: add IBS code macros
Thanks,
Ingo
------------------>
Andrea Righi (1):
x86, oprofile: BUG: using smp_processor_id() in preemptible code
Barry Kasindorf (3):
oprofile: Add support for AMD Family 11h
x86/oprofile: add IBS support for AMD CPUs, IBS buffer handling routines x86/oprofile: add IBS support for AMD CPUs, model specific code
Jason Yeh (1):
Oprofile Multiplexing Patch
Robert Richter (24):
x86: add PCI IDs for AMD Barcelona PCI devices
x86: apic_*.c: add description to AMD's extended LVT functions x86/oprofile: introduce model specific init/exit functions x86/oprofile: Minor changes in op_model_athlon.c x86/oprofile: renaming athlon_*() into op_amd_*() drivers/oprofile: coding style fixes in buffer_sync.c
OProfile: moving increment_tail() in buffer_sync.c
OProfile: add IBS code macros
x86/oprofile: separating the IBS handler
OProfile: change IBS interrupt initialization
OProfile: Fix build error in op_model_athlon.c
OProfile: on_each_cpu(): kill unused retry parameter
OProfile: fix setup_ibs_files() function interface
OProfile: enable IBS for AMD CPUs
OProfile: fix IBS build error for UP
x86/oprofile: macro definition cleanup in op_model_athlon.c x86/oprofile: op_model_athlon.c: fix counter reset when reenabling IBS OP
x86: apic: export symbols for extended interrupt LVT functions
x86: apic: changing export symbols to *_GPL
x86/oprofile: add CONFIG_OPROFILE_IBS option
oprofile: fix printk in cpu_buffer.c
x86/oprofile: reanaming op_model_athlon.c to op_model_amd.c x86/oprofile: fix on_each_cpu build error
Revert "Oprofile Multiplexing Patch"
arch/Kconfig | 14 + arch/x86/kernel/apic_32.c | 4 + arch/x86/kernel/apic_64.c | 4 + arch/x86/oprofile/Makefile | 2 +- arch/x86/oprofile/nmi_int.c | 27 ++- arch/x86/oprofile/op_model_amd.c | 543 +++++++++++++++++++++++++++++++++++ arch/x86/oprofile/op_model_athlon.c | 190 ------------ arch/x86/oprofile/op_x86_model.h | 4 +- drivers/oprofile/buffer_sync.c | 209 +++++++++----- drivers/oprofile/cpu_buffer.c | 74 +++++- drivers/oprofile/cpu_buffer.h | 2 + include/linux/oprofile.h | 2 + 12 files changed, 809 insertions(+), 266 deletions(-) create mode 100644 arch/x86/oprofile/op_model_amd.c delete mode 100644 arch/x86/oprofile/op_model_athlon.c
arch/Kconfig +14 -0
@@ -13,6 +13,20 @@ config OPROFILE If unsure, say N. +config OPROFILE_IBS + bool "OProfile AMD IBS support (EXPERIMENTAL)" + default n + depends on OPROFILE && SMP && X86 + help + Instruction-Based Sampling (IBS) is a new profiling + technique that provides rich, precise program performance + information. IBS is introduced by AMD Family10h processors + (AMD Opteron Quad-Core processor “Barcelona”) to overcome + the limitations of conventional performance counter + sampling. + + If unsure, say N. + config HAVE_OPROFILE def_bool n
arch/x86/kernel/apic_32.c +4 -0
@@ -295,6 +295,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)* * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and * MCE interrupts are supported. Thus MCE offset must be set to 0. +* +* If mask=1, the LVT entry does not generate interrupts while mask=0 +* enables the vector. See also the BKDGs. */ #define APIC_EILVT_LVTOFF_MCE 0
@@ -319,6 +322,7 @@ u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)setup_APIC_eilvt (APIC_EILVT_LVTOFF_IBS , vector, msg_type, mask);return APIC_EILVT_LVTOFF_IBS ; } +EXPORT_SYMBOL_GPL (setup_APIC_eilvt_ibs);/* * Program the next event, relative to now
arch/x86/kernel/apic_64.c +4 -0
@@ -307,6 +307,9 @@ static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)* * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and * MCE interrupts are supported. Thus MCE offset must be set to 0. +* +* If mask=1, the LVT entry does not generate interrupts while mask=0 +* enables the vector. See also the BKDGs. */ #define APIC_EILVT_LVTOFF_MCE 0
@@ -331,6 +334,7 @@ u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)setup_APIC_eilvt (APIC_EILVT_LVTOFF_IBS , vector, msg_type, mask);return APIC_EILVT_LVTOFF_IBS ; } +EXPORT_SYMBOL_GPL (setup_APIC_eilvt_ibs);/* * Program the next event, relative to now
arch/x86/oprofile/Makefile +1 -1
@@ -7,6 +7,6 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ timer_int.o ) oprofile-y := $(DRIVER_OBJS) init.o backtrace.o -oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o \ +oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_amd.o \ op_model_ppro.o op_model_p4.o oprofile-$(CONFIG_X86_IO_APIC) += nmi_timer_int.o
arch/x86/oprofile/nmi_int.c +21 -6
@@ -1,10 +1,11 @@/** * @file nmi_int.c * -* @remark Copyright 2002 OProfile authors +* @remark Copyright 2002-2008 OProfile authors * @remark Read the file COPYING * * @author John Levon <[email protected]> +* @author Robert Richter <[email protected]> */ #include <linux/init.h>
@@ -439,6 +440,7 @@ int __init op_nmi_init(struct oprofile_operations *ops)__u8 vendor = boot_cpu_data.x86_vendor;__u8 family = boot_cpu_data.x86;char *cpu_type; +int ret =0 ;if (!cpu_has_apic)return -ENODEV ;
@@ -451,19 +453,23 @@ int __init op_nmi_init(struct oprofile_operations *ops)default :return -ENODEV ;case 6 : - model = &op_athlon_spec; + model = &op_amd_spec; cpu_type ="i386/athlon" ;break ;case 0xf : - model = &op_athlon_spec; + model = &op_amd_spec;/* Actually it could be i386/hammer too, but give user space an consistent name. */ cpu_type ="x86-64/hammer" ;break ;case 0x10 : - model = &op_athlon_spec; + model = &op_amd_spec; cpu_type ="x86-64/family10" ;break ; +case 0x11 : + model = &op_amd_spec; + cpu_type ="x86-64/family11h" ; +break ; }break ;
@@ -490,17 +496,24 @@ int __init op_nmi_init(struct oprofile_operations *ops)return -ENODEV ; } -init_sysfs ();#ifdef CONFIG_SMP register_cpu_notifier (&oprofile_cpu_nb);#endif - using_nmi =1 ; +/* default values, can be overwritten by model */ ops->create_files = nmi_create_files; ops->setup = nmi_setup; ops->shutdown = nmi_shutdown; ops->start = nmi_start; ops->stop = nmi_stop; ops->cpu_type = cpu_type; + +if (model->init) + ret = model->init (ops); +if (ret) +return ret; + +init_sysfs (); + using_nmi =1 ;printk (KERN_INFO "oprofile: using NMI interrupt.\n" );return 0 ; }
@@ -513,4 +526,6 @@ void op_nmi_exit(void)unregister_cpu_notifier (&oprofile_cpu_nb);#endif } +if (model->exit) + model->exit (); }
arch/x86/oprofile/op_model_amd.c new file +543 -0
543 lines not on this page · raw message
arch/x86/oprofile/op_model_athlon.c deleted +0 -190
190 lines not on this page · raw message
arch/x86/oprofile/op_x86_model.h +3 -1
@@ -32,6 +32,8 @@ struct pt_regs;* various x86 CPU models' perfctr support. */ struct op_x86_model_spec { +int (*init)(struct oprofile_operations *ops); +void (*exit)(void );unsigned int const num_counters;unsigned int const num_controls;void (*fill_in_addresses)(struct op_msrs *const msrs);
@@ -46,6 +48,6 @@ struct op_x86_model_spec {extern struct op_x86_model_spec const op_ppro_spec;extern struct op_x86_model_spec const op_p4_spec;extern struct op_x86_model_spec const op_p4_ht2_spec; -extern struct op_x86_model_spec const op_athlon_spec; +extern struct op_x86_model_spec const op_amd_spec;#endif /* OP_X86_MODEL_H */
drivers/oprofile/buffer_sync.c +143 -66
411 lines not on this page · raw message
drivers/oprofile/cpu_buffer.c +72 -2
98 lines not on this page · raw message
drivers/oprofile/cpu_buffer.h +2 -0
@@ -55,5 +55,7 @@ void cpu_buffer_reset(struct oprofile_cpu_buffer * cpu_buf);/* transient events for the CPU buffer -> event buffer */ #define CPU_IS_KERNEL 1#define CPU_TRACE_BEGIN 2 +#define IBS_FETCH_BEGIN 3 +#define IBS_OP_BEGIN 4#endif /* OPROFILE_CPU_BUFFER_H */
include/linux/oprofile.h +2 -0
@@ -36,6 +36,8 @@#define XEN_ENTER_SWITCH_CODE 10#define SPU_PROFILING_CODE 11#define SPU_CTX_SWITCH_CODE 12 +#define IBS_FETCH_CODE 13 +#define IBS_OP_CODE 14struct super_block ;struct dentry ;