diff -rupN linux-2.6.16.21/CREDITS linux-2.6.16.21.perfctr27/CREDITS --- linux-2.6.16.21/CREDITS 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/CREDITS 2006-08-11 03:48:19.000000000 +0200 @@ -2634,6 +2634,7 @@ N: Mikael Pettersson E: mikpe@csd.uu.se W: http://www.csd.uu.se/~mikpe/ D: Miscellaneous fixes +D: Performance-monitoring counters driver N: Reed H. Petty E: rhp@draper.net diff -rupN linux-2.6.16.21/MAINTAINERS linux-2.6.16.21.perfctr27/MAINTAINERS --- linux-2.6.16.21/MAINTAINERS 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/MAINTAINERS 2006-08-11 03:48:19.000000000 +0200 @@ -2071,6 +2071,12 @@ M: tsbogend@alpha.franken.de L: netdev@vger.kernel.org S: Maintained +PERFORMANCE-MONITORING COUNTERS DRIVER +P: Mikael Pettersson +M: mikpe@it.uu.se +W: http://user.it.uu.se/~mikpe/linux/perfctr/ +S: Maintained + PHRAM MTD DRIVER P: Jörn Engel M: joern@wh.fh-wedel.de diff -rupN linux-2.6.16.21/arch/i386/Kconfig linux-2.6.16.21.perfctr27/arch/i386/Kconfig --- linux-2.6.16.21/arch/i386/Kconfig 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/i386/Kconfig 2006-08-11 03:48:19.000000000 +0200 @@ -685,6 +685,8 @@ config SECCOMP If unsure, say Y. Only embedded should say N here. +source "drivers/perfctr/Kconfig" + source kernel/Kconfig.hz config KEXEC diff -rupN linux-2.6.16.21/arch/i386/kernel/entry.S linux-2.6.16.21.perfctr27/arch/i386/kernel/entry.S --- linux-2.6.16.21/arch/i386/kernel/entry.S 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/i386/kernel/entry.S 2006-08-11 03:48:19.000000000 +0200 @@ -432,6 +432,16 @@ ENTRY(name) \ /* The include is where all of the SMP etc. interrupts come from */ #include "entry_arch.h" +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PERFCTR) +ENTRY(perfctr_interrupt) + pushl $LOCAL_PERFCTR_VECTOR-256 + SAVE_ALL + pushl %esp + call smp_perfctr_interrupt + addl $4, %esp + jmp ret_from_intr +#endif + ENTRY(divide_error) pushl $0 # no error code pushl $do_divide_error diff -rupN linux-2.6.16.21/arch/i386/kernel/i8259.c linux-2.6.16.21.perfctr27/arch/i386/kernel/i8259.c --- linux-2.6.16.21/arch/i386/kernel/i8259.c 2005-10-28 11:24:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/i386/kernel/i8259.c 2006-08-11 03:48:19.000000000 +0200 @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -421,6 +422,8 @@ void __init init_IRQ(void) */ intr_init_hook(); + perfctr_vector_init(); + /* * Set the clock to HZ Hz, we already have a valid * vector now: diff -rupN linux-2.6.16.21/arch/i386/kernel/process.c linux-2.6.16.21.perfctr27/arch/i386/kernel/process.c --- linux-2.6.16.21/arch/i386/kernel/process.c 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/i386/kernel/process.c 2006-08-11 03:48:19.000000000 +0200 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -388,6 +389,7 @@ void exit_thread(void) tss->io_bitmap_base = INVALID_IO_BITMAP_OFFSET; put_cpu(); } + perfctr_exit_thread(&tsk->thread); } void flush_thread(void) @@ -439,6 +441,8 @@ int copy_thread(int nr, unsigned long cl savesegment(fs,p->thread.fs); savesegment(gs,p->thread.gs); + perfctr_copy_task(p, regs); + tsk = current; if (unlikely(NULL != tsk->thread.io_bitmap_ptr)) { p->thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL); @@ -697,6 +701,8 @@ struct task_struct fastcall * __switch_t disable_tsc(prev_p, next_p); + perfctr_resume_thread(next); + return prev_p; } diff -rupN linux-2.6.16.21/arch/i386/kernel/syscall_table.S linux-2.6.16.21.perfctr27/arch/i386/kernel/syscall_table.S --- linux-2.6.16.21/arch/i386/kernel/syscall_table.S 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/i386/kernel/syscall_table.S 2006-08-11 03:48:23.000000000 +0200 @@ -310,3 +310,14 @@ ENTRY(sys_call_table) .long sys_pselect6 .long sys_ppoll .long sys_unshare /* 310 */ + .long sys_ni_syscall + .long sys_ni_syscall + .long sys_ni_syscall + .long sys_ni_syscall + .long sys_ni_syscall /* 315 */ + .long sys_ni_syscall + .long sys_ni_syscall + .long sys_vperfctr_open + .long sys_vperfctr_control + .long sys_vperfctr_write /* 320 */ + .long sys_vperfctr_read diff -rupN linux-2.6.16.21/arch/powerpc/Kconfig linux-2.6.16.21.perfctr27/arch/powerpc/Kconfig --- linux-2.6.16.21/arch/powerpc/Kconfig 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/powerpc/Kconfig 2006-08-11 03:48:19.000000000 +0200 @@ -268,6 +268,9 @@ config NOT_COHERENT_CACHE bool depends on 4xx || 8xx || E200 default y + +source "drivers/perfctr/Kconfig" + endmenu source "init/Kconfig" diff -rupN linux-2.6.16.21/arch/powerpc/kernel/process.c linux-2.6.16.21.perfctr27/arch/powerpc/kernel/process.c --- linux-2.6.16.21/arch/powerpc/kernel/process.c 2006-07-03 14:17:57.000000000 -0500 +++ linux-2.6.16.21.perfctr27/arch/powerpc/kernel/process.c 2006-08-22 11:32:37.000000000 -0500 @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -330,11 +331,13 @@ struct task_struct *__switch_to(struct t #endif local_irq_save(flags); + perfctr_suspend_thread(&prev->thread); account_system_vtime(current); account_process_vtime(current); calculate_steal_time(); last = _switch(old_thread, new_thread); + perfctr_resume_thread(¤t->thread); local_irq_restore(flags); @@ -464,6 +467,7 @@ void exit_thread(void) { kprobe_flush_task(current); discard_lazy_cpu_state(); + perfctr_exit_thread(¤t->thread); } void flush_thread(void) @@ -576,6 +580,8 @@ int copy_thread(int nr, unsigned long cl p->thread.last_syscall = -1; #endif + perfctr_copy_task(p, regs); + return 0; } diff -rupN linux-2.6.16.21/arch/powerpc/kernel/systbl.S linux-2.6.16.21.perfctr27/arch/powerpc/kernel/systbl.S --- linux-2.6.16.21/arch/powerpc/kernel/systbl.S 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/powerpc/kernel/systbl.S 2006-08-11 03:48:23.000000000 +0200 @@ -322,3 +322,25 @@ SYSCALL(spu_create) COMPAT_SYS(pselect6) COMPAT_SYS(ppoll) SYSCALL(unshare) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(ni_syscall) +SYSCALL(vperfctr_open) +SYSCALL(vperfctr_control) +SYSCALL(vperfctr_write) +SYSCALL(vperfctr_read) diff -rupN linux-2.6.16.21/arch/x86_64/Kconfig linux-2.6.16.21.perfctr27/arch/x86_64/Kconfig --- linux-2.6.16.21/arch/x86_64/Kconfig 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/x86_64/Kconfig 2006-08-11 03:48:19.000000000 +0200 @@ -462,6 +462,8 @@ config SECCOMP If unsure, say Y. Only embedded should say N here. +source "drivers/perfctr/Kconfig" + source kernel/Kconfig.hz endmenu diff -rupN linux-2.6.16.21/arch/x86_64/ia32/ia32entry.S linux-2.6.16.21.perfctr27/arch/x86_64/ia32/ia32entry.S --- linux-2.6.16.21/arch/x86_64/ia32/ia32entry.S 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/x86_64/ia32/ia32entry.S 2006-08-11 03:48:23.000000000 +0200 @@ -688,6 +688,17 @@ ia32_sys_call_table: .quad sys_ni_syscall /* pselect6 for now */ .quad sys_ni_syscall /* ppoll for now */ .quad sys_unshare /* 310 */ + .quad sys_ni_syscall + .quad sys_ni_syscall + .quad sys_ni_syscall + .quad sys_ni_syscall + .quad sys_ni_syscall /* 315 */ + .quad sys_ni_syscall + .quad sys_ni_syscall + .quad sys_vperfctr_open + .quad sys_vperfctr_control + .quad sys_vperfctr_write /* 320 */ + .quad sys_vperfctr_read ia32_syscall_end: .rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8 .quad ni_syscall diff -rupN linux-2.6.16.21/arch/x86_64/kernel/entry.S linux-2.6.16.21.perfctr27/arch/x86_64/kernel/entry.S --- linux-2.6.16.21/arch/x86_64/kernel/entry.S 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/x86_64/kernel/entry.S 2006-08-11 03:48:19.000000000 +0200 @@ -655,6 +655,11 @@ ENTRY(spurious_interrupt) apicinterrupt SPURIOUS_APIC_VECTOR,smp_spurious_interrupt #endif +#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PERFCTR) +ENTRY(perfctr_interrupt) + apicinterrupt LOCAL_PERFCTR_VECTOR,smp_perfctr_interrupt +#endif + /* * Exception entry points. */ diff -rupN linux-2.6.16.21/arch/x86_64/kernel/i8259.c linux-2.6.16.21.perfctr27/arch/x86_64/kernel/i8259.c --- linux-2.6.16.21/arch/x86_64/kernel/i8259.c 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/x86_64/kernel/i8259.c 2006-08-11 03:48:19.000000000 +0200 @@ -23,6 +23,7 @@ #include #include #include +#include /* * Common place to define all x86 IRQ vectors @@ -591,6 +592,8 @@ void __init init_IRQ(void) set_intr_gate(ERROR_APIC_VECTOR, error_interrupt); #endif + perfctr_vector_init(); + /* * Set the clock to HZ Hz, we already have a valid * vector now: diff -rupN linux-2.6.16.21/arch/x86_64/kernel/process.c linux-2.6.16.21.perfctr27/arch/x86_64/kernel/process.c --- linux-2.6.16.21/arch/x86_64/kernel/process.c 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/arch/x86_64/kernel/process.c 2006-08-11 03:48:19.000000000 +0200 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -372,6 +373,7 @@ void exit_thread(void) t->io_bitmap_max = 0; put_cpu(); } + perfctr_exit_thread(&me->thread); } void flush_thread(void) @@ -473,6 +475,8 @@ int copy_thread(int nr, unsigned long cl asm("mov %%es,%0" : "=m" (p->thread.es)); asm("mov %%ds,%0" : "=m" (p->thread.ds)); + perfctr_copy_task(p, regs); + if (unlikely(me->thread.io_bitmap_ptr != NULL)) { p->thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL); if (!p->thread.io_bitmap_ptr) { @@ -627,6 +631,8 @@ __switch_to(struct task_struct *prev_p, } } + perfctr_resume_thread(next); + return prev_p; } diff -rupN linux-2.6.16.21/drivers/Makefile linux-2.6.16.21.perfctr27/drivers/Makefile --- linux-2.6.16.21/drivers/Makefile 2006-08-10 21:57:06.000000000 +0200 +++ linux-2.6.16.21.perfctr27/drivers/Makefile 2006-08-11 03:48:19.000000000 +0200 @@ -70,6 +70,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_INFINIBAND) += infiniband/ obj-$(CONFIG_SGI_SN) += sn/ +obj-$(CONFIG_PERFCTR) += perfctr/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ diff -rupN linux-2.6.16.21/include/asm-i386/mach-default/irq_vectors.h linux-2.6.16.21.perfctr27/include/asm-i386/mach-default/irq_vectors.h --- linux-2.6.16.21/include/asm-i386/mach-default/irq_vectors.h 2004-05-10 11:14:37.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-i386/mach-default/irq_vectors.h 2006-08-11 03:48:19.000000000 +0200 @@ -56,14 +56,15 @@ * sources per level' errata. */ #define LOCAL_TIMER_VECTOR 0xef +#define LOCAL_PERFCTR_VECTOR 0xee /* - * First APIC vector available to drivers: (vectors 0x30-0xee) + * First APIC vector available to drivers: (vectors 0x30-0xed) * we start at 0x31 to spread out vectors evenly between priority * levels. (0x80 is the syscall vector) */ #define FIRST_DEVICE_VECTOR 0x31 -#define FIRST_SYSTEM_VECTOR 0xef +#define FIRST_SYSTEM_VECTOR 0xee #define TIMER_IRQ 0 diff -rupN linux-2.6.16.21/include/asm-i386/mach-visws/irq_vectors.h linux-2.6.16.21.perfctr27/include/asm-i386/mach-visws/irq_vectors.h --- linux-2.6.16.21/include/asm-i386/mach-visws/irq_vectors.h 2004-01-09 13:19:11.000000000 +0100 +++ linux-2.6.16.21.perfctr27/include/asm-i386/mach-visws/irq_vectors.h 2006-08-11 03:48:19.000000000 +0200 @@ -35,14 +35,15 @@ * sources per level' errata. */ #define LOCAL_TIMER_VECTOR 0xef +#define LOCAL_PERFCTR_VECTOR 0xee /* - * First APIC vector available to drivers: (vectors 0x30-0xee) + * First APIC vector available to drivers: (vectors 0x30-0xed) * we start at 0x31 to spread out vectors evenly between priority * levels. (0x80 is the syscall vector) */ #define FIRST_DEVICE_VECTOR 0x31 -#define FIRST_SYSTEM_VECTOR 0xef +#define FIRST_SYSTEM_VECTOR 0xee #define TIMER_IRQ 0 diff -rupN linux-2.6.16.21/include/asm-i386/processor.h linux-2.6.16.21.perfctr27/include/asm-i386/processor.h --- linux-2.6.16.21/include/asm-i386/processor.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-i386/processor.h 2006-08-11 03:48:19.000000000 +0200 @@ -464,6 +464,8 @@ struct thread_struct { unsigned long iopl; /* max allowed port in the bitmap, in bytes: */ unsigned long io_bitmap_max; +/* performance counters */ + struct vperfctr *perfctr; }; #define INIT_THREAD { \ diff -rupN linux-2.6.16.21/include/asm-i386/system.h linux-2.6.16.21.perfctr27/include/asm-i386/system.h --- linux-2.6.16.21/include/asm-i386/system.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-i386/system.h 2006-08-11 03:48:19.000000000 +0200 @@ -14,6 +14,7 @@ extern struct task_struct * FASTCALL(__s #define switch_to(prev,next,last) do { \ unsigned long esi,edi; \ + perfctr_suspend_thread(&(prev)->thread); \ asm volatile("pushl %%ebp\n\t" \ "movl %%esp,%0\n\t" /* save ESP */ \ "movl %5,%%esp\n\t" /* restore ESP */ \ diff -rupN linux-2.6.16.21/include/asm-i386/unistd.h linux-2.6.16.21.perfctr27/include/asm-i386/unistd.h --- linux-2.6.16.21/include/asm-i386/unistd.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-i386/unistd.h 2006-08-11 03:48:23.000000000 +0200 @@ -316,8 +316,12 @@ #define __NR_pselect6 308 #define __NR_ppoll 309 #define __NR_unshare 310 +#define __NR_vperfctr_open 311 +#define __NR_vperfctr_control (__NR_vperfctr_open+1) +#define __NR_vperfctr_write (__NR_vperfctr_open+2) +#define __NR_vperfctr_read (__NR_vperfctr_open+3) -#define NR_syscalls 311 +#define NR_syscalls 315 /* * user-visible error numbers are in the range -1 - -128: see diff -rupN linux-2.6.16.21/include/asm-powerpc/processor.h linux-2.6.16.21.perfctr27/include/asm-powerpc/processor.h --- linux-2.6.16.21/include/asm-powerpc/processor.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-powerpc/processor.h 2006-08-11 03:48:19.000000000 +0200 @@ -193,6 +193,9 @@ struct thread_struct { unsigned long spefscr; /* SPE & eFP status */ int used_spe; /* set if process has used spe */ #endif /* CONFIG_SPE */ +#ifdef CONFIG_PERFCTR_VIRTUAL + struct vperfctr *perfctr; /* performance counters */ +#endif }; #define ARCH_MIN_TASKALIGN 16 diff -rupN linux-2.6.16.21/include/asm-powerpc/reg.h linux-2.6.16.21.perfctr27/include/asm-powerpc/reg.h --- linux-2.6.16.21/include/asm-powerpc/reg.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-powerpc/reg.h 2006-08-11 03:48:19.000000000 +0200 @@ -365,10 +365,8 @@ #define SPRN_PURR 0x135 /* Processor Utilization of Resources Reg */ #define SPRN_PVR 0x11F /* Processor Version Register */ #define SPRN_RPA 0x3D6 /* Required Physical Address Register */ -#define SPRN_SDA 0x3BF /* Sampled Data Address Register */ #define SPRN_SDR1 0x019 /* MMU Hash Base Register */ #define SPRN_ASR 0x118 /* Address Space Register */ -#define SPRN_SIA 0x3BB /* Sampled Instruction Address Register */ #define SPRN_SPRG0 0x110 /* Special Purpose Register General 0 */ #define SPRN_SPRG1 0x111 /* Special Purpose Register General 1 */ #define SPRN_SPRG2 0x112 /* Special Purpose Register General 2 */ @@ -403,13 +401,6 @@ #define SPRN_THRM3 0x3FE /* Thermal Management Register 3 */ #define THRM3_E (1<<0) #define SPRN_TLBMISS 0x3D4 /* 980 7450 TLB Miss Register */ -#define SPRN_UMMCR0 0x3A8 /* User Monitor Mode Control Register 0 */ -#define SPRN_UMMCR1 0x3AC /* User Monitor Mode Control Register 0 */ -#define SPRN_UPMC1 0x3A9 /* User Performance Counter Register 1 */ -#define SPRN_UPMC2 0x3AA /* User Performance Counter Register 2 */ -#define SPRN_UPMC3 0x3AD /* User Performance Counter Register 3 */ -#define SPRN_UPMC4 0x3AE /* User Performance Counter Register 4 */ -#define SPRN_USIA 0x3AB /* User Sampled Instruction Address Register */ #define SPRN_VRSAVE 0x100 /* Vector Register Save Register */ #define SPRN_XER 0x001 /* Fixed Point Exception Register */ @@ -455,33 +446,7 @@ #define SPRN_SDAR 781 #else /* 32-bit */ -#define SPRN_MMCR0 952 /* Monitor Mode Control Register 0 */ -#define MMCR0_FC 0x80000000UL /* freeze counters */ -#define MMCR0_FCS 0x40000000UL /* freeze in supervisor state */ -#define MMCR0_FCP 0x20000000UL /* freeze in problem state */ -#define MMCR0_FCM1 0x10000000UL /* freeze counters while MSR mark = 1 */ -#define MMCR0_FCM0 0x08000000UL /* freeze counters while MSR mark = 0 */ -#define MMCR0_PMXE 0x04000000UL /* performance monitor exception enable */ -#define MMCR0_FCECE 0x02000000UL /* freeze ctrs on enabled cond or event */ -#define MMCR0_TBEE 0x00400000UL /* time base exception enable */ -#define MMCR0_PMC1CE 0x00008000UL /* PMC1 count enable*/ #define MMCR0_PMCnCE 0x00004000UL /* count enable for all but PMC 1*/ -#define MMCR0_TRIGGER 0x00002000UL /* TRIGGER enable */ -#define MMCR0_PMC1SEL 0x00001fc0UL /* PMC 1 Event */ -#define MMCR0_PMC2SEL 0x0000003fUL /* PMC 2 Event */ - -#define SPRN_MMCR1 956 -#define MMCR1_PMC3SEL 0xf8000000UL /* PMC 3 Event */ -#define MMCR1_PMC4SEL 0x07c00000UL /* PMC 4 Event */ -#define MMCR1_PMC5SEL 0x003e0000UL /* PMC 5 Event */ -#define MMCR1_PMC6SEL 0x0001f800UL /* PMC 6 Event */ -#define SPRN_MMCR2 944 -#define SPRN_PMC1 953 /* Performance Counter Register 1 */ -#define SPRN_PMC2 954 /* Performance Counter Register 2 */ -#define SPRN_PMC3 957 /* Performance Counter Register 3 */ -#define SPRN_PMC4 958 /* Performance Counter Register 4 */ -#define SPRN_PMC5 945 /* Performance Counter Register 5 */ -#define SPRN_PMC6 946 /* Performance Counter Register 6 */ #define SPRN_SIAR 955 /* Sampled Instruction Address Register */ @@ -493,6 +458,77 @@ #define MMCR0_PMC2_CYCLES 0x1 #define MMCR0_PMC2_ITLB 0x7 #define MMCR0_PMC2_LOADMISSTIME 0x5 + +/* Performance-monitoring control and counter registers */ +#define SPRN_MMCR0 0x3B8 /* Monitor Mode Control Register 0 (604 and up) */ +#define SPRN_MMCR1 0x3BC /* Monitor Mode Control Register 1 (604e and up) */ +#define SPRN_MMCR2 0x3B0 /* Monitor Mode Control Register 2 (7400 and up) */ +#define SPRN_PMC1 0x3B9 /* Performance Counter Register 1 (604 and up) */ +#define SPRN_PMC2 0x3BA /* Performance Counter Register 2 (604 and up) */ +#define SPRN_PMC3 0x3BD /* Performance Counter Register 3 (604e and up) */ +#define SPRN_PMC4 0x3BE /* Performance Counter Register 4 (604e and up) */ +#define SPRN_PMC5 0x3B1 /* Performance Counter Register 5 (7450 and up) */ +#define SPRN_PMC6 0x3B2 /* Performance Counter Register 6 (7450 and up) */ +#define SPRN_SIA 0x3BB /* Sampled Instruction Address Register (604 and up) */ +#define SPRN_SDA 0x3BF /* Sampled Data Address Register (604/604e only) */ +#define SPRN_BAMR 0x3B7 /* Breakpoint Address Mask Register (7400 and up) */ + +#define SPRN_UMMCR0 0x3A8 /* User Monitor Mode Control Register 0 (750 and up) */ +#define SPRN_UMMCR1 0x3AC /* User Monitor Mode Control Register 0 (750 and up) */ +#define SPRN_UMMCR2 0x3A0 /* User Monitor Mode Control Register 0 (7400 and up) */ +#define SPRN_UPMC1 0x3A9 /* User Performance Counter Register 1 (750 and up) */ +#define SPRN_UPMC2 0x3AA /* User Performance Counter Register 2 (750 and up) */ +#define SPRN_UPMC3 0x3AD /* User Performance Counter Register 3 (750 and up) */ +#define SPRN_UPMC4 0x3AE /* User Performance Counter Register 4 (750 and up) */ +#define SPRN_UPMC5 0x3A1 /* User Performance Counter Register 5 (7450 and up) */ +#define SPRN_UPMC6 0x3A2 /* User Performance Counter Register 5 (7450 and up) */ +#define SPRN_USIA 0x3AB /* User Sampled Instruction Address Register (750 and up) */ +#define SPRN_UBAMR 0x3A7 /* User Breakpoint Address Mask Register (7400 and up) */ + +/* MMCR0 layout (74xx terminology) */ +#define MMCR0_FC 0x80000000 /* Freeze counters unconditionally. */ +#define MMCR0_FCS 0x40000000 /* Freeze counters while MSR[PR]=0 (supervisor mode). */ +#define MMCR0_FCP 0x20000000 /* Freeze counters while MSR[PR]=1 (user mode). */ +#define MMCR0_FCM1 0x10000000 /* Freeze counters while MSR[PM]=1. */ +#define MMCR0_FCM0 0x08000000 /* Freeze counters while MSR[PM]=0. */ +#define MMCR0_PMXE 0x04000000 /* Enable performance monitor exceptions. + * Cleared by hardware when a PM exception occurs. + * 604: PMXE is not cleared by hardware. + */ +#define MMCR0_FCECE 0x02000000 /* Freeze counters on enabled condition or event. + * FCECE is treated as 0 if TRIGGER is 1. + * 74xx: FC is set when the event occurs. + * 604/750: ineffective when PMXE=0. + */ +#define MMCR0_TBSEL 0x01800000 /* Time base lower (TBL) bit selector. + * 00: bit 31, 01: bit 23, 10: bit 19, 11: bit 15. + */ +#define MMCR0_TBEE 0x00400000 /* Enable event on TBL bit transition from 0 to 1. */ +#define MMCR0_THRESHOLD 0x003F0000 /* Threshold value for certain events. */ +#define MMCR0_PMC1CE 0x00008000 /* Enable event on PMC1 overflow. */ +#define MMCR0_PMCjCE 0x00004000 /* Enable event on PMC2-PMC6 overflow. + * 604/750: Overrides FCECE (DISCOUNT). + */ +#define MMCR0_TRIGGER 0x00002000 /* Disable PMC2-PMC6 until PMC1 overflow or other event. + * 74xx: cleared by hardware when the event occurs. + */ +#define MMCR0_PMC1SEL 0x00001FC0 /* PMC1 event selector, 7 bits. */ +#define MMCR0_PMC2SEL 0x0000003F /* PMC2 event selector, 6 bits. */ + +/* MMCR1 layout (604e-7457) */ +#define MMCR1_PMC3SEL 0xF8000000 /* PMC3 event selector, 5 bits. */ +#define MMCR1_PMC4SEL 0x07C00000 /* PMC4 event selector, 5 bits. */ +#define MMCR1_PMC5SEL 0x003E0000 /* PMC5 event selector, 5 bits. (745x only) */ +#define MMCR1_PMC6SEL 0x0001F800 /* PMC6 event selector, 6 bits. (745x only) */ +#define MMCR1__RESERVED 0x000007FF /* should be zero */ + +/* MMCR2 layout (7400-7457) */ +#define MMCR2_THRESHMULT 0x80000000 /* MMCR0[THRESHOLD] multiplier. */ +#define MMCR2_SMCNTEN 0x40000000 /* 7400/7410 only, should be zero. */ +#define MMCR2_SMINTEN 0x20000000 /* 7400/7410 only, should be zero. */ +#define MMCR2__RESERVED 0x1FFFFFFF /* should be zero */ +#define MMCR2_RESERVED (MMCR2_SMCNTEN | MMCR2_SMINTEN | MMCR2__RESERVED) + #endif /* Processor Version Register (PVR) field extraction */ diff -rupN linux-2.6.16.21/include/asm-powerpc/unistd.h linux-2.6.16.21.perfctr27/include/asm-powerpc/unistd.h --- linux-2.6.16.21/include/asm-powerpc/unistd.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-powerpc/unistd.h 2006-08-11 03:48:23.000000000 +0200 @@ -301,8 +301,12 @@ #define __NR_pselect6 280 #define __NR_ppoll 281 #define __NR_unshare 282 +#define __NR_vperfctr_open 301 +#define __NR_vperfctr_control (__NR_vperfctr_open+1) +#define __NR_vperfctr_write (__NR_vperfctr_open+2) +#define __NR_vperfctr_read (__NR_vperfctr_open+3) -#define __NR_syscalls 283 +#define __NR_syscalls 305 #ifdef __KERNEL__ #define __NR__exit __NR_exit diff -rupN linux-2.6.16.21/include/asm-x86_64/hw_irq.h linux-2.6.16.21.perfctr27/include/asm-x86_64/hw_irq.h --- linux-2.6.16.21/include/asm-x86_64/hw_irq.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-x86_64/hw_irq.h 2006-08-11 03:48:19.000000000 +0200 @@ -67,14 +67,15 @@ struct hw_interrupt_type; * sources per level' errata. */ #define LOCAL_TIMER_VECTOR 0xef +#define LOCAL_PERFCTR_VECTOR 0xee /* - * First APIC vector available to drivers: (vectors 0x30-0xee) + * First APIC vector available to drivers: (vectors 0x30-0xed) * we start at 0x31 to spread out vectors evenly between priority * levels. (0x80 is the syscall vector) */ #define FIRST_DEVICE_VECTOR 0x31 -#define FIRST_SYSTEM_VECTOR 0xef /* duplicated in irq.h */ +#define FIRST_SYSTEM_VECTOR 0xee /* duplicated in irq.h */ #ifndef __ASSEMBLY__ diff -rupN linux-2.6.16.21/include/asm-x86_64/ia32_unistd.h linux-2.6.16.21.perfctr27/include/asm-x86_64/ia32_unistd.h --- linux-2.6.16.21/include/asm-x86_64/ia32_unistd.h 2006-07-03 14:17:56.000000000 -0500 +++ linux-2.6.16.21.perfctr27/include/asm-x86_64/ia32_unistd.h 2006-08-22 11:30:52.000000000 -0500 @@ -316,5 +316,9 @@ #define __NR_ia32_pselect6 308 #define __NR_ia32_ppoll 309 #define __NR_ia32_unshare 310 +#define __NR_ia32_vperfctr_open 311 +#define __NR_ia32_vperfctr_control (__NR_ia32_vperfctr_open+1) +#define __NR_ia32_vperfctr_write (__NR_ia32_vperfctr_open+2) +#define __NR_ia32_vperfctr_read (__NR_ia32_vperfctr_open+3) #endif /* _ASM_X86_64_IA32_UNISTD_H_ */ diff -rupN linux-2.6.16.21/include/asm-x86_64/irq.h linux-2.6.16.21.perfctr27/include/asm-x86_64/irq.h --- linux-2.6.16.21/include/asm-x86_64/irq.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-x86_64/irq.h 2006-08-11 03:48:19.000000000 +0200 @@ -29,7 +29,7 @@ */ #define NR_VECTORS 256 -#define FIRST_SYSTEM_VECTOR 0xef /* duplicated in hw_irq.h */ +#define FIRST_SYSTEM_VECTOR 0xee /* duplicated in hw_irq.h */ #ifdef CONFIG_PCI_MSI #define NR_IRQS FIRST_SYSTEM_VECTOR diff -rupN linux-2.6.16.21/include/asm-x86_64/processor.h linux-2.6.16.21.perfctr27/include/asm-x86_64/processor.h --- linux-2.6.16.21/include/asm-x86_64/processor.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-x86_64/processor.h 2006-08-11 03:48:19.000000000 +0200 @@ -260,6 +260,8 @@ struct thread_struct { unsigned io_bitmap_max; /* cached TLS descriptors. */ u64 tls_array[GDT_ENTRY_TLS_ENTRIES]; +/* performance counters */ + struct vperfctr *perfctr; } __attribute__((aligned(16))); #define INIT_THREAD { \ diff -rupN linux-2.6.16.21/include/asm-x86_64/system.h linux-2.6.16.21.perfctr27/include/asm-x86_64/system.h --- linux-2.6.16.21/include/asm-x86_64/system.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-x86_64/system.h 2006-08-11 03:48:19.000000000 +0200 @@ -26,7 +26,8 @@ #define __EXTRA_CLOBBER \ ,"rcx","rbx","rdx","r8","r9","r10","r11","r12","r13","r14","r15" -#define switch_to(prev,next,last) \ +#define switch_to(prev,next,last) do { \ + perfctr_suspend_thread(&(prev)->thread); \ asm volatile(SAVE_CONTEXT \ "movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */ \ "movq %P[threadrsp](%[next]),%%rsp\n\t" /* restore RSP */ \ @@ -46,7 +47,8 @@ [tif_fork] "i" (TIF_FORK), \ [thread_info] "i" (offsetof(struct task_struct, thread_info)), \ [pda_pcurrent] "i" (offsetof(struct x8664_pda, pcurrent)) \ - : "memory", "cc" __EXTRA_CLOBBER) + : "memory", "cc" __EXTRA_CLOBBER); \ +} while (0) extern void load_gs_index(unsigned); diff -rupN linux-2.6.16.21/include/asm-x86_64/unistd.h linux-2.6.16.21.perfctr27/include/asm-x86_64/unistd.h --- linux-2.6.16.21/include/asm-x86_64/unistd.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/asm-x86_64/unistd.h 2006-08-11 03:48:23.000000000 +0200 @@ -605,8 +605,30 @@ __SYSCALL(__NR_pselect6, sys_ni_syscall) __SYSCALL(__NR_ppoll, sys_ni_syscall) /* for now */ #define __NR_unshare 272 __SYSCALL(__NR_unshare, sys_unshare) +#define __NR_set_robust_list 273 +__SYSCALL(__NR_set_robust_list, sys_ni_syscall) +#define __NR_get_robust_list 274 +__SYSCALL(__NR_get_robust_list, sys_ni_syscall) +#define __NR_splice 275 +__SYSCALL(__NR_splice, sys_ni_syscall) +#define __NR_tee 276 +__SYSCALL(__NR_tee, sys_ni_syscall) +#define __NR_sync_file_range 277 +__SYSCALL(__NR_sync_file_range, sys_ni_syscall) +#define __NR_vmsplice 278 +__SYSCALL(__NR_vmsplice, sys_ni_syscall) +#define __NR_move_pages 279 +__SYSCALL(__NR_move_pages, sys_ni_syscall) +#define __NR_vperfctr_open 280 +__SYSCALL(__NR_vperfctr_open, sys_vperfctr_open) +#define __NR_vperfctr_control (__NR_vperfctr_open+1) +__SYSCALL(__NR_vperfctr_control, sys_vperfctr_control) +#define __NR_vperfctr_write (__NR_vperfctr_open+2) +__SYSCALL(__NR_vperfctr_write, sys_vperfctr_write) +#define __NR_vperfctr_read (__NR_vperfctr_open+3) +__SYSCALL(__NR_vperfctr_read, sys_vperfctr_read) -#define __NR_syscall_max __NR_unshare +#define __NR_syscall_max __NR_vperfctr_read #ifndef __NO_STUBS diff -rupN linux-2.6.16.21/include/linux/sched.h linux-2.6.16.21.perfctr27/include/linux/sched.h --- linux-2.6.16.21/include/linux/sched.h 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/include/linux/sched.h 2006-08-11 03:48:19.000000000 +0200 @@ -1222,6 +1222,9 @@ extern void unhash_process(struct task_s * subscriptions and synchronises with wait4(). Also used in procfs. Also * pins the final release of task.io_context. Also protects ->cpuset. * + * Synchronises set_cpus_allowed(), unlink, and creat of ->thread.perfctr. + * [if CONFIG_PERFCTR_VIRTUAL] + * * Nests both inside and outside of read_lock(&tasklist_lock). * It must not be nested with write_lock_irq(&tasklist_lock), * neither inside nor outside. diff -rupN linux-2.6.16.21/kernel/exit.c linux-2.6.16.21.perfctr27/kernel/exit.c --- linux-2.6.16.21/kernel/exit.c 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/kernel/exit.c 2006-08-11 03:48:19.000000000 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -102,6 +103,7 @@ repeat: zap_leader = (leader->exit_signal == -1); } + perfctr_release_task(p); sched_exit(p); write_unlock_irq(&tasklist_lock); spin_unlock(&p->proc_lock); diff -rupN linux-2.6.16.21/kernel/sched.c linux-2.6.16.21.perfctr27/kernel/sched.c --- linux-2.6.16.21/kernel/sched.c 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/kernel/sched.c 2006-08-11 03:48:19.000000000 +0200 @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -4393,6 +4394,8 @@ int set_cpus_allowed(task_t *p, cpumask_ migration_req_t req; runqueue_t *rq; + perfctr_set_cpus_allowed(p, new_mask); + rq = task_rq_lock(p, &flags); if (!cpus_intersects(new_mask, cpu_online_map)) { ret = -EINVAL; diff -rupN linux-2.6.16.21/kernel/sys_ni.c linux-2.6.16.21.perfctr27/kernel/sys_ni.c --- linux-2.6.16.21/kernel/sys_ni.c 2006-08-10 21:57:10.000000000 +0200 +++ linux-2.6.16.21.perfctr27/kernel/sys_ni.c 2006-08-11 03:48:19.000000000 +0200 @@ -68,6 +68,10 @@ cond_syscall(compat_sys_mq_timedsend); cond_syscall(compat_sys_mq_timedreceive); cond_syscall(compat_sys_mq_notify); cond_syscall(compat_sys_mq_getsetattr); +cond_syscall(sys_vperfctr_open); +cond_syscall(sys_vperfctr_control); +cond_syscall(sys_vperfctr_write); +cond_syscall(sys_vperfctr_read); cond_syscall(sys_mbind); cond_syscall(sys_get_mempolicy); cond_syscall(sys_set_mempolicy); diff -rupN linux-2.6.16.21/kernel/timer.c linux-2.6.16.21.perfctr27/kernel/timer.c --- linux-2.6.16.21/kernel/timer.c 2006-07-03 14:18:09.000000000 -0500 +++ linux-2.6.16.21.perfctr27/kernel/timer.c 2006-08-22 11:28:43.000000000 -0500 @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -840,6 +841,7 @@ void update_process_times(int user_tick) account_user_time(p, jiffies_to_cputime(1)); else account_system_time(p, HARDIRQ_OFFSET, jiffies_to_cputime(1)); + perfctr_sample_thread(&p->thread); run_local_timers(); if (rcu_pending(cpu)) rcu_check_callbacks(cpu, user_tick);