Messages in this thread Patch in this message | | | Date | Wed, 23 Aug 2006 01:06:06 -0700 | From | Stephane Eranian <> | Subject | [PATCH 15/18] 2.6.17.9 perfmon2 patch for review: modified powerpc files |
| |
This patch contains the modified powerpc files.
The modified files are as follows:
arch/powerpc/Kconfig: - add link to perfmon menuconfig options
arch/powerpc/Makefile: - add perfmon subdir
arch/powerpc/kernel/entry_64.S: - add hook for extra work before kernel exit. Need to block a thread after a overflow with user level notification. Also needed to do some bookeeeping, such as reset certain counters and cleanup in some difficult corner cases
arch/powerpc/kernel/process.c: - add hook in exit_thread() to cleanup perfmon2 context - add hook in copy_thread() to cleanup perfmon2 context in child (perfmon2 context is never inherited) - add hook in __switch_to() for PMU state save/restore
arch/powerpc/kernel/systbl.S: - add new system calls definitions
include/asm-powerpc/thread_info.h: - add TIF_PERFMON which is used for PMU context switching in __switch_to()
include/asm-powerpc/unistd.h: - add new system calls
diff -urp linux-2.6.17.9.base/arch/powerpc/Kconfig linux-2.6.17.9/arch/powerpc/Kconfig --- linux-2.6.17.9.base/arch/powerpc/Kconfig 2006-08-18 09:26:24.000000000 -0700 +++ linux-2.6.17.9/arch/powerpc/Kconfig 2006-08-21 03:37:46.000000000 -0700 @@ -299,6 +299,9 @@ config NOT_COHERENT_CACHE bool depends on 4xx || 8xx || E200 default y + +source "arch/powerpc/perfmon/Kconfig" + endmenu source "init/Kconfig" diff -urp linux-2.6.17.9.base/arch/powerpc/Makefile linux-2.6.17.9/arch/powerpc/Makefile --- linux-2.6.17.9.base/arch/powerpc/Makefile 2006-08-18 09:26:24.000000000 -0700 +++ linux-2.6.17.9/arch/powerpc/Makefile 2006-08-21 03:37:46.000000000 -0700 @@ -135,6 +135,7 @@ core-y += arch/powerpc/kernel/ \ arch/powerpc/platforms/ core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/ core-$(CONFIG_XMON) += arch/powerpc/xmon/ +core-$(CONFIG_PERFMON) += arch/powerpc/perfmon/ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ diff -urp linux-2.6.17.9.base/arch/powerpc/kernel/entry_64.S linux-2.6.17.9/arch/powerpc/kernel/entry_64.S --- linux-2.6.17.9.base/arch/powerpc/kernel/entry_64.S 2006-08-18 09:26:24.000000000 -0700 +++ linux-2.6.17.9/arch/powerpc/kernel/entry_64.S 2006-08-21 03:37:46.000000000 -0700 @@ -569,6 +569,9 @@ user_work: b .ret_from_except_lite 1: bl .save_nvgprs +#ifdef CONFIG_PERFMON + bl .ppc64_pfm_handle_work +#endif /* CONFIG_PERFMON */ li r3,0 addi r4,r1,STACK_FRAME_OVERHEAD bl .do_signal diff -urp linux-2.6.17.9.base/arch/powerpc/kernel/process.c linux-2.6.17.9/arch/powerpc/kernel/process.c --- linux-2.6.17.9.base/arch/powerpc/kernel/process.c 2006-08-18 09:26:24.000000000 -0700 +++ linux-2.6.17.9/arch/powerpc/kernel/process.c 2006-08-21 03:37:46.000000000 -0700 @@ -35,6 +35,7 @@ #include <linux/mqueue.h> #include <linux/hardirq.h> #include <linux/utsname.h> +#include <linux/perfmon.h> #include <asm/pgtable.h> #include <asm/uaccess.h> @@ -326,6 +327,9 @@ struct task_struct *__switch_to(struct t new_thread->start_tb = current_tb; } #endif + if (test_tsk_thread_flag(new, TIF_PERFMON) + || test_tsk_thread_flag(prev, TIF_PERFMON)) + pfm_ctxsw(prev, new); local_irq_save(flags); @@ -465,6 +469,7 @@ void show_regs(struct pt_regs * regs) void exit_thread(void) { discard_lazy_cpu_state(); + pfm_exit_thread(current); } void flush_thread(void) @@ -576,6 +581,7 @@ int copy_thread(int nr, unsigned long cl kregs->nip = (unsigned long)ret_from_fork; p->thread.last_syscall = -1; #endif + pfm_copy_thread(p); return 0; } diff -urp linux-2.6.17.9.base/arch/powerpc/kernel/systbl.S linux-2.6.17.9/arch/powerpc/kernel/systbl.S --- linux-2.6.17.9.base/arch/powerpc/kernel/systbl.S 2006-08-18 09:26:24.000000000 -0700 +++ linux-2.6.17.9/arch/powerpc/kernel/systbl.S 2006-08-21 03:37:46.000000000 -0700 @@ -340,7 +340,19 @@ SYSCALL(fchmodat) SYSCALL(faccessat) COMPAT_SYS(get_robust_list) COMPAT_SYS(set_robust_list) - +SYSCALL(pfm_create_context) +SYSCALL(pfm_write_pmcs) +SYSCALL(pfm_write_pmds) +SYSCALL(pfm_read_pmds) +SYSCALL(pfm_load_context) +SYSCALL(pfm_start) +SYSCALL(pfm_stop) +SYSCALL(pfm_restart) +SYSCALL(pfm_create_evtsets) +SYSCALL(pfm_getinfo_evtsets) +SYSCALL(pfm_delete_evtsets) +SYSCALL(pfm_unload_context) + /* * please add new calls to arch/powerpc/platforms/cell/spu_callbacks.c * as well when appropriate. Only in linux-2.6.17.9/arch/powerpc: perfmon Only in linux-2.6.17.9/include/asm-powerpc: perfmon.h diff -urp linux-2.6.17.9.base/include/asm-powerpc/thread_info.h linux-2.6.17.9/include/asm-powerpc/thread_info.h --- linux-2.6.17.9.base/include/asm-powerpc/thread_info.h 2006-08-18 09:26:24.000000000 -0700 +++ linux-2.6.17.9/include/asm-powerpc/thread_info.h 2006-08-21 03:37:46.000000000 -0700 @@ -123,6 +123,7 @@ static inline struct thread_info *curren #define TIF_RESTOREALL 12 /* Restore all regs (implies NOERROR) */ #define TIF_NOERROR 14 /* Force successful syscall return */ #define TIF_RESTORE_SIGMASK 15 /* Restore signal mask in do_signal */ +#define TIF_PERFMON 16 /* uses perfmon */ /* as above, but as bit values */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) @@ -140,6 +141,7 @@ static inline struct thread_info *curren #define _TIF_NOERROR (1<<TIF_NOERROR) #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP) +#define _TIF_PERFMON (1<<TIF_PERFMON) #define _TIF_USER_WORK_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | \ _TIF_NEED_RESCHED | _TIF_RESTORE_SIGMASK) diff -urp linux-2.6.17.9.base/include/asm-powerpc/unistd.h linux-2.6.17.9/include/asm-powerpc/unistd.h --- linux-2.6.17.9.base/include/asm-powerpc/unistd.h 2006-08-18 09:26:24.000000000 -0700 +++ linux-2.6.17.9/include/asm-powerpc/unistd.h 2006-08-21 03:37:46.000000000 -0700 @@ -323,8 +323,20 @@ #define __NR_faccessat 298 #define __NR_get_robust_list 299 #define __NR_set_robust_list 300 +#define __NR_pfm_create_context 301 +#define __NR_pfm_write_pmcs (__NR_pfm_create_context+1) +#define __NR_pfm_write_pmds (__NR_pfm_create_context+2) +#define __NR_pfm_read_pmds (__NR_pfm_create_context+3) +#define __NR_pfm_load_context (__NR_pfm_create_context+4) +#define __NR_pfm_start (__NR_pfm_create_context+5) +#define __NR_pfm_stop (__NR_pfm_create_context+6) +#define __NR_pfm_restart (__NR_pfm_create_context+7) +#define __NR_pfm_create_evtsets (__NR_pfm_create_context+8) +#define __NR_pfm_getinfo_evtsets (__NR_pfm_create_context+9) +#define __NR_pfm_delete_evtsets (__NR_pfm_create_context+10) +#define __NR_pfm_unload_context (__NR_pfm_create_context+11) -#define __NR_syscalls 301 +#define __NR_syscalls 312 #ifdef __KERNEL__ #define __NR__exit __NR_exit - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |