Skip to contentSkip to conversation

2.6.17.1 perfmon2 patch for review: modified i386 files

PATCH In review Stephane Eranian 1 participant 1 message Jun 23, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 13/17 2.6.17.1 perfmon2 patch for review: modified i386 files

This patch contains the modified i386 files

arch/i386/Kconfig +1 -0
diff -urp linux-2.6.17.1.orig/arch/i386/Kconfig linux-2.6.17.1/arch/i386/Kconfig
@@ -762,6 +762,7 @@ config HOTPLUG_CPU
 	  enable suspend on SMP systems. CPUs can be controlled through
 	  /sys/devices/system/cpu.
 
+source "arch/i386/perfmon/Kconfig"
 
 endmenu
 
arch/i386/Makefile +1 -0
diff -urp linux-2.6.17.1.orig/arch/i386/Makefile linux-2.6.17.1/arch/i386/Makefile
@@ -87,6 +87,7 @@ mflags-y += -Iinclude/asm-i386/mach-defa
 head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
 
 libs-y 					+= arch/i386/lib/
+core-$(CONFIG_PERFMON)			+= arch/i386/perfmon/
 core-y					+= arch/i386/kernel/ \
 					   arch/i386/mm/ \
 					   arch/i386/$(mcore-y)/ \
arch/i386/kernel/apic.c +3 -0
diff -urp linux-2.6.17.1.orig/arch/i386/kernel/apic.c linux-2.6.17.1/arch/i386/kernel/apic.c
@@ -27,6 +27,7 @@
 #include <linux/sysdev.h>
 #include <linux/cpu.h>
 #include <linux/module.h>
+#include <linux/perfmon.h>
 
 #include <asm/atomic.h>
 #include <asm/smp.h>
@@ -1179,6 +1180,8 @@ inline void smp_local_timer_interrupt(st
 	update_process_times(user_mode_vm(regs));
 #endif
 
+	pfm_handle_switch_timeout();
+
 	/*
 	 * We take the 'long' return path, and there every subsystem
 	 * grabs the apropriate locks (kernel lock/ irq lock).
arch/i386/kernel/i8259.c +3 -0
diff -urp linux-2.6.17.1.orig/arch/i386/kernel/i8259.c linux-2.6.17.1/arch/i386/kernel/i8259.c
@@ -11,6 +11,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/sysdev.h>
 #include <linux/bitops.h>
+#include <linux/perfmon.h>
 
 #include <asm/8253pit.h>
 #include <asm/atomic.h>
@@ -427,6 +428,8 @@ void __init init_IRQ(void)
 	 */
 	setup_pit_timer();
 
+ 	pfm_vector_init();
+
 	/*
 	 * External FPU? Set up irq13 if so, for
 	 * original braindamaged IBM FERR coupling.
arch/i386/kernel/process.c +6 -0
diff -urp linux-2.6.17.1.orig/arch/i386/kernel/process.c linux-2.6.17.1/arch/i386/kernel/process.c
@@ -33,6 +33,7 @@
 #include <linux/delay.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/perfmon.h>
 #include <linux/mc146818rtc.h>
 #include <linux/module.h>
 #include <linux/kallsyms.h>
@@ -380,6 +381,7 @@ void exit_thread(void)
 		tss->io_bitmap_base = INVALID_IO_BITMAP_OFFSET;
 		put_cpu();
 	}
+	pfm_exit_thread(tsk);
 }
 
 void flush_thread(void)
@@ -431,6 +433,8 @@ int copy_thread(int nr, unsigned long cl
 	savesegment(fs,p->thread.fs);
 	savesegment(gs,p->thread.gs);
 
+ 	pfm_copy_thread(p, childregs);
+
 	tsk = current;
 	if (unlikely(NULL != tsk->thread.io_bitmap_ptr)) {
 		p->thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL);
@@ -689,6 +693,8 @@ struct task_struct fastcall * __switch_t
 
 	disable_tsc(prev_p, next_p);
 
+ 	pfm_ctxswin(next_p);
+
 	return prev_p;
 }
 
arch/i386/kernel/signal.c +6 -0
diff -urp linux-2.6.17.1.orig/arch/i386/kernel/signal.c linux-2.6.17.1/arch/i386/kernel/signal.c
@@ -21,6 +21,7 @@
 #include <linux/suspend.h>
 #include <linux/ptrace.h>
 #include <linux/elf.h>
+#include <linux/perfmon.h>
 #include <asm/processor.h>
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
@@ -651,6 +652,11 @@ void do_notify_resume(struct pt_regs *re
 		clear_thread_flag(TIF_SINGLESTEP);
 	}
 
+	/*
+ 	 * must be done before signals
+ 	 */
+ 	pfm_handle_work();
+
 	/* deal with pending signal delivery */
 	if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
 		do_signal(regs);
arch/i386/kernel/smp.c +66 -0

69 lines not on this page · raw message

arch/i386/kernel/syscall_table.S +12 -0
diff -urp linux-2.6.17.1.orig/arch/i386/kernel/syscall_table.S linux-2.6.17.1/arch/i386/kernel/syscall_table.S
@@ -316,3 +316,15 @@ ENTRY(sys_call_table)
 	.long sys_sync_file_range
 	.long sys_tee			/* 315 */
 	.long sys_vmsplice
+	.long sys_pfm_create_context
+	.long sys_pfm_write_pmcs
+	.long sys_pfm_write_pmds
+	.long sys_pfm_read_pmds		/* 320 */
+	.long sys_pfm_load_context
+	.long sys_pfm_start
+	.long sys_pfm_stop
+	.long sys_pfm_restart
+	.long sys_pfm_create_evtsets	/* 325 */
+	.long sys_pfm_getinfo_evtsets
+	.long sys_pfm_delete_evtsets
+	.long sys_pfm_unload_context

Only in linux-2.6.17.1/arch/i386: perfmon

include/asm-i386/mach-default/entry_arch.h +4 -0
diff -urp linux-2.6.17.1.orig/include/asm-i386/mach-default/entry_arch.h linux-2.6.17.1/include/asm-i386/mach-default/entry_arch.h
@@ -31,4 +31,8 @@ BUILD_INTERRUPT(spurious_interrupt,SPURI
 BUILD_INTERRUPT(thermal_interrupt,THERMAL_APIC_VECTOR)
 #endif
 
+#ifdef CONFIG_PERFMON
+BUILD_INTERRUPT(pmu_interrupt,LOCAL_PERFMON_VECTOR)
+#endif
+
 #endif
include/asm-i386/mach-default/irq_vectors.h +2 -1
diff -urp linux-2.6.17.1.orig/include/asm-i386/mach-default/irq_vectors.h linux-2.6.17.1/include/asm-i386/mach-default/irq_vectors.h
@@ -56,6 +56,7 @@
  * sources per level' errata.
  */
 #define LOCAL_TIMER_VECTOR	0xef
+#define LOCAL_PERFMON_VECTOR	0xee
 
 /*
  * First APIC vector available to drivers: (vectors 0x30-0xee)
@@ -63,7 +64,7 @@
  * 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
 

Only in linux-2.6.17.1/include/asm-i386: perfmon.h Only in linux-2.6.17.1/include/asm-i386: perfmon_p4_pebs_smpl.h

include/asm-i386/processor.h +2 -0
diff -urp linux-2.6.17.1.orig/include/asm-i386/processor.h linux-2.6.17.1/include/asm-i386/processor.h
@@ -432,6 +432,7 @@ struct tss_struct {
 	 */
 	unsigned long io_bitmap_max;
 	struct thread_struct *io_bitmap_owner;
+
 	/*
 	 * pads the TSS to be cacheline-aligned (size is 0x100)
 	 */
@@ -469,6 +470,7 @@ struct thread_struct {
  	unsigned long	iopl;
 /* max allowed port in the bitmap, in bytes: */
 	unsigned long	io_bitmap_max;
+ 	void *pfm_context;
 };
 
 #define INIT_THREAD  {							\
include/asm-i386/smp.h +2 -1
diff -urp linux-2.6.17.1.orig/include/asm-i386/smp.h linux-2.6.17.1/include/asm-i386/smp.h
@@ -41,7 +41,8 @@ extern void (*mtrr_hook) (void);
 extern void zap_low_mappings (void);
 extern void lock_ipi_call_lock(void);
 extern void unlock_ipi_call_lock(void);
-
+extern int smp_call_function_single(int cpuid, void (*func) (void *info),
+				void *info, int retry, int wait);
 #define MAX_APICID 256
 extern u8 x86_cpu_to_apicid[];
 
include/asm-i386/system.h +1 -0
diff -urp linux-2.6.17.1.orig/include/asm-i386/system.h linux-2.6.17.1/include/asm-i386/system.h
@@ -14,6 +14,7 @@ extern struct task_struct * FASTCALL(__s
 
 #define switch_to(prev,next,last) do {					\
 	unsigned long esi,edi;						\
+	pfm_ctxswout(prev);						\
 	asm volatile("pushl %%ebp\n\t"					\
 		     "movl %%esp,%0\n\t"	/* save ESP */		\
 		     "movl %5,%%esp\n\t"	/* restore ESP */	\
include/asm-i386/unistd.h +12 -1
diff -urp linux-2.6.17.1.orig/include/asm-i386/unistd.h linux-2.6.17.1/include/asm-i386/unistd.h
@@ -322,8 +322,19 @@
 #define __NR_sync_file_range	314
 #define __NR_tee		315
 #define __NR_vmsplice		316
+#define __NR_pfm_create_context	317
+#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_syscalls 317
+#define NR_syscalls 328
 
 /*
  * user-visible error numbers are in the range -1 - -128: see